From 938a561d259b9279958f8984f1c2508022aa447c Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sat, 5 Aug 2023 20:04:42 -0500 Subject: [PATCH] feat: add shift left and right click events to action system, resolves #122 --- .../hmccosmetics/gui/type/types/TypeCosmetic.java | 6 ++++++ .../hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index 77f2ce8c..c0eea654 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -83,6 +83,12 @@ public class TypeCosmetic extends Type { if (clickType.isRightClick()) { if (!actionConfig.node("right-click").virtual()) actionStrings.addAll(actionConfig.node("right-click").getList(String.class)); } + if (clickType.equals(ClickType.SHIFT_LEFT)) { + if (!actionConfig.node("shift-left-click").virtual()) actionStrings.addAll(actionConfig.node("shift-left-click").getList(String.class)); + } + if (clickType.equals(ClickType.SHIFT_RIGHT)) { + if (!actionConfig.node("shift-right-click").virtual()) actionStrings.addAll(actionConfig.node("shift-right-click").getList(String.class)); + } } if (isUnEquippingCosmetic) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java index 0a8ad677..edafb0a4 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java @@ -42,6 +42,12 @@ public class TypeEmpty extends Type { if (clickType.isRightClick()) { if (!actionConfig.node("right-click").virtual()) actionStrings.addAll(actionConfig.node("right-click").getList(String.class)); } + if (clickType.equals(ClickType.SHIFT_LEFT)) { + if (!actionConfig.node("shift-left-click").virtual()) actionStrings.addAll(actionConfig.node("shift-left-click").getList(String.class)); + } + if (clickType.equals(ClickType.SHIFT_RIGHT)) { + if (!actionConfig.node("shift-right-click").virtual()) actionStrings.addAll(actionConfig.node("shift-right-click").getList(String.class)); + } } // We run the actions once we got the raw strings from the config.