WrapOperation-ify

Author: M-W-K

src/main/java/gregtech/integration/jei/JustEnoughItemsModule.java

@@ -249,7 +249,8 @@ public void register(IModRegistry registry) {
             if (material.hasProperty(PropertyKey.DUST)) {
                 materialTreeList.add(new MaterialTree(material));
             }
-            if (material.hasFlag(GENERATE_BOLT_SCREW) && material.hasFlag(GENERATE_RING)) {
+            if (material.hasFlag(GENERATE_BOLT_SCREW) && material.hasFlag(GENERATE_RING) &&
+                    material.hasProperty(PropertyKey.TOOL)) {
                 registry.addIngredientInfo(ToolItems.TOOLBELT.get(material), VanillaTypes.ITEM,
                         "item.gt.tool.toolbelt.tooltip", "item.gt.tool.toolbelt.paint", "item.gt.tool.toolbelt.dye",
                         "item.gt.tool.toolbelt.maintenance");

src/main/java/gregtech/mixins/forge/GuiIngameForgeMixin.java

@@ -8,9 +8,10 @@
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraftforge.client.GuiIngameForge;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(GuiIngameForge.class)
 public class GuiIngameForgeMixin extends GuiIngame {
@@ -19,13 +20,13 @@ private GuiIngameForgeMixin(Minecraft mcIn) {
         super(mcIn);
     }
 
-    @Redirect(method = "renderToolHighlight",
-              at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/client/gui/ScaledResolution;getScaledHeight()I"))
-    private int shiftToolHighlightText(ScaledResolution res) {
+    @WrapOperation(method = "renderToolHighlight",
+                   at = @At(value = "INVOKE",
+                            target = "Lnet/minecraft/client/gui/ScaledResolution;getScaledHeight()I"))
+    private int shiftToolHighlightText(ScaledResolution resolution, Operation<Integer> op) {
         if (ConfigHolder.client.toolbeltConfig.enableToolbeltHotbarDisplay &&
                 highlightingItemStack.getItem() instanceof ItemGTToolbelt)
-            return res.getScaledHeight() - 31 + 6;
-        else return res.getScaledHeight();
+            return op.call(resolution) - 31 + 6;
+        else return op.call(resolution);
     }
 }