Rebalance inventory modifiers

Tool belt now only requires an ability slot for the first level, but has multiple later levels that each add +1 slot
Shield strap is now an upgrade instead of an ability
Removed pocket chain
Pockets now grants 18 slots per level
TODO: better support for retriving items left when the tool belt slot count changes

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tool_belt_1.json

@@ -0,0 +1,25 @@
+{
+  "type": "tconstruct:modifier",
+  "inputs": [
+    {
+      "item": "minecraft:leather"
+    },
+    {
+      "tag": "forge:ingots/iron"
+    },
+    {
+      "item": "minecraft:leather"
+    }
+  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/armor/leggings"
+  },
+  "slots": {
+    "abilities": 1
+  },
+  "result": {
+    "name": "tconstruct:tool_belt",
+    "level": 1
+  },
+  "max_level": 1
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tool_belt_2.json

@@ -0,0 +1,27 @@
+{
+  "type": "tconstruct:modifier",
+  "inputs": [
+    {
+      "item": "minecraft:leather"
+    },
+    {
+      "tag": "forge:ingots/gold"
+    },
+    {
+      "item": "minecraft:leather"
+    }
+  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/armor/leggings"
+  },
+  "requirements": {
+    "name": "tconstruct:tool_belt",
+    "level": 1,
+    "error": "recipe.tconstruct.modifier.tool_belt"
+  },
+  "result": {
+    "name": "tconstruct:tool_belt",
+    "level": 1
+  },
+  "max_level": 2
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tool_belt_3.json

@@ -0,0 +1,27 @@
+{
+  "type": "tconstruct:modifier",
+  "inputs": [
+    {
+      "item": "minecraft:leather"
+    },
+    {
+      "tag": "forge:ingots/rose_gold"
+    },
+    {
+      "item": "minecraft:leather"
+    }
+  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/armor/leggings"
+  },
+  "requirements": {
+    "name": "tconstruct:tool_belt",
+    "level": 2,
+    "error": "recipe.tconstruct.modifier.tool_belt"
+  },
+  "result": {
+    "name": "tconstruct:tool_belt",
+    "level": 1
+  },
+  "max_level": 3
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tool_belt_4.json

@@ -0,0 +1,27 @@
+{
+  "type": "tconstruct:modifier",
+  "inputs": [
+    {
+      "item": "minecraft:leather"
+    },
+    {
+      "tag": "forge:ingots/cobalt"
+    },
+    {
+      "item": "minecraft:leather"
+    }
+  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/armor/leggings"
+  },
+  "requirements": {
+    "name": "tconstruct:tool_belt",
+    "level": 3,
+    "error": "recipe.tconstruct.modifier.tool_belt"
+  },
+  "result": {
+    "name": "tconstruct:tool_belt",
+    "level": 1
+  },
+  "max_level": 4
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tool_belt.json → src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tool_belt_5.json

@@ -7,25 +7,21 @@
     {
       "tag": "forge:ingots/hepatizon"
     },
-    {
-      "item": "minecraft:leather"
-    },
-    {
-      "item": "minecraft:leather"
-    },
     {
       "item": "minecraft:leather"
     }
   ],
   "tools": {
     "tag": "tconstruct:modifiable/armor/leggings"
   },
-  "slots": {
-    "abilities": 1
+  "requirements": {
+    "name": "tconstruct:tool_belt",
+    "level": 4,
+    "error": "recipe.tconstruct.modifier.tool_belt"
   },
   "result": {
     "name": "tconstruct:tool_belt",
     "level": 1
   },
-  "max_level": 2
+  "max_level": 5
 }

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tool_belt_6.json

@@ -0,0 +1,27 @@
+{
+  "type": "tconstruct:modifier",
+  "inputs": [
+    {
+      "item": "minecraft:leather"
+    },
+    {
+      "tag": "forge:ingots/manyullyn"
+    },
+    {
+      "item": "minecraft:leather"
+    }
+  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/armor/leggings"
+  },
+  "requirements": {
+    "name": "tconstruct:tool_belt",
+    "level": 5,
+    "error": "recipe.tconstruct.modifier.tool_belt"
+  },
+  "result": {
+    "name": "tconstruct:tool_belt",
+    "level": 1
+  },
+  "max_level": 6
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/shield_strap.json → src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/shield_strap.json

@@ -4,7 +4,7 @@
     "tag": "tconstruct:modifiable/armor/leggings"
   },
   "slots": {
-    "abilities": 1
+    "upgrades": 1
   },
   "modifier": "tconstruct:shield_strap",
   "min_level": 1

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/shield_strap.json → src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/shield_strap.json

@@ -15,11 +15,10 @@
     "tag": "tconstruct:modifiable/armor/leggings"
   },
   "slots": {
-    "abilities": 1
+    "upgrades": 1
   },
   "result": {
     "name": "tconstruct:shield_strap",
     "level": 1
-  },
-  "max_level": 1
+  }
 }

src/generated/resources/data/tconstruct/tinkering/modifiers/pocket_chain.json

