From 05562018fc41c5870d3c8df0f94d1d647c45c902 Mon Sep 17 00:00:00 2001 From: abel1502 Date: Sun, 18 May 2025 14:35:17 +0300 Subject: [PATCH] Limit max presets --- src/main/java/com/hbm/handler/ability/IWeaponAbility.java | 8 ++++---- .../java/com/hbm/inventory/gui/GUIScreenToolAbility.java | 4 ++++ src/main/java/com/hbm/items/tool/ItemToolAbility.java | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/handler/ability/IWeaponAbility.java b/src/main/java/com/hbm/handler/ability/IWeaponAbility.java index f68333333..9a874dbb1 100644 --- a/src/main/java/com/hbm/handler/ability/IWeaponAbility.java +++ b/src/main/java/com/hbm/handler/ability/IWeaponAbility.java @@ -214,7 +214,7 @@ public interface IWeaponAbility extends IBaseAbility { @Override public int sortOrder() { - return SORT_ORDER_BASE + 5; + return SORT_ORDER_BASE + 6; } @Override @@ -245,7 +245,7 @@ public interface IWeaponAbility extends IBaseAbility { @Override public int sortOrder() { - return SORT_ORDER_BASE + 6; + return SORT_ORDER_BASE + 7; } @Override @@ -287,7 +287,7 @@ public interface IWeaponAbility extends IBaseAbility { @Override public int sortOrder() { - return SORT_ORDER_BASE + 7; + return SORT_ORDER_BASE + 8; } @Override @@ -333,7 +333,7 @@ public interface IWeaponAbility extends IBaseAbility { @Override public int sortOrder() { - return SORT_ORDER_BASE + 8; + return SORT_ORDER_BASE + 9; } @Override diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenToolAbility.java b/src/main/java/com/hbm/inventory/gui/GUIScreenToolAbility.java index 0c2a63ddb..7b6e3b1b5 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenToolAbility.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenToolAbility.java @@ -372,6 +372,10 @@ public class GUIScreenToolAbility extends GuiScreen { } protected void doAddPreset() { + if (config.presets.size() >= 99) { + return; + } + config.presets.add(config.currentPreset + 1, new ToolPreset()); config.currentPreset += 1; } diff --git a/src/main/java/com/hbm/items/tool/ItemToolAbility.java b/src/main/java/com/hbm/items/tool/ItemToolAbility.java index 112e8bad4..bf83e398b 100644 --- a/src/main/java/com/hbm/items/tool/ItemToolAbility.java +++ b/src/main/java/com/hbm/items/tool/ItemToolAbility.java @@ -426,10 +426,11 @@ public class ItemToolAbility extends ItemTool implements IDepthRockTool, IGUIPro currentPreset = nbt.getInteger("ability"); NBTTagList nbtPresets = nbt.getTagList("abilityPresets", 10); + int numPresets = Math.min(nbtPresets.tagCount(), 99); - presets = new ArrayList(nbtPresets.tagCount()); + presets = new ArrayList(numPresets); - for(int i = 0; i < nbtPresets.tagCount(); i++) { + for(int i = 0; i < numPresets; i++) { NBTTagCompound nbtPreset = nbtPresets.getCompoundTagAt(i); ToolPreset preset = new ToolPreset(); preset.readFromNBT(nbtPreset);