Limit max presets

This commit is contained in:
abel1502 2025-05-18 14:35:17 +03:00
parent c475e4f3d3
commit 05562018fc
No known key found for this signature in database
GPG Key ID: 076926596A536338
3 changed files with 11 additions and 6 deletions

View File

@ -214,7 +214,7 @@ public interface IWeaponAbility extends IBaseAbility {
@Override @Override
public int sortOrder() { public int sortOrder() {
return SORT_ORDER_BASE + 5; return SORT_ORDER_BASE + 6;
} }
@Override @Override
@ -245,7 +245,7 @@ public interface IWeaponAbility extends IBaseAbility {
@Override @Override
public int sortOrder() { public int sortOrder() {
return SORT_ORDER_BASE + 6; return SORT_ORDER_BASE + 7;
} }
@Override @Override
@ -287,7 +287,7 @@ public interface IWeaponAbility extends IBaseAbility {
@Override @Override
public int sortOrder() { public int sortOrder() {
return SORT_ORDER_BASE + 7; return SORT_ORDER_BASE + 8;
} }
@Override @Override
@ -333,7 +333,7 @@ public interface IWeaponAbility extends IBaseAbility {
@Override @Override
public int sortOrder() { public int sortOrder() {
return SORT_ORDER_BASE + 8; return SORT_ORDER_BASE + 9;
} }
@Override @Override

View File

@ -372,6 +372,10 @@ public class GUIScreenToolAbility extends GuiScreen {
} }
protected void doAddPreset() { protected void doAddPreset() {
if (config.presets.size() >= 99) {
return;
}
config.presets.add(config.currentPreset + 1, new ToolPreset()); config.presets.add(config.currentPreset + 1, new ToolPreset());
config.currentPreset += 1; config.currentPreset += 1;
} }

View File

@ -426,10 +426,11 @@ public class ItemToolAbility extends ItemTool implements IDepthRockTool, IGUIPro
currentPreset = nbt.getInteger("ability"); currentPreset = nbt.getInteger("ability");
NBTTagList nbtPresets = nbt.getTagList("abilityPresets", 10); NBTTagList nbtPresets = nbt.getTagList("abilityPresets", 10);
int numPresets = Math.min(nbtPresets.tagCount(), 99);
presets = new ArrayList<ToolPreset>(nbtPresets.tagCount()); presets = new ArrayList<ToolPreset>(numPresets);
for(int i = 0; i < nbtPresets.tagCount(); i++) { for(int i = 0; i < numPresets; i++) {
NBTTagCompound nbtPreset = nbtPresets.getCompoundTagAt(i); NBTTagCompound nbtPreset = nbtPresets.getCompoundTagAt(i);
ToolPreset preset = new ToolPreset(); ToolPreset preset = new ToolPreset();
preset.readFromNBT(nbtPreset); preset.readFromNBT(nbtPreset);