Move toolbelt container to unique capability

Author: M-W-K

src/main/java/gregtech/api/capability/GregtechCapabilities.java

@@ -2,6 +2,7 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.capability.impl.EUToFEProvider;
+import gregtech.api.items.toolitem.ItemGTToolbelt;
 import gregtech.api.util.GTUtility;
 import gregtech.common.metatileentities.converter.ConverterTrait;
 
@@ -22,6 +23,9 @@ public class GregtechCapabilities {
     @CapabilityInject(IElectricItem.class)
     public static Capability<IElectricItem> CAPABILITY_ELECTRIC_ITEM = null;
 
+    @CapabilityInject(ItemGTToolbelt.ToolStackHandler.class)
+    public static Capability<ItemGTToolbelt.ToolStackHandler> CAPABILITY_TOOLBELT_HANDLER = null;
+
     @CapabilityInject(IMultiblockController.class)
     public static Capability<IMultiblockController> CAPABILITY_MULTIBLOCK_CONTROLLER = null;
 

src/main/java/gregtech/api/capability/SimpleCapabilityManager.java

@@ -2,6 +2,7 @@
 
 import gregtech.api.capability.impl.AbstractRecipeLogic;
 import gregtech.api.cover.CoverHolder;
+import gregtech.api.items.toolitem.ItemGTToolbelt;
 import gregtech.api.metatileentity.multiblock.IMaintenance;
 import gregtech.api.worldgen.generator.GTWorldGenCapability;
 import gregtech.common.metatileentities.converter.ConverterTrait;
@@ -37,6 +38,7 @@ public void readNBT(Capability<T> capability, T instance, EnumFacing side, NBTBa
     public static void init() {
         registerCapabilityWithNoDefault(IEnergyContainer.class);
         registerCapabilityWithNoDefault(IElectricItem.class);
+        registerCapabilityWithNoDefault(ItemGTToolbelt.ToolStackHandler.class);
         registerCapabilityWithNoDefault(IWorkable.class);
         registerCapabilityWithNoDefault(CoverHolder.class);
         registerCapabilityWithNoDefault(IControllable.class);

src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java

@@ -1,6 +1,7 @@
 package gregtech.api.items.toolitem;
 
 import gregtech.api.GregTechAPI;
+import gregtech.api.capability.GregtechCapabilities;
 import gregtech.api.items.IDyeableItem;
 import gregtech.api.items.gui.ItemUIFactory;
 import gregtech.api.items.toolitem.behavior.IToolBehavior;
@@ -420,8 +421,7 @@ public boolean supportsTool(ItemStack stack, ItemStack tool) {
     }
 
     private ToolStackHandler getHandler(ItemStack stack) {
-        // use the very rarely used sidedness of item capabilities to signal that we want to ignore passthrough
-        IItemHandler handler = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP);
+        IItemHandler handler = stack.getCapability(GregtechCapabilities.CAPABILITY_TOOLBELT_HANDLER, null);
         if (handler instanceof ToolStackHandler h) return h;
         else return FALLBACK;
     }
@@ -569,6 +569,8 @@ public ToolbeltCapabilityProvider(ItemStack stack) {
 
         @Override
         public boolean hasCapability(@NotNull Capability<?> capability, EnumFacing facing) {
+            if (capability == GregtechCapabilities.CAPABILITY_TOOLBELT_HANDLER)
+                return true;
             ItemStack selected = getHandler().getSelectedStack();
             if (!selected.isEmpty() && facing != EnumFacing.UP) {
                 return selected.hasCapability(capability, facing);
@@ -577,12 +579,15 @@ public boolean hasCapability(@NotNull Capability<?> capability, EnumFacing facin
 
         @Override
         public <T> T getCapability(@NotNull Capability<T> capability, EnumFacing facing) {
+            if (capability == GregtechCapabilities.CAPABILITY_TOOLBELT_HANDLER)
+                return GregtechCapabilities.CAPABILITY_TOOLBELT_HANDLER.cast(this.getHandler());
             ItemStack selected = getHandler().getSelectedStack();
-            if (!selected.isEmpty() && facing != EnumFacing.UP) {
+            if (!selected.isEmpty()) {
                 return selected.getCapability(capability, facing);
-            } else if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
+            } else if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
+                // if nothing is selected, expose the handler under the item handler capability
                 return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(this.getHandler());
-            else return null;
+            } else return null;
         }
 
         @Override
@@ -622,7 +627,7 @@ public void readNBTShareTag(ItemStack stack, NBTTagCompound nbt) {
 
     protected static final ToolStackHandler FALLBACK = new ToolStackHandler(0);
 
-    protected static class ToolStackHandler extends ItemStackHandler {
+    public static class ToolStackHandler extends ItemStackHandler {
 
         private static final Set<String> EMPTY = ImmutableSet.of();