Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-30 12:29:16 +00:00
Code Issues Releases Activity

Merge branch 'remapped' into modelengine_backpack

Browse Source
This commit is contained in:
LoJoSho
2023-02-16 14:50:03 -06:00
parent a01f35c53d 17179cbe35
commit fb8dcf53e3
12 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java
View File

@@ -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;

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

@@ -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;

5
common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java
View File

@@ -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();
}
}

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

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