From c9bc9dd2dabcde84497ead955ed4f30b7f21fe97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Mon, 3 Oct 2022 21:13:35 +0200 Subject: [PATCH] Inspection and Cleanup --- .idea/misc.xml | 3 + resources/lang/.~lock.locales.map.csv# | 1 - resources/lang/locales.map.csv | 81 ------------------ resources/maps/hub/region/r.-1.-1.mca | Bin 4206592 -> 0 bytes resources/maps/hub/region/r.-1.-2.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.-1.0.mca | Bin 4206592 -> 0 bytes resources/maps/hub/region/r.-1.1.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.-2.-1.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.-2.-2.mca | Bin 925696 -> 0 bytes resources/maps/hub/region/r.-2.0.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.-2.1.mca | Bin 921600 -> 0 bytes resources/maps/hub/region/r.0.-1.mca | Bin 4206592 -> 0 bytes resources/maps/hub/region/r.0.-2.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.0.0.mca | Bin 4206592 -> 0 bytes resources/maps/hub/region/r.0.1.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.1.-1.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.1.-2.mca | Bin 917504 -> 0 bytes resources/maps/hub/region/r.1.0.mca | Bin 1974272 -> 0 bytes resources/maps/hub/region/r.1.1.mca | Bin 929792 -> 0 bytes resources/maps/lobby/region/r.-1.-1.mca | Bin 12288 -> 0 bytes resources/maps/lobby/region/r.-1.0.mca | Bin 12288 -> 0 bytes resources/maps/lobby/region/r.0.-1.mca | Bin 12288 -> 0 bytes resources/maps/lobby/region/r.0.0.mca | Bin 12288 -> 0 bytes resources/rbb/test.rbb | 0 resources/schematics/hay-wagon.schem | Bin 2499 -> 0 bytes resources/schematics/tree.schematic | Bin 2277 -> 0 bytes resources/schematics/trees.schematic | Bin 825948 -> 0 bytes .../java/eu/mhsl/minenet/minigames/Main.java | 2 - .../eu/mhsl/minenet/minigames/Resource.java | 4 +- .../minigames/command/admin/DebugCommand.java | 1 - .../command/admin/GamemodeCommand.java | 4 +- .../minigames/command/admin/GcCommand.java | 2 +- .../command/admin/LangTestCommand.java | 8 +- .../minigames/command/admin/RoomCommand.java | 12 ++- .../minigames/command/user/LeaveCommand.java | 4 +- .../minenet/minigames/instance/game/Game.java | 7 -- .../minigames/instance/game/GameList.java | 4 +- .../minigames/instance/game/GameType.java | 6 +- .../instance/game/minigame/Minigame.java | 18 ++-- .../config/GameConfigurationInventory.java | 15 +--- .../game/minigame/config/GameFactory.java | 2 - .../minigame/config/common/NumericOption.java | 1 - .../config/restriction/Restriction.java | 27 +----- .../config/restriction/RestrictionData.java | 11 +-- .../restriction/RestrictionHandler.java | 7 +- .../MaximalPlayeramountGameRestriction.java | 4 +- .../MinimalPlayeramountGameRestriction.java | 6 +- .../minigame/types/deathcube/Deathcube.java | 4 +- .../types/deathcube/DeathcubeFactory.java | 1 - .../game/minigame/types/minerun/Minerun.java | 10 +-- .../types/minerun/MinerunFactory.java | 1 - .../minigame/types/stickfight/Stickfight.java | 5 -- .../TrafficLightRaceFactory.java | 1 - .../minenet/minigames/instance/hub/Hub.java | 3 - .../instance/hub/inventory/HubInventory.java | 1 - .../minenet/minigames/instance/room/Room.java | 5 +- .../inventory/MinigameSelectInventory.java | 5 +- .../eu/mhsl/minenet/minigames/lang/Lang.java | 4 +- .../minenet/minigames/lang/Languages.java | 4 +- .../minenet/minigames/message/Sendable.java | 4 +- .../message/TranslatableMessage.java | 5 +- .../component/NamespacedTranslatable.java | 2 +- .../component/TranslatedComponent.java | 2 +- .../minigames/message/type/ChatMessage.java | 1 - .../mhsl/minenet/minigames/score/Score.java | 2 - .../provider/ByPlayerNameUuidProvider.java | 1 - .../shared/entity/InteractableEntity.java | 10 +-- .../inventory/InteractableInventory.java | 3 - .../minenet/minigames/skin/SkinCache.java | 3 - .../minenet/minigames/util/ColorUtil.java | 12 +-- .../minenet/minigames/util/Intersect.java | 1 - .../util/InventoryItemAlignment.java | 21 ++--- .../terrain/CircularTerrainGenerator.java | 4 +- .../terrain/SquareTerrainGenerator.java | 6 +- src/main/resources/rbb/test.rbb | 0 src/main/resources/schematics/hay-wagon.schem | Bin 2499 -> 0 bytes src/main/resources/schematics/tree.schematic | Bin 2277 -> 0 bytes src/main/resources/schematics/trees.schematic | Bin 825948 -> 0 bytes 78 files changed, 76 insertions(+), 275 deletions(-) delete mode 100644 resources/lang/.~lock.locales.map.csv# delete mode 100644 resources/lang/locales.map.csv delete mode 100644 resources/maps/hub/region/r.-1.-1.mca delete mode 100644 resources/maps/hub/region/r.-1.-2.mca delete mode 100644 resources/maps/hub/region/r.-1.0.mca delete mode 100644 resources/maps/hub/region/r.-1.1.mca delete mode 100644 resources/maps/hub/region/r.-2.-1.mca delete mode 100644 resources/maps/hub/region/r.-2.-2.mca delete mode 100644 resources/maps/hub/region/r.-2.0.mca delete mode 100644 resources/maps/hub/region/r.-2.1.mca delete mode 100644 resources/maps/hub/region/r.0.-1.mca delete mode 100644 resources/maps/hub/region/r.0.-2.mca delete mode 100644 resources/maps/hub/region/r.0.0.mca delete mode 100644 resources/maps/hub/region/r.0.1.mca delete mode 100644 resources/maps/hub/region/r.1.-1.mca delete mode 100644 resources/maps/hub/region/r.1.-2.mca delete mode 100644 resources/maps/hub/region/r.1.0.mca delete mode 100644 resources/maps/hub/region/r.1.1.mca delete mode 100644 resources/maps/lobby/region/r.-1.-1.mca delete mode 100644 resources/maps/lobby/region/r.-1.0.mca delete mode 100644 resources/maps/lobby/region/r.0.-1.mca delete mode 100644 resources/maps/lobby/region/r.0.0.mca delete mode 100644 resources/rbb/test.rbb delete mode 100644 resources/schematics/hay-wagon.schem delete mode 100644 resources/schematics/tree.schematic delete mode 100644 resources/schematics/trees.schematic delete mode 100644 src/main/resources/rbb/test.rbb delete mode 100644 src/main/resources/schematics/hay-wagon.schem delete mode 100644 src/main/resources/schematics/tree.schematic delete mode 100644 src/main/resources/schematics/trees.schematic diff --git a/.idea/misc.xml b/.idea/misc.xml index 7351ac6..943bf11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ + + +