Konflikt lösen

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/HappyBird.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="15" project-jdk-type="JavaSDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/HappyBird.iml" filepath="$PROJECT_DIR$/.idea/HappyBird.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

Happy_Bird/.idea/Happy_Bird.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />

Happy_Bird/.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="false" project-jdk-name="15" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

Happy_Bird/src/main/java/com/example/happy_bird/SpielObjekt.java

@@ -0,0 +1,80 @@
+package com.example.happy_bird;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.image.ImageObserver;
+
+public abstract class SpielObjekt {
+    private int xWert;
+    private int yWert;
+    private int fxWert;
+    private int fyWert;
+    private int breite;
+    private int hoehe;
+    private Image bild;
+
+    public SpielObjekt(int xWert, int yWert) {
+        this.xWert = xWert;
+        this.yWert = yWert;
+    }
+
+    public int getyWert() {
+        return yWert;
+    }
+
+    public void setyWert(int yWert) {
+        this.yWert = yWert;
+    }
+
+    public int getxWert() {
+        return xWert;
+    }
+
+    public void setxWert(int xWert) {
+        this.xWert = xWert;
+    }
+
+    public int getFxWert() {
+        return fxWert;
+    }
+
+    public void setFxWert(int fxWert) {
+        this.fxWert = fxWert;
+    }
+
+    public int getFyWert() {
+        return fyWert;
+    }
+
+    public void setFyWert(int fyWert) {
+        this.fyWert = fyWert;
+    }
+
+    public int getBreite() {
+        return breite;
+    }
+
+    public void setBreite(int breite) {
+        this.breite = breite;
+    }
+
+    public int getHoehe() {
+        return hoehe;
+    }
+
+    public void setHoehe(int hoehe) {
+        this.hoehe = hoehe;
+    }
+
+    public Image getBild() {
+        return bild;
+    }
+
+    public void setBild(Image bild) {
+        this.bild = bild;
+    }
+
+
+    public abstract void tick();
+
+    public abstract void render(Graphics2D g, ImageObserver obs);
+}

Happy_Bird/src/main/java/module-info.java

@@ -1,6 +1,7 @@
 module com.example.happy_bird {
     requires javafx.controls;
     requires javafx.fxml;
+    requires java.desktop;
 
 
     opens com.example.happy_bird to javafx.fxml;