address review

Author: M-W-K

src/main/java/gregtech/api/items/IDyeableItem.java

@@ -16,15 +16,17 @@
 
 public interface IDyeableItem {
 
+    String COLOR_KEY = "gt_color";
+
     default boolean hasColor(ItemStack stack) {
         NBTTagCompound nbttagcompound = stack.getTagCompound();
-        return nbttagcompound != null && nbttagcompound.hasKey("color", Constants.NBT.TAG_INT);
+        return nbttagcompound != null && nbttagcompound.hasKey(COLOR_KEY, Constants.NBT.TAG_INT);
     }
 
     default int getColor(ItemStack stack) {
         NBTTagCompound nbttagcompound = stack.getTagCompound();
-        if (nbttagcompound != null && nbttagcompound.hasKey("color", Constants.NBT.TAG_INT)) {
-            return nbttagcompound.getInteger("color");
+        if (nbttagcompound != null && nbttagcompound.hasKey(COLOR_KEY, Constants.NBT.TAG_INT)) {
+            return nbttagcompound.getInteger(COLOR_KEY);
         }
         return getDefaultColor(stack);
     }
@@ -35,8 +37,8 @@ default int getDefaultColor(ItemStack stack) {
 
     default void removeColor(ItemStack stack) {
         NBTTagCompound nbttagcompound = stack.getTagCompound();
-        if (nbttagcompound != null && nbttagcompound.hasKey("color")) {
-            nbttagcompound.removeTag("color");
+        if (nbttagcompound != null && nbttagcompound.hasKey(COLOR_KEY)) {
+            nbttagcompound.removeTag(COLOR_KEY);
         }
     }
 
@@ -46,7 +48,7 @@ default void setColor(ItemStack stack, int color) {
             nbttagcompound = new NBTTagCompound();
             stack.setTagCompound(nbttagcompound);
         }
-        nbttagcompound.setInteger("color", color);
+        nbttagcompound.setInteger(COLOR_KEY, color);
     }
 
     default @NotNull EnumActionResult onItemUseFirst(@NotNull EntityPlayer player, @NotNull World world,

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

@@ -58,16 +58,15 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
@@ -76,8 +75,6 @@
 
 public class ItemGTToolbelt extends ItemGTTool implements IDyeableItem {
 
-    protected final static Set<String> VALID_OREDICTS = new ObjectOpenHashSet<>();
-
     public ItemGTToolbelt(String domain, String id, Supplier<ItemStack> markerItem, IToolBehavior... behaviors) {
         super(domain, id, -1,
                 new ToolDefinitionBuilder().behaviors(behaviors).cannotAttack().attackSpeed(-2.4F).build(),
@@ -153,14 +150,6 @@ else if (selected.getItem() instanceof IGTTool tool) {
         } else return Collections.emptyList();
     }
 
-    public static boolean isToolbeltableOredict(String oredict) {
-        return VALID_OREDICTS.contains(oredict);
-    }
-
-    public void registerValidOredict(String oredict) {
-        VALID_OREDICTS.add(oredict);
-    }
-
     @Override
     public float getDestroySpeed(@NotNull ItemStack stack, @NotNull IBlockState state) {
         ItemStack selected = getHandler(stack).getSelectedStack();
@@ -220,7 +209,7 @@ public int getHarvestLevel(@NotNull ItemStack stack, @NotNull String toolClass,
         ItemStack selected = getHandler(stack).getSelectedStack();
         if (!selected.isEmpty()) {
             return selected.getItem().getHarvestLevel(stack, toolClass, player, blockState);
-        } else return super.getHarvestLevel(stack, toolClass, player, blockState);
+        } else return definition$getHarvestLevel(stack, toolClass, player, blockState);
     }
 
     @NotNull
@@ -283,7 +272,7 @@ public int getDamage(@NotNull ItemStack stack) {
         ItemStack selected = getHandler(stack).getSelectedStack();
         if (!selected.isEmpty()) {
             return selected.getItem().getDamage(selected);
-        } else return super.getDamage(stack);
+        } else return definition$getDamage(stack);
     }
 
     @Override
@@ -299,7 +288,7 @@ public void setDamage(@NotNull ItemStack stack, int damage) {
         ItemStack selected = getHandler(stack).getSelectedStack();
         if (!selected.isEmpty()) {
             selected.getItem().setDamage(selected, damage);
-        } else super.setDamage(stack, damage);
+        } else definition$setDamage(stack, damage);
     }
 
     @Override
@@ -442,6 +431,10 @@ public void changeSelectedToolHotkey(int slot, ItemStack stack) {
                 new PacketToolbeltSelectionChange(handler.selectedSlot));
     }
 
+    /**
+     * For use by {@link PacketToolbeltSelectionChange} only!
+     */
+    @ApiStatus.Internal
     public void setSelectedTool(int slot, ItemStack stack) {
         ToolStackHandler handler = getHandler(stack);
         if (slot < 0 || slot >= handler.getSlots())
@@ -471,7 +464,8 @@ public void setSelectedTool(int slot, ItemStack stack) {
         if (result == EnumActionResult.PASS) {
             ItemStack stack = player.getHeldItem(hand);
             ToolStackHandler handler = getHandler(stack);
-            if (handler.getSelectedSlot() == -1 && world.getTileEntity(pos) instanceof MetaTileEntityHolder holder &&
+            if (handler.getSelectedStack().isEmpty() &&
+                    world.getTileEntity(pos) instanceof MetaTileEntityHolder holder &&
                     holder.getMetaTileEntity() instanceof MetaTileEntityMaintenanceHatch maintenance) {
                 maintenance.fixMaintenanceProblemsWithToolbelt(player, this, stack);
                 return EnumActionResult.SUCCESS;
@@ -573,10 +567,8 @@ public NBTTagCompound serializeNBT() {
 
         @Override
         public void deserializeNBT(NBTTagCompound nbt) {
-            // make sure we can load all the slots, no matter what we're supposed to be limited to.
-            int minsize = nbt.hasKey("Size") ? nbt.getInteger("Size") : 0;
             // .copy() prevents double damage ticks in singleplayer
-            this.getHandler(minsize).deserializeNBT(nbt.copy());
+            this.getHandler(slotCountSupplier.getAsInt()).deserializeNBT(nbt.copy());
         }
 
         protected ToolStackHandler getHandler(int minsize) {
@@ -611,7 +603,6 @@ protected static class ToolStackHandler extends ItemStackHandler {
         protected final ItemTool[] tools = new ItemTool[this.getSlots()];
         protected final IGTTool[] gtTools = new IGTTool[this.getSlots()];
         protected final Set<String> toolClasses = new ObjectOpenHashSet<>();
-        public final Set<String> oreDicts = new ObjectOpenHashSet<>();
 
         private boolean passthrough = true;
 
@@ -646,7 +637,7 @@ public void disablePassthrough() {
 
         public @NotNull ItemStack getSelectedStack() {
             if (getSelectedSlot() == -1) return ItemStack.EMPTY;
-            else return this.stacks.get(getSelectedSlot());
+            else return this.getStackInSlot(getSelectedSlot());
         }
 
         public Set<String> getToolClasses(boolean defaultEmpty) {
@@ -715,14 +706,6 @@ protected void updateSlot(int slot) {
         }
 
         protected void update() {
-            this.oreDicts.clear();
-            Arrays.stream(gtTools).filter(Objects::nonNull).map(igtTool -> {
-                Set<String> set = new ObjectOpenHashSet<>(igtTool.getSecondaryOreDicts());
-                set.add(igtTool.getOreDictName());
-                return set;
-            }).forEach(this.oreDicts::addAll);
-            this.oreDicts.retainAll(VALID_OREDICTS);
-
             this.toolClasses.clear();
             for (int i = 0; i < this.getSlots(); i++) {
                 if (tools[i] != null) this.toolClasses.addAll(tools[i].getToolClasses(stacks.get(i)));

src/main/java/gregtech/client/ClientProxy.java

@@ -354,6 +354,8 @@ public static void onMouseEvent(@NotNull MouseEvent event) {
         if (event.getDwheel() != 0 && player.isSneaking()) {
             ItemStack stack = player.getHeldItemMainhand();
             if (stack.getItem() instanceof ItemGTToolbelt toolbelt) {
+                // vanilla code in GuiIngame line 1235 does not copy the stack before storing it in the highlighting
+                // item stack, so unless we copy the stack the tool highlight will not refresh.
                 stack = stack.copy();
                 toolbelt.changeSelectedToolMousewheel(event.getDwheel(), stack);
                 InventoryPlayer inv = Minecraft.getMinecraft().player.inventory;

src/main/java/gregtech/common/crafting/DyeableRecipes.java

@@ -120,6 +120,8 @@ public boolean matches(InventoryCrafting inv, @NotNull World worldIn) {
             k1 = (int) ((float) k1 * f3 / f4);
             int k2 = (i1 << 8) + j1;
             k2 = (k2 << 8) + k1;
+            // prevent consuming dye when the color would not change
+            if (dyeable.hasColor(itemstack) && dyeable.getColor(itemstack) == k2) return ItemStack.EMPTY;
             dyeable.setColor(itemstack, k2);
             return itemstack;
         }

src/main/java/gregtech/common/crafting/GTShapedOreRecipe.java

@@ -166,7 +166,7 @@ else if (obj instanceof String str) {
         if (isClearing) {
             return NonNullList.withSize(inv.getSizeInventory(), ItemStack.EMPTY);
         } else {
-            return net.minecraftforge.common.ForgeHooks.defaultRecipeGetRemainingItems(inv);
+            return super.getRemainingItems(inv);
         }
     }
 }

src/main/java/gregtech/common/crafting/GTShapelessOreRecipe.java

@@ -5,7 +5,6 @@
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import org.jetbrains.annotations.NotNull;
@@ -39,7 +38,7 @@ public GTShapelessOreRecipe(boolean isClearing, ResourceLocation group, @NotNull
         if (isClearing) {
             return NonNullList.withSize(inv.getSizeInventory(), ItemStack.EMPTY);
         } else {
-            return ForgeHooks.defaultRecipeGetRemainingItems(inv);
+            return super.getRemainingItems(inv);
         }
     }
 }

src/main/java/gregtech/common/items/ToolItems.java

@@ -393,11 +393,9 @@ public static void registerOreDict() {
             final ItemStack stack = new ItemStack(tool.get(), 1, GTValues.W);
             if (tool.getOreDictName() != null) {
                 OreDictUnifier.registerOre(stack, tool.getOreDictName());
-                TOOLBELT.registerValidOredict(tool.getOreDictName());
             }
             tool.getSecondaryOreDicts().forEach(oreDict -> {
                 OreDictUnifier.registerOre(stack, oreDict);
-                TOOLBELT.registerValidOredict(oreDict);
             });
         });
     }