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 fc0b8ac..ec5c9a3 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 @@ -18,19 +18,19 @@ import eu.mhsl.minenet.minigames.instance.game.stateless.types.trafficlightrace. public enum GameList { DEATHCUBE(new DeathcubeFactory(), GameType.JUMPNRUN), - STICKFIGHT(new StickFightFactory(), GameType.PVP), MINERUN(new MinerunFactory(), GameType.JUMPNRUN), TRAFFICLIGHTRACE(new TrafficLightRaceFactory(), GameType.OTHER), + STICKFIGHT(new StickFightFactory(), GameType.PROTOTYPE), TOWERDEFENSE(new TowerdefenseFactory(), GameType.PROTOTYPE), BEDWARS(new BedwarsFactory(), GameType.PROTOTYPE), BACKROOMS(new BackroomsFactory(), GameType.PROTOTYPE), - ANVILRUN(new AnvilRunFactory(), GameType.PROTOTYPE), + BOWSPLEEF(new BowSpleefFactory(), GameType.PROTOTYPE), TETRIS(new TetrisFactory(), GameType.OTHER), TNTRUN(new TntRunFactory(), GameType.OTHER), + ANVILRUN(new AnvilRunFactory(), GameType.PVE), ACIDRAIN(new AcidRainFactory(), GameType.PVE), ELYTRARACE(new ElytraRaceFactory(), GameType.PVP), - SPLEEF(new SpleefFactory(), GameType.PVP), - BOWSPLEEF(new BowSpleefFactory(), GameType.PVP); + SPLEEF(new SpleefFactory(), GameType.PVP); private final GameFactory factory; private final GameType type; diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/acidRain/AcidRainFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/acidRain/AcidRainFactory.java index 3f6964b..bc189d4 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/acidRain/AcidRainFactory.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/acidRain/AcidRainFactory.java @@ -15,6 +15,11 @@ public class AcidRainFactory implements GameFactory { return TranslatedComponent.byId("game_AcidRain#name"); } + @Override + public TranslatedComponent description() { + return TranslatedComponent.byId("game_AcidRain#description"); + } + @Override public Material symbol() { return Material.SLIME_BALL; diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java index 86bc7f7..0466661 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bowSpleef/BowSpleefFactory.java @@ -12,7 +12,12 @@ import java.util.Map; public class BowSpleefFactory implements GameFactory { @Override public TranslatedComponent name() { - return TranslatedComponent.byId(""); + return TranslatedComponent.byId("game_BowSpleef#name"); + } + + @Override + public TranslatedComponent description() { + return TranslatedComponent.byId("game_BowSpleef#description"); } @Override diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRaceFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRaceFactory.java index c805d47..2a61818 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRaceFactory.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRaceFactory.java @@ -14,7 +14,12 @@ import java.util.Map; public class ElytraRaceFactory implements GameFactory { @Override public TranslatedComponent name() { - return TranslatedComponent.byId(""); + return TranslatedComponent.byId("game_ElytraRace#name"); + } + + @Override + public TranslatedComponent description() { + return TranslatedComponent.byId("game_ElytraRace#description"); } @Override @@ -25,7 +30,7 @@ public class ElytraRaceFactory implements GameFactory { @Override public ConfigManager configuration() { return new ConfigManager() - .addOption(new NumericOption("ringCount", Material.DIAMOND_BLOCK, TranslatedComponent.byId("ringCount"), 5, 10, 20, 30, 40, 50)); + .addOption(new NumericOption("ringCount", Material.DIAMOND_BLOCK, TranslatedComponent.byId("game_ElytraRace#ringCount"), 5, 10, 20, 30, 40, 50)); } @Override diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/minerun/MinerunFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/minerun/MinerunFactory.java index cb0d03a..ef534f5 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/minerun/MinerunFactory.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/minerun/MinerunFactory.java @@ -22,7 +22,7 @@ public class MinerunFactory implements GameFactory { return new ConfigManager() .addOption(new NumericOption("width", Material.OAK_FENCE, TranslatedComponent.byId("optionCommon#width"), 10, 30, 50, 100)) .addOption(new NumericOption("length", Material.ZOMBIE_HEAD, TranslatedComponent.byId("optionCommon#length"), 50, 100, 150, 200)) - .addOption(new NumericOption("percentage", Material.LIGHT_WEIGHTED_PRESSURE_PLATE, TranslatedComponent.byId("game_Minerun#optionPercentageMiens"), 30, 40, 50, 60, 70)); + .addOption(new NumericOption("percentage", Material.LIGHT_WEIGHTED_PRESSURE_PLATE, TranslatedComponent.byId("game_Minerun#optionPercentageMines"), 30, 40, 50, 60, 70)); } @Override diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/SpleefFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/SpleefFactory.java index e238957..9d8a328 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/SpleefFactory.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/spleef/SpleefFactory.java @@ -33,7 +33,7 @@ public class SpleefFactory implements GameFactory { @Override public ConfigManager configuration() { return new ConfigManager() - .addOption(new NumericOption("radius", Material.HEART_OF_THE_SEA, TranslatedComponent.byId("game_Spleef#radius"), 10, 20, 30)) + .addOption(new NumericOption("radius", Material.HEART_OF_THE_SEA, TranslatedComponent.byId("optionCommon#radius"), 10, 20, 30)) .addOption(new NumericOption("stackCount", Material.SCAFFOLDING, TranslatedComponent.byId("game_Spleef#stackCount"), 1, 2, 3, 4, 5)); } diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRunFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRunFactory.java index 0bc3dd4..79665b2 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRunFactory.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tntrun/TntRunFactory.java @@ -14,7 +14,12 @@ import java.util.Map; public class TntRunFactory implements GameFactory { @Override public TranslatedComponent name() { - return TranslatedComponent.byId("game_tntRun#name"); + return TranslatedComponent.byId("game_TntRun#name"); + } + + @Override + public TranslatedComponent description() { + return TranslatedComponent.byId("game_TntRun#description"); } @Override @@ -25,8 +30,8 @@ public class TntRunFactory implements GameFactory { @Override public ConfigManager configuration() { return new ConfigManager() - .addOption(new NumericOption("radius", Material.STICK, TranslatedComponent.byId("game_tntRun#radius"), 20, 30, 50, 60)) - .addOption(new NumericOption("levels", Material.SCAFFOLDING, TranslatedComponent.byId("game_tntRun#levels"), 1, 2, 3, 4, 5)); + .addOption(new NumericOption("radius", Material.STICK, TranslatedComponent.byId("optionCommon#radius"), 20, 30, 50, 60)) + .addOption(new NumericOption("levels", Material.SCAFFOLDING, TranslatedComponent.byId("game_TntRun#levels"), 1, 2, 3, 4, 5)); } @Override diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRaceFactory.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRaceFactory.java index 83eaded..cf78b58 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRaceFactory.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/trafficlightrace/TrafficLightRaceFactory.java @@ -17,6 +17,11 @@ public class TrafficLightRaceFactory implements GameFactory { return TranslatedComponent.byId("game_TrafficlightRace#name"); } + @Override + public TranslatedComponent description() { + return TranslatedComponent.byId("game_TrafficlightRace#description"); + } + @Override public ConfigManager configuration() { return new ConfigManager() diff --git a/src/main/java/eu/mhsl/minenet/minigames/lang/Languages.java b/src/main/java/eu/mhsl/minenet/minigames/lang/Languages.java index 32c6d44..66bf0bb 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/lang/Languages.java +++ b/src/main/java/eu/mhsl/minenet/minigames/lang/Languages.java @@ -31,7 +31,7 @@ public class Languages { return getLanguage(p.getSettings().locale().toString()); // TODO funktioniert die locale noch? } public Lang getLanguage(String mapId) { - return languages.computeIfAbsent(mapId, unused -> languages.computeIfAbsent(defaultLanguage, (key) -> new DummyLang())); + return languages.computeIfAbsent(mapId.toLowerCase(), unused -> languages.computeIfAbsent(defaultLanguage, (key) -> new DummyLang())); } private void readAll() { diff --git a/src/main/resources/lang/locales.map.csv b/src/main/resources/lang/locales.map.csv index 7b00cc1..bc53024 100644 --- a/src/main/resources/lang/locales.map.csv +++ b/src/main/resources/lang/locales.map.csv @@ -23,7 +23,11 @@ other_description;Games which does not fit into other Categories;Spiele welche n pvp;Player vs Player;Spieler gegen Spieler pvp_description;Fight against other Players;Kämpfe gegen andere Spieler pve;Player vs Enviroment;Spieler gegen Umwelt -pve_description;Surivie the world or fight entities;Überlebe die Welt oder kämpfe gegen Mobs +pve_description;Survive the world or fight entities;Überlebe die Welt oder kämpfe gegen Mobs +jumpnrun;jump and run;jump and run +jumpnrun_description;Proof your jump-and-run skills;Stelle deine jump-and-run Fähigkeiten unter Beweis +prototype;Prototype;Prototyp +prototype_description;Prototype games;Prototyp Spiele ;; ns:hub#;; invTitle;MineNet Servernetwork;MineNet Servernetzwerk @@ -65,15 +69,26 @@ noOptionDescription;There are no options for this Game;Es gibt keine Einstellung ns:GameFactory#;; missingDescription;No description;Keine Beschreibung ;; +ns:game_TntRun#;; +name;tnt run;TNT Rennen +description;The tnt at the ground disappears, don't fall;Das TNT am Boden verschwindet, falle nicht herunter +levels;levels;Ebenen +;; +ns:game_ElytraRace#;; +name;elytra race;Elytra Rennen +description;Be fast while flying through the rings;Sei schnell während du durch die Ringe fliegst +ringCount;ring count;Anzahl der Ringe +;; ns:game_Minerun#;; name;Minerun;Minenrennen description;Ditch deadly Mines in the ground an be the first in the goal;Weiche den tödlichen Bodenmienen aus und sei der erste im Ziel -optionPercentageMines;Percentage of Miens;Prozentsatz der Minen +optionPercentageMines;Percentage of mines;Prozentsatz der Minen ;; ns:game_Deathcube#;; name;Deathcube;Todeswürfel description;Find a way to jump higher and be the first on the top;Finde einen weg nach oben und sei der erste im Ziel optionPercentageBlocks;Percentage of Blocks;Prozentsatz der Blöcke +optionPvpEnabled;pvp enabled;PvP aktiviert ;; ns:game_Stickfight#;; name;Stickfight;Stockschlacht @@ -83,6 +98,14 @@ ns:game_TrafficlightRace#;; name;Red light green light;Rotes licht, Grünes licht description;Only go forward if the Trafficlights show green;Gehe nur bei Grün vorran ;; +ns:game_AcidRain#;; +name;acid rain;Säureregen +description;Stay under the holey roof to dodge acid rain;Bleib unter dem löchrigen Dach um dem sauren Regen auszuweichen +;; +ns:game_BowSpleef#;; +name;bow spleef;Bogen Spleef +description;Spleef other players and be the last survivor;Zerstöre Blöcke unter anderen Spielern und sei der letzte im Feld +;; ns:game_Towerdefense#;; name;Towerdefense;Towerdefense description;Protect the path ????;?????? @@ -91,6 +114,7 @@ ns:game_Spleef#;; name;Spleef;Spleef; description;Spleef other players and be the last survivor;Zerstöre Blöcke unter anderen Spielern und sei der letzte im Feld shovelName;Snow thrower;Schneeflug +stackCount;levels;Ebenen ;; ns:game_Tetris#;; name;Tetris;Tetris