From 1ae69b5558ce58a147e9a00c00c1352864659d00 Mon Sep 17 00:00:00 2001 From: Gregory Rudolph Date: Thu, 24 Sep 2020 19:54:20 -0400 Subject: [PATCH] Convert project from makefile to maven --- .classpath | 44 ++++++++ .gitignore | 3 + .project | 34 ++++++ .settings/org.eclipse.core.resources.prefs | 3 + .settings/org.eclipse.jdt.apt.core.prefs | 2 + .settings/org.eclipse.jdt.core.prefs | 9 ++ .settings/org.eclipse.m2e.core.prefs | 4 + .vscode/settings.json | 3 + Makefile | 38 ------- pom.xml | 100 ++++++++++++++++++ src/main/java/MTGClone/App.java | 31 ++++++ Card.java => src/main/java/MTGClone/Card.java | 2 + Deck.java => src/main/java/MTGClone/Deck.java | 2 + .../main/java/MTGClone/Driver.java | 1 + Game.java => src/main/java/MTGClone/Game.java | 2 + .../main/java/MTGClone/Player.java | 1 + .../main/java/MTGClone/SQLDriver.java | 2 + 17 files changed, 243 insertions(+), 38 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.apt.core.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 .vscode/settings.json delete mode 100644 Makefile create mode 100644 pom.xml create mode 100644 src/main/java/MTGClone/App.java rename Card.java => src/main/java/MTGClone/Card.java (99%) rename Deck.java => src/main/java/MTGClone/Deck.java (99%) rename Driver.java => src/main/java/MTGClone/Driver.java (98%) rename Game.java => src/main/java/MTGClone/Game.java (98%) rename Player.java => src/main/java/MTGClone/Player.java (99%) rename SQLDriver.java => src/main/java/MTGClone/SQLDriver.java (99%) diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..9ba41a2 --- /dev/null +++ b/.classpath @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 2adc7f9..63da651 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ *.class manifest.txt *.jar +target/ +.DS_Store +cards.db \ No newline at end of file diff --git a/.project b/.project new file mode 100644 index 0000000..adcf102 --- /dev/null +++ b/.project @@ -0,0 +1,34 @@ + + + MTGClone + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + + + 1600989245301 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..e9441bb --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..d4313d4 --- /dev/null +++ b/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..46235dc --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e0f15db --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index e89bf84..0000000 --- a/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -JCC = javac -MAIN_CLASS = Driver -OUT_JAR = MTGClone.jar -SQLITE_JDBC_VER = 3.32.3.2 -SQLITE_JDBC_JAR = sqlite-jdbc-$(SQLITE_JDBC_VER).jar -SQLITE_JDBC = https://github.com/xerial/sqlite-jdbc/releases/download/$(SQLITE_JDBC_VER)/$(SQLITE_JDBC_JAR) -JFLAGS = -g -classpath ".:$(SQLITE_JDBC_JAR)" - -default: - @echo \"make build\" to compile Java classes - @echo \"make run\" to run Driver class - @echo \"make jar\" to compile executable jar - @echo \"make clean\" to clean up artifacts - -sqlite_jdbc: - wget -N $(SQLITE_JDBC) - -build: sqlite_jdbc - $(JCC) $(JFLAGS) $(MAIN_CLASS).java - -run: jar - java -jar $(OUT_JAR) - -jar: build - @echo "Manifest-Version: 1.0" > manifest.txt - @echo "Class-Path: ./sqlite-jdbc-3.32.3.2.jar" >> manifest.txt - @echo "Main-Class: $(MAIN_CLASS)" >> manifest.txt - @echo "" >> manifest.txt - jar -cmf manifest.txt $(OUT_JAR) *.class - $(RM) manifest.txt - $(RM) *.class - -clean: - $(RM) *.class - $(RM) cards.db - $(RM) manifest.txt - $(RM) $(OUT_JAR) - $(RM) $(SQLITE_JDBC_JAR) diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..e7b1bd0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + + MTGClone + MTGClone + 1.0 + + MTGClone + https://github.com/jordanmason-stleo/MTGClone + + + UTF-8 + 11 + 11 + + + + + junit + junit + 4.11 + test + + + org.xerial + sqlite-jdbc + 3.32.3.2 + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + + true + MTGClone.Driver + + + + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + maven-assembly-plugin + + + + MTGClone.Driver + + + + jar-with-dependencies + + + + + + + diff --git a/src/main/java/MTGClone/App.java b/src/main/java/MTGClone/App.java new file mode 100644 index 0000000..06d6249 --- /dev/null +++ b/src/main/java/MTGClone/App.java @@ -0,0 +1,31 @@ +package MTGClone; +import java.util.Scanner; +public class App { + public static void main(String[] args) { + Scanner in = new Scanner(System.in); + System.out.print("Enter Player One's name: "); + String player1Name = in.nextLine(); + System.out.print("Enter Player Two's name: "); + String player2Name = in.nextLine(); + + Deck deck=new Deck(); + Deck deck2=new Deck(); + Player player1= new Player(deck, player1Name); + Player player2= new Player(deck2, player2Name); + Game game= new Game(player1, player2); + + + + while(player1.lifeTotal>=0&&player2.lifeTotal>=0){ + if (game.player1.lifeTotal>0) + game.Turn(game.player1,game.player2,in); + System.out.println("------------------------------------------------------------------------------------------------------------------------------"); + if (game.player2.lifeTotal>0) + game.Turn(game.player2,game.player1,in); + System.out.println("------------------------------------------------------------------------------------------------------------------------------"); + } + in.close(); + } + + +} \ No newline at end of file diff --git a/Card.java b/src/main/java/MTGClone/Card.java similarity index 99% rename from Card.java rename to src/main/java/MTGClone/Card.java index bc83ab5..a2d0287 100644 --- a/Card.java +++ b/src/main/java/MTGClone/Card.java @@ -1,3 +1,5 @@ +package MTGClone; + public class Card{ protected String cardName; protected int manaCost; diff --git a/Deck.java b/src/main/java/MTGClone/Deck.java similarity index 99% rename from Deck.java rename to src/main/java/MTGClone/Deck.java index d7b34e3..168ebce 100644 --- a/Deck.java +++ b/src/main/java/MTGClone/Deck.java @@ -1,3 +1,5 @@ +package MTGClone; + import java.util.ArrayList; import java.util.Collections; diff --git a/Driver.java b/src/main/java/MTGClone/Driver.java similarity index 98% rename from Driver.java rename to src/main/java/MTGClone/Driver.java index dda01d4..a032575 100644 --- a/Driver.java +++ b/src/main/java/MTGClone/Driver.java @@ -1,3 +1,4 @@ +package MTGClone; import java.util.Scanner; public class Driver { public static void main(String[] args) { diff --git a/Game.java b/src/main/java/MTGClone/Game.java similarity index 98% rename from Game.java rename to src/main/java/MTGClone/Game.java index bcc3249..225603b 100644 --- a/Game.java +++ b/src/main/java/MTGClone/Game.java @@ -1,3 +1,5 @@ +package MTGClone; + import java.util.ArrayList; import java.util.Scanner; diff --git a/Player.java b/src/main/java/MTGClone/Player.java similarity index 99% rename from Player.java rename to src/main/java/MTGClone/Player.java index bd8ec14..86a0b62 100644 --- a/Player.java +++ b/src/main/java/MTGClone/Player.java @@ -1,3 +1,4 @@ +package MTGClone; import java.util.Scanner; public class Player { diff --git a/SQLDriver.java b/src/main/java/MTGClone/SQLDriver.java similarity index 99% rename from SQLDriver.java rename to src/main/java/MTGClone/SQLDriver.java index bdfa701..2371186 100644 --- a/SQLDriver.java +++ b/src/main/java/MTGClone/SQLDriver.java @@ -1,3 +1,5 @@ +package MTGClone; + import java.sql.*; import java.util.*;