From 1fd78cf11dabb831e8eb136ce0230817f72c2e28 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sun, 28 Aug 2022 18:07:48 +0200 Subject: [PATCH] Closes: #106 Signed-off-by: yoyosource --- BauSystem_Main/src/BauSystem.properties | 2 +- BauSystem_Main/src/BauSystem_de.properties | 2 +- .../steamwar/bausystem/features/script/CustomScriptManager.java | 2 +- .../de/steamwar/bausystem/features/util/InventoryFiller.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BauSystem_Main/src/BauSystem.properties b/BauSystem_Main/src/BauSystem.properties index 19501886..9a709a1f 100644 --- a/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem_Main/src/BauSystem.properties @@ -387,7 +387,7 @@ SCRIPT_COMMAND_ITEM_NAME = §7Command§8: §e{0} ## Script Menu GUI SCRIPT_MENU_GUI_ITEM_LORE_1 = §7Click to retrieve -SCRIPT_MENU_GUI_ITEM_LORE_2 = §7Middle-Click to copy +SCRIPT_MENU_GUI_ITEM_LORE_2 = §7Shift-Click to copy SCRIPT_MENU_GUI_NAME = §eScript Commands {0}{1}§7% SCRIPT_MENU_GUI_ITEM_ADD_NAME = §eInsert SCRIPT_MENU_GUI_ITEM_ADD_LORE = §7Click with a book to insert diff --git a/BauSystem_Main/src/BauSystem_de.properties b/BauSystem_Main/src/BauSystem_de.properties index 65b2a5f7..37dda73a 100644 --- a/BauSystem_Main/src/BauSystem_de.properties +++ b/BauSystem_Main/src/BauSystem_de.properties @@ -388,7 +388,7 @@ SCRIPT_COMMAND_ITEM_NAME = §7Command§8: §e{0} ## Script Menu GUI SCRIPT_MENU_GUI_ITEM_LORE_1 = §7Klicke zum rausnehmen -SCRIPT_MENU_GUI_ITEM_LORE_2 = §7Middle Klicke zum kopieren +SCRIPT_MENU_GUI_ITEM_LORE_2 = §7Shift Klicke zum kopieren SCRIPT_MENU_GUI_NAME = §eScript Commands {0}{1}§7% SCRIPT_MENU_GUI_ITEM_ADD_NAME = §eHinzufügen SCRIPT_MENU_GUI_ITEM_ADD_LORE = §7Klicke mit einem Buch zum hinzufügen diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScriptManager.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScriptManager.java index 06b23727..6b8a58fb 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScriptManager.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScriptManager.java @@ -184,7 +184,7 @@ public class CustomScriptManager implements Listener { String menuName = BauSystem.MESSAGE.parse("SCRIPT_MENU_GUI_NAME", p, percentage > 99 ? "§c" : (percentage >= 75 ? "§6" : "§a"), percentage); SWListInv menuCommandSWListInv = new SWListInv<>(p, menuName, false, menuCommands, (clickType, menuCommand) -> { - if (!clickType.isCreativeAction()) { + if (!clickType.isShiftClick()) { playerMap.get(p).removeIf(customCommand -> customCommand == menuCommand); } SWUtils.giveItemToPlayer(p, menuCommand.toItem(p).getItemStack()); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/InventoryFiller.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/InventoryFiller.java index 776788de..37c957bc 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/InventoryFiller.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/InventoryFiller.java @@ -54,7 +54,7 @@ public class InventoryFiller implements Listener { } /** - * For MacOS user: https://www.curseforge.com/minecraft/mc-mods/shift-scroll-fix/download + * For MacOS user: https://www.curseforge.com/minecraft/mc-mods/shift-scroll-fix */ @EventHandler public void onPlayerItemHeld(PlayerItemHeldEvent event) {