From 67b9d25eb89abda371c4e0f760273da382231f42 Mon Sep 17 00:00:00 2001 From: Yannik Bretschneider Date: Thu, 29 Apr 2021 20:57:08 +0200 Subject: [PATCH] fix: Refactored to Gradle-based project, and added dependencies --- .gitignore | 120 ------------------ build.gradle | 26 ++++ .../marvelous/gamelibrary/IntVector2.java | 0 .../teamname/marvelous/gamelibrary/Tuple.java | 0 .../gamelibrary/entities/Character.java | 0 .../gamelibrary/entities/Entity.java | 0 .../gamelibrary/entities/EntityID.java | 0 .../gamelibrary/entities/EntityType.java | 0 .../gamelibrary/entities/InfinityStone.java | 0 .../gamelibrary/entities/Inventory.java | 0 .../marvelous/gamelibrary/entities/NPC.java | 0 .../gamelibrary/entities/NPCType.java | 0 .../marvelous/gamelibrary/entities/Rock.java | 0 .../marvelous/gamelibrary/entities/Stat.java | 0 .../gamelibrary/entities/StatType.java | 0 .../gamelibrary/entities/StoneType.java | 0 .../marvelous/gamelibrary/events/Event.java | 0 .../gamelogic/ChecksumCalculator.java | 0 .../gamelibrary/gamelogic/EventEmitter.java | 0 .../gamelibrary/gamelogic/GameInstance.java | 0 .../gamelibrary/gamelogic/GameLogic.java | 0 .../gamelibrary/gamelogic/GameState.java | 0 .../gamelogic/GameStateManager.java | 0 .../gamelibrary/gamelogic/GameStateView.java | 0 .../gamelogic/ParticipantType.java | 0 .../gamelibrary/gamelogic/WinCondition.java | 0 .../json/CharacterConfiguration.java | 4 + .../marvelous/gamelibrary/json/JSON.java | 0 .../gamelibrary/json/MessageStructure.java | 0 .../gamelibrary/requests/Request.java | 0 30 files changed, 30 insertions(+), 120 deletions(-) delete mode 100644 .gitignore create mode 100644 build.gradle rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/IntVector2.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/Tuple.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/Character.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/Entity.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/EntityType.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/InfinityStone.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/Inventory.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/NPC.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/NPCType.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/Rock.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/Stat.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/StatType.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/entities/StoneType.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/events/Event.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/ChecksumCalculator.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/EventEmitter.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/GameInstance.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/GameState.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateView.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/ParticipantType.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/gamelogic/WinCondition.java (100%) create mode 100644 src/main/java/uulm/teamname/marvelous/gamelibrary/json/CharacterConfiguration.java rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/json/JSON.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/json/MessageStructure.java (100%) rename src/{ => main/java}/uulm/teamname/marvelous/gamelibrary/requests/Request.java (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c387476..0000000 --- a/.gitignore +++ /dev/null @@ -1,120 +0,0 @@ -## Java - -*.class -*.war -*.ear -hs_err_pid* - -## Robovm -/ios/robovm-build/ - -## GWT -/html/war/ -/html/gwt-unitCache/ -.apt_generated/ -.gwt/ -gwt-unitCache/ -www-test/ -.gwt-tmp/ - -## Android Studio and Intellij and Android in general -/android/libs/armeabi/ -/android/libs/armeabi-v7a/ -/android/libs/arm64-v8a/ -/android/libs/x86/ -/android/libs/x86_64/ -/android/gen/ -.idea/ -*.ipr -*.iws -*.iml -/android/out/ -com_crashlytics_export_strings.xml - -## Eclipse - -.classpath -.project -.metadata/ -/android/bin/ -/core/bin/ -/desktop/bin/ -/html/bin/ -/ios/bin/ -*.tmp -*.bak -*.swp -*~.nib -.settings/ -.loadpath -.externalToolBuilders/ -*.launch - -## NetBeans - -/nbproject/private/ -/android/nbproject/private/ -/core/nbproject/private/ -/desktop/nbproject/private/ -/html/nbproject/private/ -/ios/nbproject/private/ - -/build/ -/android/build/ -/core/build/ -/desktop/build/ -/html/build/ -/ios/build/ - -/nbbuild/ -/android/nbbuild/ -/core/nbbuild/ -/desktop/nbbuild/ -/html/nbbuild/ -/ios/nbbuild/ - -/dist/ -/android/dist/ -/core/dist/ -/desktop/dist/ -/html/dist/ -/ios/dist/ - -/nbdist/ -/android/nbdist/ -/core/nbdist/ -/desktop/nbdist/ -/html/nbdist/ -/ios/nbdist/ - -nbactions.xml -nb-configuration.xml - -## Gradle - -/local.properties -.gradle/ -gradle-app.setting -/build/ -/android/build/ -/core/build/ -/desktop/build/ -/html/build/ -/ios/build/ -/server/build/ -/shared/build/ - -## OS Specific -.DS_Store -Thumbs.db - -## iOS -/ios/xcode/*.xcodeproj/* -!/ios/xcode/*.xcodeproj/xcshareddata -!/ios/xcode/*.xcodeproj/project.pbxproj -/ios/xcode/native/ -/ios/IOSLauncher.app -/ios/IOSLauncher.app.dSYM - -## Project Files -history.txt diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..0b10498 --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'java' + id 'idea' +} + +repositories { + mavenCentral() + jcenter() +} + +test { + useJUnitPlatform() + + maxParallelForks = 8 +} + +dependencies { + implementation "com.fasterxml.jackson.core:jackson-core:2.12.3" + implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.3" + implementation "com.fasterxml.jackson.core:jackson-databind:2.12.3" + + testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.0-M1" + testImplementation "org.mockito:mockito-all:2.0.2-beta" + testImplementation "org.assertj:assertj-core:3.19.0" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.0-M1" +} \ No newline at end of file diff --git a/src/uulm/teamname/marvelous/gamelibrary/IntVector2.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/IntVector2.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/IntVector2.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/IntVector2.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/Tuple.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/Tuple.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/Tuple.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/Tuple.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/Character.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Character.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/Character.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Character.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/Entity.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Entity.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/Entity.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Entity.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/EntityType.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityType.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/EntityType.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityType.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/InfinityStone.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/InfinityStone.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/InfinityStone.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/InfinityStone.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/Inventory.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Inventory.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/Inventory.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Inventory.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/NPC.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/NPC.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/NPC.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/NPC.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/NPCType.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/NPCType.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/NPCType.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/NPCType.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/Rock.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Rock.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/Rock.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Rock.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/Stat.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Stat.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/Stat.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Stat.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/StatType.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/StatType.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/StatType.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/StatType.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/entities/StoneType.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/StoneType.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/entities/StoneType.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/entities/StoneType.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/events/Event.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/events/Event.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/events/Event.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/events/Event.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/ChecksumCalculator.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/ChecksumCalculator.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/ChecksumCalculator.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/ChecksumCalculator.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/EventEmitter.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/EventEmitter.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/EventEmitter.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/EventEmitter.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameInstance.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameInstance.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameInstance.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameInstance.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameState.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameState.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameState.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameState.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateView.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateView.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateView.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateView.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/ParticipantType.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/ParticipantType.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/ParticipantType.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/ParticipantType.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/gamelogic/WinCondition.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/WinCondition.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/gamelogic/WinCondition.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/WinCondition.java diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/json/CharacterConfiguration.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/json/CharacterConfiguration.java new file mode 100644 index 0000000..501d86e --- /dev/null +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/json/CharacterConfiguration.java @@ -0,0 +1,4 @@ +package uulm.teamname.marvelous.gamelibrary.json; + +public class CharacterConfiguration { +} diff --git a/src/uulm/teamname/marvelous/gamelibrary/json/JSON.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/json/JSON.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/json/JSON.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/json/JSON.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/json/MessageStructure.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/json/MessageStructure.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/json/MessageStructure.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/json/MessageStructure.java diff --git a/src/uulm/teamname/marvelous/gamelibrary/requests/Request.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/requests/Request.java similarity index 100% rename from src/uulm/teamname/marvelous/gamelibrary/requests/Request.java rename to src/main/java/uulm/teamname/marvelous/gamelibrary/requests/Request.java