diff --git a/.gitignore b/.gitignore index 9154f4c..5b9fd84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ # ---> Java +*.gradle + # Compiled class file *.class diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin index 29b2031..b03312d 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.bin and b/.gradle/7.4/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock index d5f1efc..1f1f63c 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.lock and b/.gradle/7.4/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin index af895d2..a3b8bcc 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.bin and b/.gradle/7.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock index ce5ebc6..2041415 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and b/.gradle/7.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ab118a2..1b8b9f7 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index e4f4ed3..9049595 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Sat Sep 17 10:47:42 CEST 2022 +#Sun Sep 25 23:37:55 CEST 2022 gradle.version=7.4 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 9eb2949..a6b4820 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 943bf11..f5f5fce 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,11 +4,7 @@ <pattern value="eu.mhsl.minenet.minigames.util.InventoryItemAlignment.ItemOffset" method="getX" /> </component> <component name="ExternalStorageConfigurationManager" enabled="true" /> - <component name="JavadocGenerationManager"> - <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/docs" /> - <option name="LOCALE" value="de_DE" /> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="openjdk-17 (3)" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..8306744 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="Git" /> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> </component> </project> \ No newline at end of file diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index c514d97..08f65ef 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java index 33747b0..18196b6 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java @@ -1,6 +1,7 @@ package eu.mhsl.minenet.minigames.instance.game; import eu.mhsl.minenet.minigames.instance.game.minigame.config.GameFactory; +import eu.mhsl.minenet.minigames.instance.game.minigame.types.bedwars.BedwarsFactory; import eu.mhsl.minenet.minigames.instance.game.minigame.types.deathcube.DeathcubeFactory; import eu.mhsl.minenet.minigames.instance.game.minigame.types.minerun.MinerunFactory; import eu.mhsl.minenet.minigames.instance.game.minigame.types.stickfight.StickFightFactory; @@ -10,7 +11,8 @@ public enum GameList { DEATHCUBE(new DeathcubeFactory(), GameType.OTHER), STICKFIGHT(new StickFightFactory(), GameType.PVP), MINERUN(new MinerunFactory(), GameType.PVE), - TRAFFICLIGHTRACE(new TrafficLightRaceFactory(), GameType.OTHER); + TRAFFICLIGHTRACE(new TrafficLightRaceFactory(), GameType.OTHER), + BEDWARS(new BedwarsFactory(), GameType.PVP); private final GameFactory factory; private final GameType type; diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/types/bedwars/Bedwars.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/types/bedwars/Bedwars.java new file mode 100644 index 0000000..f3bc1a2 --- /dev/null +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/types/bedwars/Bedwars.java @@ -0,0 +1,10 @@ +package eu.mhsl.minenet.minigames.instance.game.minigame.types.bedwars; + +import eu.mhsl.minenet.minigames.instance.Dimension; +import eu.mhsl.minenet.minigames.instance.game.minigame.Minigame; + +public class Bedwars extends Minigame { + public Bedwars() { + super(Dimension.OVERWORLD.DIMENSION, "Bedwars"); + } +} diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/types/bedwars/BedwarsFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/types/bedwars/BedwarsFactory.java new file mode 100644 index 0000000..f15cfd1 --- /dev/null +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/minigame/types/bedwars/BedwarsFactory.java @@ -0,0 +1,45 @@ +package eu.mhsl.minenet.minigames.instance.game.minigame.types.bedwars; + +import eu.mhsl.minenet.minigames.instance.game.minigame.Minigame; +import eu.mhsl.minenet.minigames.instance.game.minigame.config.ConfigManager; +import eu.mhsl.minenet.minigames.instance.game.minigame.config.GameFactory; +import eu.mhsl.minenet.minigames.instance.game.minigame.config.Option; +import eu.mhsl.minenet.minigames.instance.game.minigame.config.restriction.RestrictionHandler; +import eu.mhsl.minenet.minigames.instance.game.minigame.config.restriction.common.MinimalPlayeramountGameRestriction; +import eu.mhsl.minenet.minigames.message.component.TranslatedComponent; +import net.minestom.server.item.Material; + +import java.util.Map; + +public class BedwarsFactory implements GameFactory { + @Override + public TranslatedComponent name() { + return TranslatedComponent.byId("game_Bedwars#name"); + } + + @Override + public ConfigManager configuration() { + return null; + } + + @Override + public RestrictionHandler globalRestrictions() { + return new RestrictionHandler() + .addRestriction(new MinimalPlayeramountGameRestriction(2)); + } + + @Override + public Material symbol() { + return Material.RED_BED; + } + + @Override + public TranslatedComponent description() { + return TranslatedComponent.byId("game_Bedwars#description"); + } + + @Override + public Minigame manufacture(Map<String, Option<?>> configuration) { + return new Bedwars(); + } +}