Skip to content

Commit 5ef927f

Browse files
Another one down
1 parent 2972a76 commit 5ef927f

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

src/main/java/gregtech/asm/GregTechTransformer.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@
77
import gregtech.asm.visitors.JEIVisitor;
88
import gregtech.asm.visitors.LittleTilesVisitor;
99
import gregtech.asm.visitors.ModelCTMVisitor;
10-
import gregtech.asm.visitors.RenderItemVisitor;
1110

1211
import net.minecraft.launchwrapper.IClassTransformer;
1312

1413
import org.objectweb.asm.ClassReader;
1514
import org.objectweb.asm.ClassWriter;
1615
import org.objectweb.asm.Opcodes;
17-
import org.objectweb.asm.tree.ClassNode;
18-
import org.objectweb.asm.tree.MethodNode;
19-
20-
import java.util.Iterator;
2116

2217
public class GregTechTransformer implements IClassTransformer, Opcodes {
2318

@@ -170,16 +165,18 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
170165
* return classWriter.toByteArray();
171166
* }
172167
*/
173-
case RenderItemVisitor.TARGET_CLASS_NAME: {
174-
ClassNode classNode = new ClassNode();
175-
ClassReader classReader = new ClassReader(basicClass);
176-
classReader.accept(classNode, 0);
177-
Iterator<MethodNode> methods = classNode.methods.iterator();
178-
RenderItemVisitor.transform(methods);
179-
ClassWriter classWriter = new ClassWriter(0);
180-
classNode.accept(classWriter);
181-
return classWriter.toByteArray();
182-
}
168+
/*
169+
* case RenderItemVisitor.TARGET_CLASS_NAME: {
170+
* ClassNode classNode = new ClassNode();
171+
* ClassReader classReader = new ClassReader(basicClass);
172+
* classReader.accept(classNode, 0);
173+
* Iterator<MethodNode> methods = classNode.methods.iterator();
174+
* RenderItemVisitor.transform(methods);
175+
* ClassWriter classWriter = new ClassWriter(0);
176+
* classNode.accept(classWriter);
177+
* return classWriter.toByteArray();
178+
* }
179+
*/
183180
/*
184181
* case RecipeRepairItemVisitor.TARGET_CLASS_NAME: {
185182
* ClassReader classReader = new ClassReader(basicClass);

src/main/java/gregtech/mixins/minecraft/RenderItemMixin.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package gregtech.mixins.minecraft;
22

3+
import gregtech.api.GTValues;
34
import gregtech.asm.hooks.RenderItemHooks;
45

56
import net.minecraft.client.gui.FontRenderer;
67
import net.minecraft.client.renderer.RenderItem;
78
import net.minecraft.item.ItemStack;
9+
import net.minecraftforge.fml.common.Loader;
810

911
import org.spongepowered.asm.mixin.Mixin;
1012
import org.spongepowered.asm.mixin.injection.At;
@@ -22,4 +24,16 @@ private void renderItemOverlayIntoGUIInject(FontRenderer fr, ItemStack stack, in
2224
RenderItemHooks.renderLampOverlay(stack, xPosition, yPosition);
2325
}
2426
}
27+
28+
@Inject(method = "renderItemOverlayIntoGUI",
29+
at = @At(value = "INVOKE_ASSIGN",
30+
target = "Lnet/minecraft/client/Minecraft;getMinecraft()Lnet/minecraft/client/Minecraft;",
31+
shift = At.Shift.BEFORE,
32+
ordinal = 0))
33+
public void showDurabilityBarMixin(FontRenderer fr, ItemStack stack, int xPosition, int yPosition, String text,
34+
CallbackInfo ci) {
35+
if (!Loader.isModLoaded(GTValues.MODID_ECORE)) {
36+
RenderItemHooks.renderElectricBar(stack, xPosition, yPosition);
37+
}
38+
}
2539
}

0 commit comments

Comments
 (0)