@@ -0,0 +1,7 @@
+{
+  "redirects": [
+    {
+      "id": "tconstruct:shield_strap"
+    }
+  ]
+}

src/generated/resources/data/tconstruct/tinkering/modifiers/pockets.json

@@ -0,0 +1,4 @@
+{
+  "type": "tconstruct:inventory_with_menu",
+  "size": 18
+}

src/generated/resources/data/tconstruct/tinkering/modifiers/tool_belt.json

@@ -0,0 +1,11 @@
+{
+  "type": "tconstruct:tool_belt",
+  "level_slots": [
+    4,
+    5,
+    6,
+    7,
+    8,
+    9
+  ]
+}

src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java

@@ -243,12 +243,12 @@ protected void generate() {
       with.accept(ModifierIds.looting);
       withL.accept(TinkerModifiers.pathMaker);
       withL.accept(TinkerModifiers.plowing);
-      withL.accept(TinkerModifiers.pockets);
+      with.accept(ModifierIds.pockets);
       withL.accept(TinkerModifiers.shieldStrap);
       withL.accept(TinkerModifiers.slurping);
       withL.accept(TinkerModifiers.snowdrift);
       with.accept(ModifierIds.strength);
-      withL.accept(TinkerModifiers.toolBelt);
+      with.accept(ModifierIds.toolBelt);
       withL.accept(TinkerModifiers.unarmed);
       withL.accept(TinkerModifiers.zoom);
       // harvest

src/main/java/slimeknights/tconstruct/library/json/serializer/GenericIntSerializer.java

@@ -0,0 +1,39 @@
+package slimeknights.tconstruct.library.json.serializer;
+
+import com.google.gson.JsonObject;
+import lombok.RequiredArgsConstructor;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.util.GsonHelper;
+import slimeknights.mantle.data.GenericLoaderRegistry.IGenericLoader;
+import slimeknights.mantle.data.GenericLoaderRegistry.IHaveLoader;
+
+import java.util.function.IntFunction;
+import java.util.function.ToIntFunction;
+
+/** Generic serializer for classes that just have a single int value */
+@RequiredArgsConstructor
+public class GenericIntSerializer<T extends IHaveLoader<?>> implements IGenericLoader<T> {
+  private final String key;
+  private final IntFunction<T> constructor;
+  private final ToIntFunction<T> getter;
+
+  @Override
+  public void serialize(T object, JsonObject json) {
+    json.addProperty(key, getter.applyAsInt(object));
+  }
+
+  @Override
+  public T deserialize(JsonObject json) {
+    return constructor.apply(GsonHelper.getAsInt(json, key));
+  }
+
+  @Override
+  public void toNetwork(T object, FriendlyByteBuf buffer) {
+    buffer.writeVarInt(getter.applyAsInt(object));
+  }
+
+  @Override
+  public T fromNetwork(FriendlyByteBuf buffer) {
+    return constructor.apply(buffer.readVarInt());
+  }
+}

src/main/java/slimeknights/tconstruct/library/json/serializer/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package slimeknights.tconstruct.library.json.serializer;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/slimeknights/tconstruct/tools/modifiers/ability/armor/PocketsModifier.java → src/main/java/slimeknights/tconstruct/library/modifiers/dynamic/InventoryMenuModifier.java

@@ -1,20 +1,23 @@
-package slimeknights.tconstruct.tools.modifiers.ability.armor;
+package slimeknights.tconstruct.library.modifiers.dynamic;
 
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Player;
-import slimeknights.tconstruct.TConstruct;
+import slimeknights.mantle.data.GenericLoaderRegistry.IGenericLoader;
+import slimeknights.tconstruct.library.json.serializer.GenericIntSerializer;
+import slimeknights.tconstruct.library.modifiers.Modifier;
 import slimeknights.tconstruct.library.modifiers.hooks.IArmorInteractModifier;
 import slimeknights.tconstruct.library.modifiers.impl.InventoryModifier;
 import slimeknights.tconstruct.library.tools.capability.ToolInventoryCapability;
 import slimeknights.tconstruct.library.tools.nbt.IToolStackView;
 
 import javax.annotation.Nullable;
 
-public class PocketsModifier extends InventoryModifier implements IArmorInteractModifier {
-  private static final ResourceLocation INVENTORY_KEY = TConstruct.getResource("pockets");
-  public PocketsModifier() {
-    super(INVENTORY_KEY, 9);
+public class InventoryMenuModifier extends InventoryModifier implements IArmorInteractModifier {
+  /** Loader instance */
+  public static final GenericIntSerializer<InventoryMenuModifier> LOADER = new GenericIntSerializer<>("size", InventoryMenuModifier::new, t -> t.slotsPerLevel);
+
+  public InventoryMenuModifier(int size) {
+    super(size);
   }
 
   @Override
@@ -34,4 +37,9 @@ public <T> T getModule(Class<T> type) {
     }
     return super.getModule(type);
   }
+
+  @Override
+  public IGenericLoader<? extends Modifier> getLoader() {
+    return LOADER;
+  }
 }