diff --git a/BauSystem_Main/src/BauSystem.properties b/BauSystem_Main/src/BauSystem.properties index 6d90e44a..83cb73c7 100644 --- a/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem_Main/src/BauSystem.properties @@ -116,6 +116,21 @@ LOADER_RUNNING = §aRunning LOADER_PAUSE = §7Pause LOADER_END = §8Finished +LOADER_MESSAGE_CLEAR = §7Loader gecleart +LOADER_MESSAGE_CLEAR-HELP = §cDu must im Setup-Modus sein um den Loader zu clearen +LOADER_MESSAGE_TNT = §eTNT hinzugefügt {0} +LOADER_MESSAGE_INTERACT = §e{0} hinzugefügt {1} + +LOADER_BUTTON_SWITCH = Hebel +LOADER_BUTTON_WOOD-Button = Knopf +LOADER_BUTTON_STONE-Button = Knopf +LOADER_BUTTON_PRESSURE-PLATE = Druckplatte +LOADER_BUTTON_WEIGHTED-PRESSURE-PLATE = Druckplatte +LOADER_BUTTON_TRIPWIRE = Tripwire +LOADER_BUTTON_NOTEBLOCK = Noteblock +LOADER_BUTTON_DAYLIGHTSENSOR = Tageslichtsensor +LOADER_BUTTON_INVALID = Invalider + # Other OTHER_ITEMS_TELEPORT_GUI_NAME=Teleportieren OTHER_ITEMS_TELEPORT_PLAYER_OFFLINE=§cDer Spieler ist Offline \ No newline at end of file diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java index e27a0eee..ae983351 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java @@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.loader; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.SWUtils; -import de.steamwar.bausystem.config.ColorConfig; import de.steamwar.bausystem.features.loader.activations.AbstractLoaderActivation; import de.steamwar.bausystem.features.loader.activations.BlockPlaceLoaderActivation; import de.steamwar.bausystem.features.loader.activations.InteractionActivation; @@ -117,9 +116,9 @@ public class Loader implements Listener { public void clear() { if (stage == Stage.SETUP) { actions.clear(); - p.sendMessage(BauSystem.PREFIX + ColorConfig.BASE + "Loader gecleart"); + BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR", p); } else { - p.sendMessage(BauSystem.PREFIX + ColorConfig.ERROR + "Du must im Setup-Modus sein um den Loader zu clearen"); + BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR-HELP", p); } } @@ -173,7 +172,7 @@ public class Loader implements Listener { } actions.add(new BlockPlaceLoaderActivation(p, event.getBlock().getLocation(), Material.TNT)); - SWUtils.sendToActionbar(p, ColorConfig.HIGHLIGHT + "TNT hinzugefügt " + actions.size()); + SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("LOADER_MESSAGE_TNT", p, actions.size())); } @EventHandler @@ -194,7 +193,7 @@ public class Loader implements Listener { if (button != LoaderButton.INVALID) { actions.add(InteractionActivation.construct(p, event.getClickedBlock().getLocation(), this)); lastActivation = 0; - SWUtils.sendToActionbar(p, ColorConfig.HIGHLIGHT + button.getName() + " hinzugefügt " + actions.size()); + SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("LOADER_MESSAGE_INTERACT", p, BauSystem.MESSAGE.parse(button.getName(), p), actions.size())); } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java index 87b230d5..dc1804c4 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java @@ -25,15 +25,15 @@ import org.bukkit.block.Block; @AllArgsConstructor public enum LoaderButton { - SWITCH(0, true, "Hebel"), - WOOD_BUTTON(30, "Knopf"), - STONE_BUTTON(20, "Knopf"), - PRESSURE_PLATE(30, "Druckplatte"), - WEIGHTED_PRESSURE_PLATE(20, "Druckplatte"), - TRIPWIRE(30, "Tripwire"), - NOTEBLOCK(1, "Noteblock"), - DAYLIGHTSENSOR(0, true, "Tageslichtsensor"), - INVALID(-1, "Invalider"); + SWITCH(0, true, "LOADER_BUTTON_SWITCH"), + WOOD_BUTTON(30, "LOADER_BUTTON_WOOD-Button"), + STONE_BUTTON(20, "LOADER_BUTTON_STONE-Button"), + PRESSURE_PLATE(30, "LOADER_BUTTON_PRESSURE-PLATE"), + WEIGHTED_PRESSURE_PLATE(20, "LOADER_BUTTON_WEIGHTED-PRESSURE-PLATE"), + TRIPWIRE(30, "LOADER_BUTTON_TRIPWIRE"), + NOTEBLOCK(1, "LOADER_BUTTON_NOTEBLOCK"), + DAYLIGHTSENSOR(0, true, "LOADER_BUTTON_DAYLIGHTSENSOR"), + INVALID(-1, "LOADER_BUTTON_INVALID"); @Getter private final int time;