Merge branch 'remapped' into modelengine_backpack

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.2.0"
+version = "2.2.1"
 
 allprojects {
     apply(plugin = "java")

common/settings.gradle.kts

@@ -1,8 +1 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven("https://repo.papermc.io/repository/maven-public/")
-    }
-}
-
 rootProject.name = "HMCCosmetics"

common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java

@@ -25,6 +25,8 @@ public class Settings {
     private static final String PARTICLE_COUNT = "particle-count";
     private static final String DYE_MENU_PATH = "dye-menu";
     private static final String DYE_MENU_NAME = "title";
+    private static final String DYE_MENU_INPUT_SLOT = "input-slot";
+    private static final String DYE_MENU_OUTPUT_SLOT = "output-slot";
     private static final String DEBUG_ENABLE_PETH = "debug-mode";
     private static final String TICK_PERIOD_PATH = "tick-period";
     private static final String UNAPPLY_DEATH_PATH = "unapply-on-death";
@@ -33,6 +35,8 @@ public class Settings {
 
     private static String defaultMenu;
     private static String dyeMenuName;
+    private static int dyeMenuInputSlot;
+    private static int dyeMenuOutputSlot;
     private static int configVersion;
     private static boolean requireEmptyHelmet;
     private static boolean requireEmptyOffHand;
@@ -85,6 +89,8 @@ public class Settings {
         ConfigurationNode dyeMenuSettings = source.node(DYE_MENU_PATH);
 
         dyeMenuName = dyeMenuSettings.node(DYE_MENU_NAME).getString("Dye Menu");
+        dyeMenuInputSlot = dyeMenuSettings.node(DYE_MENU_INPUT_SLOT).getInt(19);
+        dyeMenuOutputSlot = dyeMenuSettings.node(DYE_MENU_OUTPUT_SLOT).getInt(25);
     }
 
     private static Vector loadVector(final ConfigurationNode config) {
@@ -178,6 +184,8 @@ public class Settings {
     public static String getDyeMenuName() {
         return dyeMenuName;
     }
+    public static int getDyeMenuInputSlot() { return dyeMenuInputSlot; }
+    public static int getDyeMenuOutputSlot() { return dyeMenuOutputSlot; }
 
     public static boolean isDebugEnabled() {
         return debugMode;

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java

@@ -30,10 +30,10 @@ public class DyeMenu {
         Player player = user.getPlayer();
         Gui gui = HMCColorApi.INSTANCE.colorMenu();
         gui.updateTitle(Placeholder.applyPapiPlaceholders(player, Settings.getDyeMenuName()));
-        gui.setItem(19, new GuiItem(originalItem));
+        gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem));
         gui.setDefaultTopClickAction(event -> {
-            if (event.getSlot() == 25) {
-                ItemStack item = event.getInventory().getItem(25);
+            if (event.getSlot() == Settings.getDyeMenuOutputSlot()) {
+                ItemStack item = event.getInventory().getItem(Settings.getDyeMenuOutputSlot());
                 if (item == null) return;
                 ItemMeta meta = item.getItemMeta();
                 if (meta == null) return;

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java

@@ -66,7 +66,8 @@ public class Hooks {
     }
 
     public static boolean isActiveHook(String id) {
-        if (!hooks.containsKey(getHook(id))) return false;
-        return hooks.get(getHook(id)).getActive();
+        Hook hook = getHook(id);
+        if (hook == null) return false;
+        return hook.getActive();
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HookPlaceholderAPI.java

@@ -5,7 +5,7 @@ import com.hibiscusmc.hmccosmetics.hooks.Hook;
 public class HookPlaceholderAPI extends Hook {
 
     public HookPlaceholderAPI() {
-        super("placeholderapi");
+        super("PlaceholderAPI");
     }
 
     @Override

common/src/main/resources/config.yml

@@ -38,6 +38,8 @@ dye-menu:
   # If you use ItemsAdder, set this to "§f:offset_-8::cosmetics_gui:"
   # If you use Oraxen, set this to "<glyph:neg_shift_8><glyph:dye_menu>"
   title: "§f"
+  input-slot: 19
+  output-slot: 25
 wardrobe:
   # spawn static wardrobe if in this radius of wardrobe-location
   static-radius: 10
@@ -81,4 +83,4 @@ wardrobe:
     y: 5
     z: 5
     yaw: 0
-    pitch: 0
+    pitch: 0

settings.gradle.kts

@@ -1,9 +1,3 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven("https://repo.papermc.io/repository/maven-public/")
-    }
-}
 rootProject.name = "HMCCosmetics"
 include(
     "common",

v1_17_R1/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.3.8"
+    id("io.papermc.paperweight.userdev") version "1.5.1"
 }
 
 dependencies {

v1_18_R2/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.3.8"
+    id("io.papermc.paperweight.userdev") version "1.5.1"
 }
 
 dependencies {

v1_19_R1/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.3.8"
+    id("io.papermc.paperweight.userdev") version "1.5.1"
 }
 
 dependencies {

v1_19_R2/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.3.8"
+    id("io.papermc.paperweight.userdev") version "1.5.1"
 }
 
 dependencies {