Merge pull request #3 from BME-MIT-IET/build+ci

Build keretrendszer + CI beüzemelése
BME-MIT-IET · May 17, 2024 · fec9c35 · fec9c35
2 parents ff3f964 + 1cf6011
commit fec9c35
Show file tree

Hide file tree

Showing 160 changed files with 166 additions and 203 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,27 @@
+# Maven
+**/target
+**/pom.xml.tag
+**/pom.xml.releaseBackup
+**/pom.xml.versionsBackup
+**/pom.xml.next
+**/release.properties
+**/dependency-reduced-pom.xml
+**/buildNumber.properties
+**/.mvn/timing.properties
+**/.mvn/wrapper/maven-wrapper.jar
+
+# VS Code
+**/.vscode
+
+# Local History for Visual Studio Code
+**/.history
+
+# Built Visual Studio Code Extensions
+**/*.vsix
+
+# IntelliJ project files
+**/*.iml
+**/out
+**/gen
+
+**/.idea
diff --git a/Program/.idea/.gitignore b/Program/.idea/.gitignore
diff --git a/Program/.idea/misc.xml b/Program/.idea/misc.xml
diff --git a/Program/.idea/modules.xml b/Program/.idea/modules.xml
diff --git a/Program/.idea/uiDesigner.xml b/Program/.idea/uiDesigner.xml
diff --git a/Program/.idea/vcs.xml b/Program/.idea/vcs.xml
diff --git a/Program/Prototype.zip b/Program/Prototype.zip
diff --git a/Program/out/production/testProj/ActionHandler.class b/Program/out/production/testProj/ActionHandler.class
diff --git a/Program/out/production/testProj/Active.class b/Program/out/production/testProj/Active.class
diff --git a/Program/out/production/testProj/BlankField.class b/Program/out/production/testProj/BlankField.class
diff --git a/Program/out/production/testProj/Field.class b/Program/out/production/testProj/Field.class
diff --git a/Program/out/production/testProj/Fixer.class b/Program/out/production/testProj/Fixer.class
diff --git a/Program/out/production/testProj/Fountain.class b/Program/out/production/testProj/Fountain.class
diff --git a/Program/out/production/testProj/Game.class b/Program/out/production/testProj/Game.class
diff --git a/Program/out/production/testProj/GameField.class b/Program/out/production/testProj/GameField.class
diff --git a/Program/out/production/testProj/GameFrame$1.class b/Program/out/production/testProj/GameFrame$1.class
diff --git a/Program/out/production/testProj/GameFrame$2.class b/Program/out/production/testProj/GameFrame$2.class
diff --git a/Program/out/production/testProj/GameFrame.class b/Program/out/production/testProj/GameFrame.class
diff --git a/Program/out/production/testProj/HelpFrame.class b/Program/out/production/testProj/HelpFrame.class
diff --git a/Program/out/production/testProj/Main.class b/Program/out/production/testProj/Main.class
diff --git a/Program/out/production/testProj/MainMenu$1.class b/Program/out/production/testProj/MainMenu$1.class
diff --git a/Program/out/production/testProj/MainMenu$2.class b/Program/out/production/testProj/MainMenu$2.class
diff --git a/Program/out/production/testProj/MainMenu$3.class b/Program/out/production/testProj/MainMenu$3.class
diff --git a/Program/out/production/testProj/MainMenu.class b/Program/out/production/testProj/MainMenu.class
diff --git a/Program/out/production/testProj/Map.class b/Program/out/production/testProj/Map.class
diff --git a/Program/out/production/testProj/Pipe.class b/Program/out/production/testProj/Pipe.class
diff --git a/Program/out/production/testProj/Player.class b/Program/out/production/testProj/Player.class
diff --git a/Program/out/production/testProj/Pump.class b/Program/out/production/testProj/Pump.class
diff --git a/Program/out/production/testProj/Saboteur.class b/Program/out/production/testProj/Saboteur.class
diff --git a/Program/out/production/testProj/SettingsFrame$1.class b/Program/out/production/testProj/SettingsFrame$1.class
diff --git a/Program/out/production/testProj/SettingsFrame.class b/Program/out/production/testProj/SettingsFrame.class
diff --git a/Program/out/production/testProj/Steppable.class b/Program/out/production/testProj/Steppable.class
diff --git a/Program/out/production/testProj/Tank.class b/Program/out/production/testProj/Tank.class
diff --git a/Program/out/production/testProj/Wait.class b/Program/out/production/testProj/Wait.class
diff --git a/Program/testProj.iml b/Program/testProj.iml
diff --git a/doc/Build keretrendszer + CI beüzemelése.md b/doc/Build keretrendszer + CI beüzemelése.md
@@ -0,0 +1,19 @@
+# Build keretrendszer + CI beüzemelése
+
+## Build keretrendszer
+
+A build keretrendszer beüzemeléséhez a Maven-t választottuk.
+
+A [`pom.xml`](../pom.xml) fájl tartalmazza a projekt függőségeit és a build konfigurációját.
+
+A build parancs: `mvn clean package assembly:single`. Ez létrehozza a `target` mappában a futtatható `.jar` fájlt.
+
+A tesztek az `mvn test` paranccsal futtathatóak.
+
+## CI beüzemelése
+
+A CI beüzemeléséhez a GitHub Actions-t választottuk.
+
+A CI konfigurációja a [`.github/workflows/maven.yml`](../.github/workflows/maven.yml) fájlban található.
+
+A `main` branch-en minden push-ra és pull request-re lefut. A Maven paranccsal buildeli a projektet és futtatja a teszteket.
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,72 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<version>1.0-SNAPSHOT</version>
+	<groupId>hu.main</groupId>
+	<artifactId>hu.main</artifactId>
+
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+	<build>
+		<plugins>
+		    <plugin>
+			  <artifactId>maven-assembly-plugin</artifactId>
+			  <configuration>
+				<archive>
+				  <manifest>
+					<mainClass>Main</mainClass>
+				  </manifest>
+				</archive>
+				<descriptorRefs>
+				  <descriptorRef>jar-with-dependencies</descriptorRef>
+				</descriptorRefs>
+			  </configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/res</outputDirectory>
+							<resources>
+								<resource>
+									<directory>res</directory>
+									<includes>
+										<include>**/*</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.10.1</version>
+				<configuration>
+					<release>11</release>
+				</configuration>
+			</plugin>
+
+			<!-- JUnit 5 requires Surefire version 2.22.1 or higher -->
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.2</version>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/Program/1.png → res/1.png b/Program/1.png → res/1.png
diff --git a/Program/2.png → res/2.png b/Program/2.png → res/2.png
diff --git a/Program/Desert.ttf → res/Desert.ttf b/Program/Desert.ttf → res/Desert.ttf
diff --git a/Program/Pipe.png → res/Pipe.png b/Program/Pipe.png → res/Pipe.png
diff --git a/Program/background.png → res/background.png b/Program/background.png → res/background.png
diff --git a/Program/bigbutton.png → res/bigbutton.png b/Program/bigbutton.png → res/bigbutton.png
diff --git a/Program/blankfield.png → res/blankfield.png b/Program/blankfield.png → res/blankfield.png
diff --git a/Program/blankfieldbig.png → res/blankfieldbig.png b/Program/blankfieldbig.png → res/blankfieldbig.png
diff --git a/Program/brokenpipe.png → res/brokenpipe.png b/Program/brokenpipe.png → res/brokenpipe.png
diff --git a/Program/brokenpipebig.png → res/brokenpipebig.png b/Program/brokenpipebig.png → res/brokenpipebig.png
diff --git a/Program/brokenpipebigrotated.png → res/brokenpipebigrotated.png b/Program/brokenpipebigrotated.png → res/brokenpipebigrotated.png
diff --git a/Program/brokenpiperotated.png → res/brokenpiperotated.png b/Program/brokenpiperotated.png → res/brokenpiperotated.png
diff --git a/Program/brokenpump.png → res/brokenpump.png b/Program/brokenpump.png → res/brokenpump.png
diff --git a/Program/brokenpumpbig.png → res/brokenpumpbig.png b/Program/brokenpumpbig.png → res/brokenpumpbig.png
diff --git a/Program/button.png → res/button.png b/Program/button.png → res/button.png
diff --git a/Program/disabledbutton.png → res/disabledbutton.png b/Program/disabledbutton.png → res/disabledbutton.png
diff --git a/Program/down.png → res/down.png b/Program/down.png → res/down.png
diff --git a/Program/exit.png → res/exit.png b/Program/exit.png → res/exit.png
diff --git a/Program/fixer.png → res/fixer.png b/Program/fixer.png → res/fixer.png
diff --git a/Program/fixer1.png → res/fixer1.png b/Program/fixer1.png → res/fixer1.png
diff --git a/Program/fixer1big.png → res/fixer1big.png b/Program/fixer1big.png → res/fixer1big.png
diff --git a/Program/fixer2.png → res/fixer2.png b/Program/fixer2.png → res/fixer2.png
diff --git a/Program/fixer2big.png → res/fixer2big.png b/Program/fixer2big.png → res/fixer2big.png
diff --git a/Program/fixer3.png → res/fixer3.png b/Program/fixer3.png → res/fixer3.png
diff --git a/Program/fixer3big.png → res/fixer3big.png b/Program/fixer3big.png → res/fixer3big.png
diff --git a/Program/fixer4.png → res/fixer4.png b/Program/fixer4.png → res/fixer4.png
diff --git a/Program/fixer4big.png → res/fixer4big.png b/Program/fixer4big.png → res/fixer4big.png
diff --git a/Program/fixercurrent.png → res/fixercurrent.png b/Program/fixercurrent.png → res/fixercurrent.png
diff --git a/Program/fountain.png → res/fountain.png b/Program/fountain.png → res/fountain.png
diff --git a/Program/fountainbig.png → res/fountainbig.png b/Program/fountainbig.png → res/fountainbig.png
diff --git a/Program/jatekos kepek/bigbutton.png → res/jatekos kepek/bigbutton.png b/Program/jatekos kepek/bigbutton.png → res/jatekos kepek/bigbutton.png
diff --git a/Program/jatekos kepek/button.png → res/jatekos kepek/button.png b/Program/jatekos kepek/button.png → res/jatekos kepek/button.png
diff --git a/Program/jatekos kepek/fixer.pdn → res/jatekos kepek/fixer.pdn b/Program/jatekos kepek/fixer.pdn → res/jatekos kepek/fixer.pdn
diff --git a/Program/jatekos kepek/fixer.png → res/jatekos kepek/fixer.png b/Program/jatekos kepek/fixer.png → res/jatekos kepek/fixer.png
diff --git a/Program/jatekos kepek/fixer1.pdn → res/jatekos kepek/fixer1.pdn b/Program/jatekos kepek/fixer1.pdn → res/jatekos kepek/fixer1.pdn
diff --git a/Program/jatekos kepek/fixer1.png → res/jatekos kepek/fixer1.png b/Program/jatekos kepek/fixer1.png → res/jatekos kepek/fixer1.png
diff --git a/Program/jatekos kepek/fixer2.png → res/jatekos kepek/fixer2.png b/Program/jatekos kepek/fixer2.png → res/jatekos kepek/fixer2.png
diff --git a/Program/jatekos kepek/fixer3.png → res/jatekos kepek/fixer3.png b/Program/jatekos kepek/fixer3.png → res/jatekos kepek/fixer3.png
diff --git a/Program/jatekos kepek/fixer4.png → res/jatekos kepek/fixer4.png b/Program/jatekos kepek/fixer4.png → res/jatekos kepek/fixer4.png
diff --git a/Program/jatekos kepek/image.png → res/jatekos kepek/image.png b/Program/jatekos kepek/image.png → res/jatekos kepek/image.png
diff --git a/Program/jatekos kepek/jatekos.png → res/jatekos kepek/jatekos.png b/Program/jatekos kepek/jatekos.png → res/jatekos kepek/jatekos.png
diff --git a/Program/jatekos kepek/left.pdn → res/jatekos kepek/left.pdn b/Program/jatekos kepek/left.pdn → res/jatekos kepek/left.pdn
diff --git a/Program/jatekos kepek/saboteur1.pdn → res/jatekos kepek/saboteur1.pdn b/Program/jatekos kepek/saboteur1.pdn → res/jatekos kepek/saboteur1.pdn
diff --git a/Program/jatekos kepek/saboteur1.png → res/jatekos kepek/saboteur1.png b/Program/jatekos kepek/saboteur1.png → res/jatekos kepek/saboteur1.png
diff --git a/Program/jatekos kepek/saboteur2.png → res/jatekos kepek/saboteur2.png b/Program/jatekos kepek/saboteur2.png → res/jatekos kepek/saboteur2.png
diff --git a/Program/jatekos kepek/saboteur3.png → res/jatekos kepek/saboteur3.png b/Program/jatekos kepek/saboteur3.png → res/jatekos kepek/saboteur3.png
diff --git a/Program/jatekos kepek/saboteur4.png → res/jatekos kepek/saboteur4.png b/Program/jatekos kepek/saboteur4.png → res/jatekos kepek/saboteur4.png
diff --git a/Program/left.png → res/left.png b/Program/left.png → res/left.png
diff --git a/Program/leftdisabled.png → res/leftdisabled.png b/Program/leftdisabled.png → res/leftdisabled.png
diff --git a/Program/mainmenu.png → res/mainmenu.png b/Program/mainmenu.png → res/mainmenu.png
diff --git a/Program/middlebutton.png → res/middlebutton.png b/Program/middlebutton.png → res/middlebutton.png
diff --git a/Program/nothing.png → res/nothing.png b/Program/nothing.png → res/nothing.png
diff --git a/Program/other.png → res/other.png b/Program/other.png → res/other.png
diff --git a/Program/othercurrent.png → res/othercurrent.png b/Program/othercurrent.png → res/othercurrent.png
diff --git a/Program/pipebig.png → res/pipebig.png b/Program/pipebig.png → res/pipebig.png
diff --git a/Program/pipebigrotated.png → res/pipebigrotated.png b/Program/pipebigrotated.png → res/pipebigrotated.png
diff --git a/Program/piperotated.png → res/piperotated.png b/Program/piperotated.png → res/piperotated.png
diff --git a/Program/pump.png → res/pump.png b/Program/pump.png → res/pump.png
diff --git a/Program/pumpbig.png → res/pumpbig.png b/Program/pumpbig.png → res/pumpbig.png
diff --git a/Program/saboteur.png → res/saboteur.png b/Program/saboteur.png → res/saboteur.png
diff --git a/Program/saboteur1.png → res/saboteur1.png b/Program/saboteur1.png → res/saboteur1.png
diff --git a/Program/saboteur1big.png → res/saboteur1big.png b/Program/saboteur1big.png → res/saboteur1big.png
diff --git a/Program/saboteur2.png → res/saboteur2.png b/Program/saboteur2.png → res/saboteur2.png
diff --git a/Program/saboteur2big.png → res/saboteur2big.png b/Program/saboteur2big.png → res/saboteur2big.png
diff --git a/Program/saboteur3.png → res/saboteur3.png b/Program/saboteur3.png → res/saboteur3.png
diff --git a/Program/saboteur3big.png → res/saboteur3big.png b/Program/saboteur3big.png → res/saboteur3big.png
diff --git a/Program/saboteur4.png → res/saboteur4.png b/Program/saboteur4.png → res/saboteur4.png
diff --git a/Program/saboteur4big.png → res/saboteur4big.png b/Program/saboteur4big.png → res/saboteur4big.png
diff --git a/Program/saboteurcurrent.png → res/saboteurcurrent.png b/Program/saboteurcurrent.png → res/saboteurcurrent.png
diff --git a/Program/set.png → res/set.png b/Program/set.png → res/set.png
diff --git a/Program/setbig.png → res/setbig.png b/Program/setbig.png → res/setbig.png
diff --git a/Program/settings.png → res/settings.png b/Program/settings.png → res/settings.png
diff --git a/Program/slippery.png → res/slippery.png b/Program/slippery.png → res/slippery.png
diff --git a/Program/slipperybig.png → res/slipperybig.png b/Program/slipperybig.png → res/slipperybig.png
diff --git a/Program/slipperybigrotated.png → res/slipperybigrotated.png b/Program/slipperybigrotated.png → res/slipperybigrotated.png
diff --git a/Program/slipperyrotated.png → res/slipperyrotated.png b/Program/slipperyrotated.png → res/slipperyrotated.png
diff --git a/Program/slipperyundest.png → res/slipperyundest.png b/Program/slipperyundest.png → res/slipperyundest.png
diff --git a/Program/slipperyundestbig.png → res/slipperyundestbig.png b/Program/slipperyundestbig.png → res/slipperyundestbig.png
diff --git a/Program/slipperyundestbigrotated.png → res/slipperyundestbigrotated.png b/Program/slipperyundestbigrotated.png → res/slipperyundestbigrotated.png
diff --git a/Program/slipperyundestrotated.png → res/slipperyundestrotated.png b/Program/slipperyundestrotated.png → res/slipperyundestrotated.png
diff --git a/Program/startgame.png → res/startgame.png b/Program/startgame.png → res/startgame.png
diff --git a/Program/sticky.png → res/sticky.png b/Program/sticky.png → res/sticky.png
diff --git a/Program/stickybig.png → res/stickybig.png b/Program/stickybig.png → res/stickybig.png
diff --git a/Program/stickybigrotated.png → res/stickybigrotated.png b/Program/stickybigrotated.png → res/stickybigrotated.png
diff --git a/Program/stickyrotated.png → res/stickyrotated.png b/Program/stickyrotated.png → res/stickyrotated.png
diff --git a/Program/stickyundest.png → res/stickyundest.png b/Program/stickyundest.png → res/stickyundest.png
diff --git a/Program/stickyundestbig.png → res/stickyundestbig.png b/Program/stickyundestbig.png → res/stickyundestbig.png
diff --git a/Program/stickyundestbigrotated.png → res/stickyundestbigrotated.png b/Program/stickyundestbigrotated.png → res/stickyundestbigrotated.png
diff --git a/Program/stickyundestrotated.png → res/stickyundestrotated.png b/Program/stickyundestrotated.png → res/stickyundestrotated.png
diff --git a/Program/tank.png → res/tank.png b/Program/tank.png → res/tank.png
diff --git a/Program/tankbig.png → res/tankbig.png b/Program/tankbig.png → res/tankbig.png
diff --git a/Program/tb.png → res/tb.png b/Program/tb.png → res/tb.png
diff --git a/Program/tbbig.png → res/tbbig.png b/Program/tbbig.png → res/tbbig.png
diff --git a/Program/undestroyable.png → res/undestroyable.png b/Program/undestroyable.png → res/undestroyable.png
diff --git a/Program/undestroyablebig.png → res/undestroyablebig.png b/Program/undestroyablebig.png → res/undestroyablebig.png
diff --git a/Program/undestroyablebigrotated.png → res/undestroyablebigrotated.png b/Program/undestroyablebigrotated.png → res/undestroyablebigrotated.png
diff --git a/Program/undestroyablerotated.png → res/undestroyablerotated.png b/Program/undestroyablerotated.png → res/undestroyablerotated.png
diff --git a/Program/water.png → res/water.png b/Program/water.png → res/water.png
diff --git a/Program/waterbig.png → res/waterbig.png b/Program/waterbig.png → res/waterbig.png
diff --git a/Program/waterrotated.png → res/waterrotated.png b/Program/waterrotated.png → res/waterrotated.png
diff --git a/Program/waterrotatedbig.png → res/waterrotatedbig.png b/Program/waterrotatedbig.png → res/waterrotatedbig.png
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Main
+
diff --git a/Program/src/ActionHandler.java → src/main/java/ActionHandler.java b/Program/src/ActionHandler.java → src/main/java/ActionHandler.java
diff --git a/Program/src/Active.java → src/main/java/Active.java b/Program/src/Active.java → src/main/java/Active.java
diff --git a/Program/src/BlankField.java → src/main/java/BlankField.java b/Program/src/BlankField.java → src/main/java/BlankField.java
diff --git a/Program/src/Field.java → src/main/java/Field.java b/Program/src/Field.java → src/main/java/Field.java
diff --git a/Program/src/Fixer.java → src/main/java/Fixer.java b/Program/src/Fixer.java → src/main/java/Fixer.java
diff --git a/Program/src/Fountain.java → src/main/java/Fountain.java b/Program/src/Fountain.java → src/main/java/Fountain.java
diff --git a/Program/src/Game.java → src/main/java/Game.java b/Program/src/Game.java → src/main/java/Game.java
diff --git a/Program/src/GameField.java → src/main/java/GameField.java b/Program/src/GameField.java → src/main/java/GameField.java
@@ -37,8 +37,8 @@ public GameField(int ln){
      * @param png png neve
      */
     public void SetBackground(int x, int y, String png){
-        fields[x][y].setIcon( new ImageIcon(png+".png"));
-        fields[x][y].setDisabledIcon( new ImageIcon(png+".png"));
+        fields[x][y].setIcon( new ImageIcon("res/"+png+".png"));
+        fields[x][y].setDisabledIcon( new ImageIcon("res/"+png+".png"));
     }
     /**
      *

diff --git a/Program/src/GameFrame.java → src/main/java/GameFrame.java b/Program/src/GameFrame.java → src/main/java/GameFrame.java
@@ -61,8 +61,8 @@ public GameFrame() {
     public void initComponents(){
         JButton background=new JButton();
         background.setEnabled(false);
-        background.setIcon(new ImageIcon("background.png"));
-        background.setDisabledIcon(new ImageIcon("background.png"));
+        background.setIcon(new ImageIcon("res/"+"background.png"));
+        background.setDisabledIcon(new ImageIcon("res/"+"background.png"));
         background.setContentAreaFilled(false);
         background.setBorderPainted(false);
         background.setOpaque(false);
@@ -243,10 +243,10 @@ public void actionPerformed(ActionEvent e) {
         background.setBounds (0, 0, 1500, 900);
         getContentPane().add(jp);
 
-        ImageIcon leftImg=new ImageIcon("left.png");
-        ImageIcon disabledLeftImg=new ImageIcon("leftdisabled.png");
-        ImageIcon btn=new ImageIcon("button.png");
-        ImageIcon disabledbtn=new ImageIcon("disabledbutton.png");
+        ImageIcon leftImg=new ImageIcon("res/"+"left.png");
+        ImageIcon disabledLeftImg=new ImageIcon("res/"+"leftdisabled.png");
+        ImageIcon btn=new ImageIcon("res/"+"button.png");
+        ImageIcon disabledbtn=new ImageIcon("res/"+"disabledbutton.png");
         SetButtonStyle(left, leftImg, disabledLeftImg, 0);
         SetButtonStyle(right, leftImg, disabledLeftImg, 180);
         SetButtonStyle(up, leftImg, disabledLeftImg, 90);
@@ -294,22 +294,22 @@ public void actionPerformed(ActionEvent e) {
         playerBackground.setBorderPainted(false);
         playerBackground.setOpaque(false);
         playerBackground.setBounds (37, 742, 470, 146);
-        playerBackground.setIcon(new ImageIcon("bigbutton.png"));
-        playerBackground.setDisabledIcon(new ImageIcon("bigbutton.png"));
+        playerBackground.setIcon(new ImageIcon("res/bigbutton.png"));
+        playerBackground.setDisabledIcon(new ImageIcon("res/bigbutton.png"));
         fieldBackground.setEnabled(false);
         fieldBackground.setContentAreaFilled(false);
         fieldBackground.setBorderPainted(false);
         fieldBackground.setOpaque(false);
         fieldBackground.setBounds (572, 742, 470, 146);
-        fieldBackground.setIcon(new ImageIcon("bigbutton.png"));
-        fieldBackground.setDisabledIcon(new ImageIcon("bigbutton.png"));
+        fieldBackground.setIcon(new ImageIcon("res/bigbutton.png"));
+        fieldBackground.setDisabledIcon(new ImageIcon("res/bigbutton.png"));
         pointBackground.setEnabled(false);
         pointBackground.setContentAreaFilled(false);
         pointBackground.setBorderPainted(false);
         pointBackground.setOpaque(false);
         pointBackground.setBounds (998, 742, 470, 146);
-        pointBackground.setIcon(new ImageIcon("middlebutton.png"));
-        pointBackground.setDisabledIcon(new ImageIcon("middlebutton.png"));
+        pointBackground.setIcon(new ImageIcon("res/middlebutton.png"));
+        pointBackground.setDisabledIcon(new ImageIcon("res/middlebutton.png"));
     }
 
     public void SetButtonStyle(JButton button, ImageIcon img, ImageIcon disabledimg, int angle ){
@@ -337,8 +337,8 @@ public void DrawPlayer(Player player){
             DrawFieldIcon(i, player.GetField());
         }
 
-        playericon.setIcon(new ImageIcon(player.GetPictureName()));
-        playericon.setDisabledIcon(new ImageIcon(player.GetPictureName()));
+        playericon.setIcon(new ImageIcon("res/"+player.GetPictureName()));
+        playericon.setDisabledIcon(new ImageIcon("res/"+player.GetPictureName()));
     }
 
     /**
@@ -623,7 +623,7 @@ public JButton[] GetFieldIcon(){
 
 
     public void SetIcon(int layer, String png){
-        ImageIcon img = new ImageIcon(png+".png");
+        ImageIcon img = new ImageIcon("res/"+png+".png");
         fieldicon[layer].setIcon(img);
         fieldicon[layer].setDisabledIcon(img);
     }

diff --git a/Program/src/HelpFrame.java → src/main/java/HelpFrame.java b/Program/src/HelpFrame.java → src/main/java/HelpFrame.java
diff --git a/Program/src/Main.java → src/main/java/Main.java b/Program/src/Main.java → src/main/java/Main.java