Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Structure with Maven #1

Merged
merged 2 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Drukmakori_csohalozat/.idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion Drukmakori_csohalozat/.idea/.name

This file was deleted.

8 changes: 0 additions & 8 deletions Drukmakori_csohalozat/.idea/artifacts/projlab2_jar.xml

This file was deleted.

8 changes: 0 additions & 8 deletions Drukmakori_csohalozat/.idea/artifacts/projlab2_jar2.xml

This file was deleted.

8 changes: 0 additions & 8 deletions Drukmakori_csohalozat/.idea/modules.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Drukmakori_csohalozat/.idea/vcs.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 0 additions & 11 deletions Drukmakori_csohalozat/projlab2.iml

This file was deleted.

3 changes: 0 additions & 3 deletions Drukmakori_csohalozat/src/META-INF/MANIFEST.MF

This file was deleted.

Binary file not shown.
Binary file removed Drukmakori_csohalozat/src/images/assets/Shield.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Drukmakori_csohalozat/src/images/bg.png
Binary file not shown.
Binary file removed Drukmakori_csohalozat/src/images/ciszterna.png
Binary file not shown.
Binary file not shown.
Binary file removed Drukmakori_csohalozat/src/images/csovek/cso.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Drukmakori_csohalozat/src/images/csovek/vizescso.png
Binary file not shown.
Binary file removed Drukmakori_csohalozat/src/images/hegy.png
Diff not rendered.
Diff not rendered.
Binary file removed Drukmakori_csohalozat/src/images/pumpak/pumpa.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
3 changes: 3 additions & 0 deletions Drumakomi_sivatag/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Drumakomi_sivatag/.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Drumakomi_sivatag/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Drumakomi_sivatag/.idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions Drumakomi_sivatag/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>

<groupId>org.example</groupId>
<artifactId>Drumakomi_sivatag</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.organization>I01</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<maven.compiler.source>18</maven.compiler.source>
<maven.compiler.target>18</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<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>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>default-report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,33 @@ public class GameView extends JFrame implements ActionListener {

static {
try {
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\cso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\csuszosCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\csuszosRagadosCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\CsuszosRagadosTorottCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\csuszosRagadosTorottVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\csuszosRagadosVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\csuszosTorottCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\csuszosTorottVizescso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\csuszosVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\ragadosCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\ragadosTorottcso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\ragadosTorottVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\ragadosVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\torottCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\torottVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\csovek\\vizescso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\cso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\csuszosCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\csuszosRagadosCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\CsuszosRagadosTorottCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\csuszosRagadosTorottVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\csuszosRagadosVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\csuszosTorottCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\csuszosTorottVizescso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\csuszosVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\ragadosCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\ragadosTorottcso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\ragadosTorottVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\ragadosVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\torottCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\torottVizesCso.png").getImage());
Pipe.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\csovek\\vizescso.png").getImage());

Pump.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\pumpak\\pumpa.png").getImage());
Pump.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\pumpak\\destroyedpumpa.png").getImage());
Pump.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\pumpak\\vizesPumpa.png").getImage());
Pump.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\pumpak\\pumpa.png").getImage());
Pump.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\pumpak\\destroyedpumpa.png").getImage());
Pump.add(new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\pumpak\\vizesPumpa.png").getImage());

ciszterna = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\ciszterna.png").getImage();
hegy = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\hegy.png").getImage();
gameBackground = (new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\gameBG.png").getImage());
ciszterna = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\ciszterna.png").getImage();
hegy = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\hegy.png").getImage();
gameBackground = (new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\gameBG.png").getImage());

szerelo = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\szerelo.png").getImage();
szabotor = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\images\\szabotor.png").getImage();
szerelo = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\szerelo.png").getImage();
szabotor = new ImageIcon(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\szabotor.png").getImage();
} catch (IOException e) {
throw new RuntimeException(e);
}
Expand All @@ -71,8 +71,8 @@ public GameView() {
this.setTitle("Csohalozat");
this.setSize(x, y);
try {
this.setIconImage(new ImageIcon(new java.io.File(".").getCanonicalPath() + "\\src\\images\\hegy.png").getImage());
Image img = new ImageIcon(new java.io.File(".").getCanonicalPath() + "\\src\\images\\bg.png").getImage();
this.setIconImage(new ImageIcon(new java.io.File(".").getCanonicalPath() + "\\src\\main\\java\\images\\hegy.png").getImage());
Image img = new ImageIcon(new java.io.File(".").getCanonicalPath() + "\\src\\main\\java\\images\\bg.png").getImage();
menu = new JPanel(null) {
public void paintComponent(Graphics g) {
super.paintComponent(g);
Expand Down Expand Up @@ -101,8 +101,8 @@ public void Settings() {
this.repaint();
try {
String path = new java.io.File(".").getCanonicalPath();
this.setIconImage(new ImageIcon(path + "\\src\\images\\hegy.png").getImage());
Image img = new ImageIcon(path + "\\src\\images\\bg.png").getImage();
this.setIconImage(new ImageIcon(path + "\\src\\main\\java\\images\\hegy.png").getImage());
Image img = new ImageIcon(path + "\\src\\main\\java\\images\\bg.png").getImage();
settings = new JPanel(new GridLayout(4, 2));
}
catch (IOException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ public void end(){
new GameView();
if(mechanicWater > saboteurWater) {
try {
Desktop.getDesktop().open(new File(new File(".").getCanonicalPath() + "\\src\\images\\The_Fortnite_Get_Griddy_Dance.mp4"));
Desktop.getDesktop().open(new File(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\The_Fortnite_Get_Griddy_Dance.mp4"));
} catch (IOException e) {
System.err.println("Nem nyitható meg a fájl");
}
} else {
try {
Desktop.getDesktop().open(new File(new File(".").getCanonicalPath() + "\\src\\images\\Mike_Wazowski_Hits_The_Griddy.mp4"));
Desktop.getDesktop().open(new File(new File(".").getCanonicalPath() + "\\src\\main\\java\\images\\Mike_Wazowski_Hits_The_Griddy.mp4"));
} catch (IOException e) {
System.err.println("Nem nyitható meg a fájl");
}
Expand Down
Binary file added Drumakomi_sivatag/target/classes/Cisterns.class
Binary file not shown.
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Element.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Game.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/GameView$1.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/GameView.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/IEvents.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Main.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Mechanic.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Mountains.class
Binary file not shown.
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Node.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Pipe.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/PipeSystem.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/PipeView.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Player.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/PlayerView.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Pump.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/PumpView.class
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/Saboteur.class
Binary file not shown.
Binary file not shown.
Binary file added Drumakomi_sivatag/target/classes/View.class
Binary file not shown.
Loading