mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 11:59:40 +00:00
Start using mixins (#8)
* SMCLog -> ALog * Start using Mixins! * Shader startup ACTMinecraft -> MixinMinecraft * spotlessApply (#9) Co-authored-by: GitHub GTNH Actions <> * Update buildscript, add mixingasm and nei * Remove unneeded transformer exclusions * Fix broken stack frames * Fix mcp namer for rfg * Inject the asm transformer manually in the correct order to avoid mixin-induced issues --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Raven Szewczyk <[email protected]>
This commit is contained in:
48 files changed
+538
-256
No files matched your search
@@ -137,7 +137,13 @@ import static org.lwjgl.opengl.GL30.glGenerateMipmap;
|
||||
import static org.lwjgl.util.glu.GLU.gluErrorString;
|
||||
import static org.lwjgl.util.glu.GLU.gluPerspective;
|
||||
|
||||
import java.io.*;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileReader;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
@@ -1879,7 +1885,7 @@ public class Shaders {
|
||||
if (isRenderingDfb) {
|
||||
setDrawBuffers(drawBuffers);
|
||||
checkGLError(programNames[program], " draw buffers = ", programsDrawBufSettings[program]);
|
||||
// SMCLog.info("%s",programNames[program] + " draw buffers = " + programsDrawBufSettings[program]);
|
||||
// ALog.info("%s",programNames[program] + " draw buffers = " + programsDrawBufSettings[program]);
|
||||
}
|
||||
activeCompositeMipmapSetting = programsCompositeMipmapSetting[program];
|
||||
uniformEntityHurt = glGetUniformLocationARB(programsID[activeProgram], "entityHurt");
|
||||
|
||||
@@ -1,18 +1,33 @@
|
||||
package com.gtnewhorizons.angelica.loading;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.spongepowered.asm.launch.GlobalProperties;
|
||||
import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper;
|
||||
|
||||
import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
|
||||
import com.gtnewhorizons.angelica.mixins.Mixins;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
||||
|
||||
@IFMLLoadingPlugin.MCVersion("1.7.10")
|
||||
@IFMLLoadingPlugin.TransformerExclusions({ "com.gtnewhorizons.angelica.loading.",
|
||||
"com.gtnewhorizons.angelica.transform." })
|
||||
@IFMLLoadingPlugin.SortingIndex(1100)
|
||||
public class AngelicaTweaker implements IFMLLoadingPlugin {
|
||||
public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
|
||||
public static final Logger log = LogManager.getLogger("AngelicaTweaker");
|
||||
|
||||
@Override
|
||||
public String[] getASMTransformerClass() {
|
||||
return new String[] { "com.gtnewhorizons.angelica.transform.AClassTransformer" };
|
||||
List<String> tweakClasses = GlobalProperties.get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKCLASSES);
|
||||
if (tweakClasses != null) {
|
||||
tweakClasses.add(MixinCompatHackTweaker.class.getName());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -34,4 +49,26 @@ public class AngelicaTweaker implements IFMLLoadingPlugin {
|
||||
public String getAccessTransformerClass() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMixinConfig() {
|
||||
return "mixins.angelica.early.json";
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getMixins(Set<String> loadedCoreMods) {
|
||||
final List<String> mixins = new ArrayList<>();
|
||||
final List<String> notLoading = new ArrayList<>();
|
||||
for (Mixins mixin : Mixins.values()) {
|
||||
if (mixin.phase == Mixins.Phase.EARLY) {
|
||||
if (mixin.shouldLoad(loadedCoreMods, Collections.emptySet())) {
|
||||
mixins.addAll(mixin.mixinClasses);
|
||||
} else {
|
||||
notLoading.addAll(mixin.mixinClasses);
|
||||
}
|
||||
}
|
||||
}
|
||||
log.info("Not loading the following EARLY mixins: {}", notLoading.toString());
|
||||
return mixins;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package com.gtnewhorizons.angelica.loading;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.minecraft.launchwrapper.ITweaker;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import net.minecraft.launchwrapper.LaunchClassLoader;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.AClassTransformer;
|
||||
import com.gtnewhorizons.angelica.transform.ALog;
|
||||
import cpw.mods.fml.common.asm.transformers.TerminalTransformer;
|
||||
|
||||
public class MixinCompatHackTweaker implements ITweaker {
|
||||
|
||||
@Override
|
||||
public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
|
||||
LaunchClassLoader lcl = Launch.classLoader;
|
||||
try {
|
||||
Field xformersField = lcl.getClass().getDeclaredField("transformers");
|
||||
xformersField.setAccessible(true);
|
||||
List<IClassTransformer> xformers = (List<IClassTransformer>) xformersField.get(lcl);
|
||||
int terminalIndex;
|
||||
for (terminalIndex = 1; terminalIndex < xformers.size(); terminalIndex++) {
|
||||
if (xformers.get(terminalIndex) instanceof TerminalTransformer) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
xformers.add(terminalIndex - 1, new AClassTransformer());
|
||||
ALog.info("Hacked in asm class transformer in position %d", terminalIndex - 1);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectIntoClassLoader(LaunchClassLoader classLoader) {
|
||||
// no-op
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLaunchTarget() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getLaunchArguments() {
|
||||
return new String[0];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,138 @@
|
||||
package com.gtnewhorizons.angelica.mixins;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import cpw.mods.fml.relauncher.FMLLaunchHandler;
|
||||
|
||||
public enum Mixins {
|
||||
|
||||
ANGELICA_STARTUP(new Builder("Start Angelica").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY).addMixinClasses("minecraft.MixinMinecraft").setApplyIf(() -> true));
|
||||
|
||||
public final String name;
|
||||
public final List<String> mixinClasses;
|
||||
private final Supplier<Boolean> applyIf;
|
||||
public final Phase phase;
|
||||
private final Side side;
|
||||
public final List<TargetedMod> targetedMods;
|
||||
public final List<TargetedMod> excludedMods;
|
||||
|
||||
private static class Builder {
|
||||
|
||||
private final String name;
|
||||
private final List<String> mixinClasses = new ArrayList<>();
|
||||
private Supplier<Boolean> applyIf;
|
||||
private Side side = Side.BOTH;
|
||||
private Phase phase = Phase.LATE;
|
||||
private final List<TargetedMod> targetedMods = new ArrayList<>();
|
||||
private final List<TargetedMod> excludedMods = new ArrayList<>();
|
||||
|
||||
public Builder(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Builder addMixinClasses(String... mixinClasses) {
|
||||
this.mixinClasses.addAll(Arrays.asList(mixinClasses));
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setPhase(Phase phase) {
|
||||
this.phase = phase;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setSide(Side side) {
|
||||
this.side = side;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setApplyIf(Supplier<Boolean> applyIf) {
|
||||
this.applyIf = applyIf;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder addTargetedMod(TargetedMod mod) {
|
||||
this.targetedMods.add(mod);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder addExcludedMod(TargetedMod mod) {
|
||||
this.excludedMods.add(mod);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
Mixins(Builder builder) {
|
||||
this.name = builder.name;
|
||||
this.mixinClasses = builder.mixinClasses;
|
||||
this.applyIf = builder.applyIf;
|
||||
this.side = builder.side;
|
||||
this.targetedMods = builder.targetedMods;
|
||||
this.excludedMods = builder.excludedMods;
|
||||
this.phase = builder.phase;
|
||||
if (this.targetedMods.isEmpty()) {
|
||||
throw new RuntimeException("No targeted mods specified for " + this.name);
|
||||
}
|
||||
if (this.applyIf == null) {
|
||||
throw new RuntimeException("No ApplyIf function specified for " + this.name);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean shouldLoadSide() {
|
||||
return (side == Side.BOTH || (side == Side.SERVER && FMLLaunchHandler.side().isServer())
|
||||
|| (side == Side.CLIENT && FMLLaunchHandler.side().isClient()));
|
||||
}
|
||||
|
||||
private boolean allModsLoaded(List<TargetedMod> targetedMods, Set<String> loadedCoreMods, Set<String> loadedMods) {
|
||||
if (targetedMods.isEmpty()) return false;
|
||||
|
||||
for (TargetedMod target : targetedMods) {
|
||||
if (target == TargetedMod.VANILLA) continue;
|
||||
|
||||
// Check coremod first
|
||||
if (!loadedCoreMods.isEmpty() && target.coreModClass != null
|
||||
&& !loadedCoreMods.contains(target.coreModClass))
|
||||
return false;
|
||||
else if (!loadedMods.isEmpty() && target.modId != null && !loadedMods.contains(target.modId)) return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean noModsLoaded(List<TargetedMod> targetedMods, Set<String> loadedCoreMods, Set<String> loadedMods) {
|
||||
if (targetedMods.isEmpty()) return true;
|
||||
|
||||
for (TargetedMod target : targetedMods) {
|
||||
if (target == TargetedMod.VANILLA) continue;
|
||||
|
||||
// Check coremod first
|
||||
if (!loadedCoreMods.isEmpty() && target.coreModClass != null
|
||||
&& loadedCoreMods.contains(target.coreModClass))
|
||||
return false;
|
||||
else if (!loadedMods.isEmpty() && target.modId != null && loadedMods.contains(target.modId)) return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean shouldLoad(Set<String> loadedCoreMods, Set<String> loadedMods) {
|
||||
return (shouldLoadSide() && applyIf.get()
|
||||
&& allModsLoaded(targetedMods, loadedCoreMods, loadedMods)
|
||||
&& noModsLoaded(excludedMods, loadedCoreMods, loadedMods));
|
||||
}
|
||||
|
||||
enum Side {
|
||||
BOTH,
|
||||
CLIENT,
|
||||
SERVER
|
||||
}
|
||||
|
||||
public enum Phase {
|
||||
EARLY,
|
||||
LATE,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.gtnewhorizons.angelica.mixins;
|
||||
|
||||
public enum TargetedMod {
|
||||
|
||||
VANILLA("Minecraft", null),
|
||||
FASTCRAFT("FastCraft", "fastcraft.Tweaker"),
|
||||
OPTIFINE("Optifine", "optifine.OptiFineForgeTweaker", "Optifine"),
|
||||
GTNHLIB("GTNHLib", "com.gtnewhorizon.gtnhlib.core.GTNHLibCore", "gtnhlib"),
|
||||
LWJGL3IFY("lwjgl3ify", "me.eigenraven.lwjgl3ify.core.Lwjgl3ifyCoremod", "lwjgl3ify");
|
||||
|
||||
/** The "name" in the @Mod annotation */
|
||||
public final String modName;
|
||||
/** Class that implements the IFMLLoadingPlugin interface */
|
||||
public final String coreModClass;
|
||||
/** The "modid" in the @Mod annotation */
|
||||
public final String modId;
|
||||
|
||||
TargetedMod(String modName, String coreModClass) {
|
||||
this(modName, coreModClass, null);
|
||||
}
|
||||
|
||||
TargetedMod(String modName, String coreModClass, String modId) {
|
||||
this.modName = modName;
|
||||
this.coreModClass = coreModClass;
|
||||
this.modId = modId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "TargetedMod{modName='" + modName + "', coreModClass='" + coreModClass + "', modId='" + modId + "'}";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.minecraft;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.profiler.IPlayerUsage;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import com.gtnewhorizons.angelica.client.Shaders;
|
||||
|
||||
@Mixin(Minecraft.class)
|
||||
public abstract class MixinMinecraft implements IPlayerUsage {
|
||||
|
||||
@Inject(
|
||||
method = "Lnet/minecraft/client/Minecraft;startGame()V",
|
||||
at = @At(
|
||||
ordinal = 1,
|
||||
shift = At.Shift.AFTER,
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/Minecraft;checkGLError(Ljava/lang/String;)V"))
|
||||
private void angelica$Startup(CallbackInfo ci) {
|
||||
// Start the Shaders
|
||||
Shaders.startup(((Minecraft) ((Object) this)));
|
||||
}
|
||||
}
|
||||
@@ -34,14 +34,14 @@ public class ACTBlock implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
super.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
if (Names.block_getAoLight.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// ALog.info(" patching");
|
||||
return new MVgetAoLight(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
public void visitLdcInsn(Object cst) {
|
||||
if (cst instanceof String) {
|
||||
String scst = (String) cst;
|
||||
// SMCLog.finest(" %d Ldc %s", state, scst);
|
||||
// ALog.finest(" %d Ldc %s", state, scst);
|
||||
section = scst;
|
||||
}
|
||||
mv.visitLdcInsn(cst);
|
||||
@@ -273,7 +273,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitIntInsn(int opcode, int operand) {
|
||||
// SMCLog.finest(" %d Int %d %d", state ,opcode, operand);
|
||||
// ALog.finest(" %d Int %d %d", state ,opcode, operand);
|
||||
// switch (state) {
|
||||
// case 23:
|
||||
// case 25:
|
||||
@@ -289,7 +289,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitJumpInsn(int opcode, Label label) {
|
||||
// SMCLog.finest(" %d, Jump %d", state, opcode);
|
||||
// ALog.finest(" %d, Jump %d", state, opcode);
|
||||
switch (state) {
|
||||
case 4:
|
||||
if (opcode == IF_ICMPLT) {
|
||||
@@ -380,7 +380,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
|
||||
// SMCLog.finest(" %d, Frame",state);
|
||||
// ALog.finest(" %d, Frame",state);
|
||||
switch (state) {
|
||||
case 7: {
|
||||
state = 8;
|
||||
@@ -402,7 +402,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" %d F %d %s.%s %s", state, opcode, ownerM, nameM, descM);
|
||||
// ALog.finest(" %d F %d %s.%s %s", state, opcode, ownerM, nameM, descM);
|
||||
switch (state) {
|
||||
case 3:
|
||||
if (Names.gameSettings_renderDistance.equals(owner, name)) {
|
||||
@@ -437,7 +437,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" %d M %d %s.%s%s", state, opcode, ownerM, nameM, descM);
|
||||
// ALog.finest(" %d M %d %s.%s%s", state, opcode, ownerM, nameM, descM);
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glViewport", "(IIII)V", owner, name, desc)) {
|
||||
|
||||
@@ -35,19 +35,19 @@ public class ACTGuiOptions implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.guiOptions_initGui.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// ALog.info(" patching");
|
||||
return new MVinitGui(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
if (Names.guiOptions_actionPerformed.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// ALog.info(" patching");
|
||||
return new MVactionPerformed(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -34,7 +34,7 @@ public class ACTItemBlock implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
|
||||
@@ -42,13 +42,13 @@ public class ACTItemRenderer implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s",classname,name,desc);
|
||||
// ALog.info(" method %s.%s%s",classname,name,desc);
|
||||
if (Names.itemRenderer_updateEquipped.equalsNameDesc(name, desc)) {
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVupdate(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class ACTMinecraft implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
ALog.fine("transforming %s %s", par1, par2);
|
||||
ClassReader cr = new ClassReader(par3);
|
||||
ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS);
|
||||
CVTransform cv = new CVTransform(cw);
|
||||
cr.accept(cv, 0);
|
||||
return cw.toByteArray();
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
super(Opcodes.ASM4, cv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
super.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.minecraft_startGame.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
return new MVstartGame(super.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return super.visitMethod(access, name, desc, signature, exceptions);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVstartGame extends MethodVisitor {
|
||||
|
||||
int state = 0;
|
||||
|
||||
public MVstartGame(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitLdcInsn(Object cst) {
|
||||
if (cst instanceof String) {
|
||||
if (((String) cst).equals("Startup")) {
|
||||
if (state == 0) {
|
||||
state = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
super.visitLdcInsn(cst);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitVarInsn(int opcode, int var) {
|
||||
if (opcode == Opcodes.ALOAD) {
|
||||
if (var == 0) {
|
||||
if (state == 1) {
|
||||
state = 2;
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"startup",
|
||||
"(" + Names.minecraft_.desc + ")V");
|
||||
// SMCLog.finest(" startup");
|
||||
}
|
||||
}
|
||||
}
|
||||
super.visitVarInsn(opcode, var);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,7 @@ public class ACTModelRenderer implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@@ -51,17 +51,17 @@ public class ACTModelRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// if (Names.modelRenderer_render.equalsNameDesc(name, desc))
|
||||
// {
|
||||
// //SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// //ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// return new MVrender(
|
||||
// cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
// }
|
||||
// else
|
||||
// if (Names.modelRenderer_renderWithRotation.equalsNameDesc(name, desc))
|
||||
// {
|
||||
// //SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// //ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// return new MVrender(
|
||||
// cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
// }
|
||||
|
||||
@@ -34,7 +34,7 @@ public class ACTOpenGlHelper implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@@ -55,12 +55,12 @@ public class ACTOpenGlHelper implements IClassTransformer {
|
||||
// has_activeTexUnit = true;
|
||||
// FieldVisitor fv = cv.visitField(ACC_PUBLIC + ACC_STATIC, "activeTexUnit", "I", null, null);
|
||||
// fv.visitEnd();
|
||||
// SMCLog.finest(" add field activeTexUnit");
|
||||
// ALog.finest(" add field activeTexUnit");
|
||||
// }
|
||||
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.openGlHelper_setActiveTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// ALog.info(" patching");
|
||||
return new MVsetActiveTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -34,13 +34,13 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
super.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" %s%s",name,desc);
|
||||
// ALog.info(" %s%s",name,desc);
|
||||
if ("prepareRenderState".equals(name) && "()V".equals(desc)) {
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVprepare(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
|
||||
@@ -35,15 +35,15 @@ public class ACTRender implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.render_renderShadow.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVrenderShadow(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -38,22 +38,22 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderBlocks_renderBlockByRenderType.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkByRenType(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderBlocks_renderBlockFlowerPot.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkFlowerPot(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderBlocks_renderStdBlockWithAOP.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderStdBlockWithAO.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkWithAO(
|
||||
access,
|
||||
name,
|
||||
@@ -68,11 +68,11 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
|| Names.renderBlocks_renderBlockFluids.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockDoor.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockSandFalling.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkFVar(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else
|
||||
if (Names.renderBlocks_renderPistonExtension.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkPistonExt(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -100,7 +100,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"pushEntity",
|
||||
"(" + Names.renderBlocks_.desc + Names.block_.desc + "III)V");
|
||||
// SMCLog.info(" pushEntity");
|
||||
// ALog.info(" pushEntity");
|
||||
++nPatch;
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
public void visitInsn(int opcode) {
|
||||
if (opcode == Opcodes.IRETURN) {
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "popEntity", "()V");
|
||||
// SMCLog.info(" popEntity");
|
||||
// ALog.info(" popEntity");
|
||||
++nPatch;
|
||||
}
|
||||
mv.visitInsn(opcode);
|
||||
@@ -117,7 +117,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// ALog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,7 +184,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"pushEntity",
|
||||
"(" + Names.renderBlocks_.desc + Names.block_.desc + "III)V");
|
||||
// SMCLog.info(" pushEntity");
|
||||
// ALog.info(" pushEntity");
|
||||
++nPatch;
|
||||
}
|
||||
|
||||
@@ -192,7 +192,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
public void visitInsn(int opcode) {
|
||||
if (opcode == Opcodes.IRETURN) {
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "popEntity", "()V");
|
||||
// SMCLog.info(" popEntity");
|
||||
// ALog.info(" popEntity");
|
||||
++nPatch;
|
||||
}
|
||||
mv.visitInsn(opcode);
|
||||
@@ -201,7 +201,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// ALog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
public void visitEnd() {
|
||||
mn.visitEnd();
|
||||
mn.accept(mv1);
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// ALog.info(" %d", nPatch);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -271,7 +271,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
if (match2 != 0) {
|
||||
String fieldName = fieldsBlockLightLevel[match2];
|
||||
mn.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", fieldName, "F");
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
// ALog.info(" %s", fieldName);
|
||||
++nPatch;
|
||||
return;
|
||||
}
|
||||
@@ -303,7 +303,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
++state;
|
||||
String fieldName = fieldsBlockLightLevel[match1];
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", fieldName, "F");
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
// ALog.info(" %s", fieldName);
|
||||
++nPatch;
|
||||
return;
|
||||
}
|
||||
@@ -313,7 +313,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// ALog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -345,7 +345,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
if (match1 != 0 && state == 1) {
|
||||
String fieldName = fieldsBlockLightLevel[match1];
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", fieldName, "F");
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
// ALog.info(" %s", fieldName);
|
||||
++nPatch;
|
||||
return;
|
||||
}
|
||||
@@ -355,7 +355,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// ALog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// String remappedName = SMCRemap.remapper.mapMethodName(classname, name, desc);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderGlobal_renderEntities.equalsNameDesc(name, desc)) {
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderEntities(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
@@ -263,7 +263,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
// ALog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (owner.equals("Config") && name.equals("isSkyEnabled")) {
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ACTRenderManager implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
|
||||
@@ -34,23 +34,23 @@ public class ACTRenderSpider implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderDragon_shouldRenderPass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVshouldRenderPass(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
if (Names.renderEnderman_shouldRenderPass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVshouldRenderPass(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
if (Names.renderSpider_shouldRenderPass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVshouldRenderPass(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -37,7 +37,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@@ -52,12 +52,12 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.rendererLivingE_doRender.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVdoRenderLiving(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.rendererLivingE_renderLabel.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVrenderLivingLabel(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -72,7 +72,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitCode() {
|
||||
// SMCLog.info(" insert code");
|
||||
// ALog.info(" insert code");
|
||||
mv.visitCode();
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", "useEntityHurtFlash", "Z");
|
||||
Label label1 = new Label();
|
||||
@@ -125,7 +125,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
"(II)V");
|
||||
mv.visitLabel(label1);
|
||||
mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
|
||||
// SMCLog.info(" end insert");
|
||||
// ALog.info(" end insert");
|
||||
}
|
||||
|
||||
/** last SIPUSH operand */
|
||||
@@ -150,9 +150,9 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
if (cst instanceof Integer) {
|
||||
int icst = ((Integer) cst).intValue();
|
||||
if (icst == GL12.GL_RESCALE_NORMAL) {
|
||||
// SMCLog.info(" rescale_normal");
|
||||
// ALog.info(" rescale_normal");
|
||||
if (labelEndVH != null) {
|
||||
// SMCLog.info(" jump target");
|
||||
// ALog.info(" jump target");
|
||||
mv.visitLabel(labelEndVH);
|
||||
labelEndVH = null;
|
||||
}
|
||||
@@ -163,10 +163,10 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
// ALog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
if (opcode == INVOKEVIRTUAL) {
|
||||
if (Names.rendererLivingE_renderEquippedItems.equals(owner, name, desc)) {
|
||||
// SMCLog.info(" renderEquippedItems");
|
||||
// ALog.info(" renderEquippedItems");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
@@ -189,7 +189,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
//
|
||||
if (opcode == INVOKESTATIC) {
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glDepthFunc", "(I)V", owner, name, desc)) {
|
||||
// SMCLog.info(" glDepthFunc");
|
||||
// ALog.info(" glDepthFunc");
|
||||
if (state == 3) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
@@ -206,7 +206,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
++state;
|
||||
}
|
||||
} else if (Names.openGlHelper_setActiveTexture.equals(owner, name, desc)) {
|
||||
// SMCLog.info(" setActiveTexture");
|
||||
// ALog.info(" setActiveTexture");
|
||||
if (state == 1) {
|
||||
++state;
|
||||
} else if (state == 2) {
|
||||
|
||||
+2
-2
@@ -34,13 +34,13 @@ public class ACTSmartMoveModelRotationRenderer implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if ("resetDisplayList".equals(name) && "()V".equals(desc)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,32 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
|
||||
import static org.objectweb.asm.Opcodes.ACC_PROTECTED;
|
||||
import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
|
||||
import static org.objectweb.asm.Opcodes.ACC_STATIC;
|
||||
import static org.objectweb.asm.Opcodes.ACONST_NULL;
|
||||
import static org.objectweb.asm.Opcodes.ALOAD;
|
||||
import static org.objectweb.asm.Opcodes.BIPUSH;
|
||||
import static org.objectweb.asm.Opcodes.DLOAD;
|
||||
import static org.objectweb.asm.Opcodes.FLOAD;
|
||||
import static org.objectweb.asm.Opcodes.GETFIELD;
|
||||
import static org.objectweb.asm.Opcodes.GETSTATIC;
|
||||
import static org.objectweb.asm.Opcodes.ICONST_0;
|
||||
import static org.objectweb.asm.Opcodes.ICONST_1;
|
||||
import static org.objectweb.asm.Opcodes.ICONST_4;
|
||||
import static org.objectweb.asm.Opcodes.ILOAD;
|
||||
import static org.objectweb.asm.Opcodes.IMUL;
|
||||
import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
|
||||
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
|
||||
import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
|
||||
import static org.objectweb.asm.Opcodes.IRETURN;
|
||||
import static org.objectweb.asm.Opcodes.NEWARRAY;
|
||||
import static org.objectweb.asm.Opcodes.POP;
|
||||
import static org.objectweb.asm.Opcodes.PUTFIELD;
|
||||
import static org.objectweb.asm.Opcodes.PUTSTATIC;
|
||||
import static org.objectweb.asm.Opcodes.RETURN;
|
||||
import static org.objectweb.asm.Opcodes.T_FLOAT;
|
||||
import static org.objectweb.asm.Opcodes.T_INT;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
@@ -40,13 +66,13 @@ public class ACTTessellator implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
|
||||
// SMCLog.fine("%x %s %s %s",access,desc,name,nameM);
|
||||
// ALog.fine("%x %s %s %s",access,desc,name,nameM);
|
||||
if (name.equals("vertexPos") || name.equals("normalX")
|
||||
|| name.equals("normalY")
|
||||
|| name.equals("normalZ")
|
||||
@@ -62,7 +88,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
// nameM.equals(Names.Tessellator_vertexBuffers)
|
||||
)) {
|
||||
inputHasStaticBuffer = true;
|
||||
// SMCLog.finest(" input has static buffer");
|
||||
// ALog.finest(" input has static buffer");
|
||||
access = access & (~ACC_STATIC & ~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
} else {
|
||||
access = access & (~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
@@ -88,31 +114,31 @@ public class ACTTessellator implements IClassTransformer {
|
||||
fv = cv.visitField(ACC_PUBLIC, "midTextureV", "F", null, null);
|
||||
fv.visitEnd();
|
||||
}
|
||||
// SMCLog.fine(" method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.fine(" method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
if (name.equals("<clinit>")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVclinit(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("<init>") && desc.equals("()V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVinit(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("<init>") && desc.equals("(I)V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVinitI(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_draw.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVdraw(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_reset.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
access = access & ~(ACC_PRIVATE | ACC_PROTECTED) | ACC_PUBLIC;
|
||||
return new MVreset(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_addVertex.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVaddVertex(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_setNormal.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVsetNormal(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_sortQuad.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVsortQuad(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else {
|
||||
access = access & ~(ACC_PRIVATE | ACC_PROTECTED) | ACC_PUBLIC;
|
||||
@@ -138,7 +164,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
// ALog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
if (opcode == PUTSTATIC && (Names.tessellator_byteBuffer.equals(owner, name)
|
||||
|| Names.tessellator_intBuffer.equals(owner, name)
|
||||
|| Names.tessellator_floatBuffer.equals(owner, name)
|
||||
@@ -167,7 +193,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" M %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
// ALog.finest(" M %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
if (Names.glAllocation_createDirectByteBuffer.equals(owner, name, desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
@@ -389,7 +415,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
// ALog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
if (opcode == GETSTATIC && Names.tessellator_byteBuffer.equals(owner, name)) {
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitFieldInsn(GETFIELD, owner, name, desc);
|
||||
|
||||
@@ -37,7 +37,7 @@ public class ACTTextureAbstract implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@@ -65,9 +65,9 @@ public class ACTTextureAbstract implements IClassTransformer {
|
||||
null);
|
||||
fv.visitEnd();
|
||||
}
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.abstractTexture_deleteGlTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVdeleteGlTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else
|
||||
if (name.equals("getMultiTexID") && desc.equals("()Lcom/gtnewhorizons/angelica/client/MultiTexID;")) {
|
||||
|
||||
@@ -49,21 +49,21 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
access = access & ~(ACC_PRIVATE | ACC_PROTECTED) | ACC_PUBLIC;
|
||||
if (Names.textureAtlasSpri_updateAnimation.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("load")
|
||||
&& desc.equals("(" + Names.iResourceManager_.desc + Names.resourceLocation_.desc + ")Z")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVload(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else
|
||||
if (Names.textureAtlasSpri_loadSprite.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVloadSprite(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("uploadFrameTexture") && desc.equals("(III)V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVuploadFrameTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -32,15 +32,15 @@ public class ACTTextureClock implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.textureAtlasSpri_updateAnimation.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new ACTTextureAtlasSprite.MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -32,15 +32,15 @@ public class ACTTextureCompass implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.textureCompass_updateCompass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new ACTTextureAtlasSprite.MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -36,20 +36,20 @@ public class ACTTextureDownload implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
|
||||
// SMCLog.finest(" field %s %s %s %d", classname, name, desc, access);
|
||||
// ALog.finest(" field %s %s %s %d", classname, name, desc, access);
|
||||
return super.visitField(access, name, desc, signature, value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// String nameM = SMCRemap.remapper.mapMethodName(classname, name, desc);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (name.equals("getMultiTexID")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -34,18 +34,18 @@ public class ACTTextureDynamic implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (name.equals("<init>") && desc.equals("(II)V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVinit(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.dynamicTexture_updateDynamicTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVupdate(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -35,16 +35,16 @@ public class ACTTextureLayered implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// String descM = SMCNames.remapper.mapMethodDesc(desc);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.iTextureObject_loadTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVloadTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -34,18 +34,18 @@ public class ACTTextureManager implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// ALog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
if (Names.textureManager_bindTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVbindTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.textureManager_onResourceManagerReload.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVonReload(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@@ -62,14 +62,14 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
fv = cv.visitField(ACC_PUBLIC, "atlasHeight", "I", null, null);
|
||||
fv.visitEnd();
|
||||
}
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.textureMap_getIconResLoc.equalsNameDesc(name, desc)) {
|
||||
access = access & (~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
} else if (Names.textureMap_loadTextureAtlas.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVloadAtlas(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.textureMap_updateAnimations.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -110,7 +110,7 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" %s.%s%s",ownerM,nameM,descM);
|
||||
// ALog.finest(" %s.%s%s",ownerM,nameM,descM);
|
||||
if (Names.iResourceManager_getResource.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "loadRes");
|
||||
mv.visitMethodInsn(
|
||||
|
||||
@@ -34,13 +34,13 @@ public class ACTTextureObject implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (name.equals("getMultiTexID") && desc.equals("()Lcom/gtnewhorizons/angelica/client/MultiTexID;")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -36,15 +36,15 @@ public class ACTTextureSimple implements IClassTransformer {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
// ALog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// ALog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
if (Names.iTextureObject_loadTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// ALog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVloadTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
@@ -5,6 +5,10 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
|
||||
public class AClassTransformer implements IClassTransformer {
|
||||
|
||||
Names names;
|
||||
@@ -22,7 +26,6 @@ public class AClassTransformer implements IClassTransformer {
|
||||
ctMap = new HashMap();
|
||||
put(Names.block_, new ACTBlock());
|
||||
put(Names.itemBlock_, new ACTItemBlock());
|
||||
put(Names.minecraft_, new ACTMinecraft());
|
||||
put(Names.guiOptions_, new ACTGuiOptions());
|
||||
put(Names.modelRenderer_, new ACTModelRenderer());
|
||||
put(Names.openGlHelper_, new ACTOpenGlHelper());
|
||||
@@ -55,10 +58,18 @@ public class AClassTransformer implements IClassTransformer {
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
byte[] bytecode = par3;
|
||||
// if (par2.startsWith("mrtjp")) SMCLog.info("**** [%s]", par2);
|
||||
// if (par2.startsWith("mrtjp")) ALog.info("**** [%s]", par2);
|
||||
IClassTransformer ct = ctMap.get(par2);
|
||||
if (ct != null) {
|
||||
bytecode = ct.transform(par1, par2, bytecode);
|
||||
// HACK: Fix stackframes
|
||||
ClassNode node = new ClassNode();
|
||||
ClassReader reader = new ClassReader(bytecode);
|
||||
reader.accept(node, ClassReader.SKIP_FRAMES);
|
||||
ClassWriter writer = new ClassWriter(reader, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
|
||||
node.accept(writer);
|
||||
bytecode = writer.toByteArray();
|
||||
// END HACK
|
||||
int len1 = par3.length; // arg2!=null?arg2.length:0;
|
||||
int len2 = bytecode.length; // bytecode!=null?bytecode.length:0;
|
||||
ALog.fine(" %d (%+d)", len2, len2 - len1);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import static java.util.logging.Level.*;
|
||||
import static java.util.logging.Level.ALL;
|
||||
import static java.util.logging.Level.SEVERE;
|
||||
import static java.util.logging.Level.WARNING;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Calendar;
|
||||
@@ -37,9 +39,9 @@ public abstract class ALog {
|
||||
}
|
||||
}
|
||||
|
||||
private static class SMCLogger extends Logger {
|
||||
private static class ALogger extends Logger {
|
||||
|
||||
SMCLogger(String name) {
|
||||
ALogger(String name) {
|
||||
super(name, null);
|
||||
setUseParentHandlers(false);
|
||||
Formatter formatter = new SMCFormatter();
|
||||
@@ -64,13 +66,13 @@ public abstract class ALog {
|
||||
}
|
||||
}
|
||||
|
||||
public static final String smcLogName = "SMC";
|
||||
public static final Logger logger = new SMCLogger(smcLogName);
|
||||
public static final Level SMCINFO = new SMCLevel("INF", 850);
|
||||
public static final Level SMCCONFIG = new SMCLevel("CFG", 840);
|
||||
public static final Level SMCFINE = new SMCLevel("FNE", 830);
|
||||
public static final Level SMCFINER = new SMCLevel("FNR", 820);
|
||||
public static final Level SMCFINEST = new SMCLevel("FNT", 810);
|
||||
public static final String ALogName = "ANG";
|
||||
public static final Logger logger = new ALogger(ALogName);
|
||||
public static final Level ANGINFO = new SMCLevel("INF", 850);
|
||||
public static final Level ANGCONFIG = new SMCLevel("CFG", 840);
|
||||
public static final Level ANGFINE = new SMCLevel("FNE", 830);
|
||||
public static final Level ANGFINER = new SMCLevel("FNR", 820);
|
||||
public static final Level ANGFINEST = new SMCLevel("FNT", 810);
|
||||
|
||||
public static void log(Level level, String format, Object... args) {
|
||||
if (logger.isLoggable(level)) logger.log(level, String.format(format, args));
|
||||
@@ -85,22 +87,22 @@ public abstract class ALog {
|
||||
}
|
||||
|
||||
public static void info(String format, Object... args) {
|
||||
if (logger.isLoggable(SMCINFO)) logger.log(SMCINFO, String.format(format, args));
|
||||
if (logger.isLoggable(ANGINFO)) logger.log(ANGINFO, String.format(format, args));
|
||||
}
|
||||
|
||||
public static void config(String format, Object... args) {
|
||||
if (logger.isLoggable(SMCCONFIG)) logger.log(SMCCONFIG, String.format(format, args));
|
||||
if (logger.isLoggable(ANGCONFIG)) logger.log(ANGCONFIG, String.format(format, args));
|
||||
}
|
||||
|
||||
public static void fine(String format, Object... args) {
|
||||
if (logger.isLoggable(SMCFINE)) logger.log(SMCFINE, String.format(format, args));
|
||||
if (logger.isLoggable(ANGFINE)) logger.log(ANGFINE, String.format(format, args));
|
||||
}
|
||||
|
||||
public static void finer(String format, Object... args) {
|
||||
if (logger.isLoggable(SMCFINER)) logger.log(SMCFINER, String.format(format, args));
|
||||
if (logger.isLoggable(ANGFINER)) logger.log(ANGFINER, String.format(format, args));
|
||||
}
|
||||
|
||||
public static void finest(String format, Object... args) {
|
||||
if (logger.isLoggable(SMCFINEST)) logger.log(SMCFINEST, String.format(format, args));
|
||||
if (logger.isLoggable(ANGFINEST)) logger.log(ANGFINEST, String.format(format, args));
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,16 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
|
||||
public class InitNames {
|
||||
|
||||
public static void init() {
|
||||
new NamerSrg().setNames();
|
||||
final boolean obfuscated = !(Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
|
||||
ALog.info("Environment obfuscated: %s", obfuscated);
|
||||
if (obfuscated) {
|
||||
new NamerSrg().setNames();
|
||||
} else {
|
||||
new NamerMcp().setNames();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -138,7 +138,6 @@ public class Namer1_7_10 extends Namer {
|
||||
iTextureObject_loadTexture = m(iTextureObject_, "a", "(" + iResourceManager_.desc + ")V");
|
||||
iTextureObject_getGlTextureId = m(iTextureObject_, "b", "()I");
|
||||
minecraft_displayGuiScreen = m(minecraft_, "a", "(" + guiScreen_.desc + ")V");
|
||||
minecraft_startGame = m(minecraft_, "ag", "()V");
|
||||
openGlHelper_setActiveTexture = m(openGlHelper_, "j", "(I)V");
|
||||
render_renderShadow = m(render_, "c", "(" + entity_.desc + "DDDFF)V");
|
||||
renderBlocks_renderBlockFluids = m(renderBlocks_, "p", "(" + block_.desc + "III)Z");
|
||||
|
||||
@@ -15,8 +15,9 @@ public class NamerMcp extends NamerSrg {
|
||||
|
||||
public void setNames() {
|
||||
setNamesSrg();
|
||||
lookupReobfName("../conf/");
|
||||
rename("../conf/");
|
||||
final String confPath = System.getProperty("net.minecraftforge.gradle.GradleStart.csvDir", "../conf") + "/";
|
||||
lookupReobfName(confPath);
|
||||
rename(confPath);
|
||||
}
|
||||
|
||||
public void rename(String confPath) {
|
||||
@@ -68,7 +69,7 @@ public class NamerMcp extends NamerSrg {
|
||||
|
||||
void lookupReobfName(String confPath) {
|
||||
Map<String, String> nameMap;
|
||||
nameMap = loadReobfMap(confPath + "joined.srg");
|
||||
nameMap = loadReobfMap(confPath + "packaged.srg");
|
||||
for (Clas c : ac) {
|
||||
String s = nameMap.get(c.name);
|
||||
System.out.printf("C %s %s\n", c.name, s);
|
||||
|
||||
@@ -144,7 +144,6 @@ public class NamerSrg extends Namer {
|
||||
iTextureObject_loadTexture = m(iTextureObject_, "func_110551_a", "(" + iResourceManager_.desc + ")V");
|
||||
iTextureObject_getGlTextureId = m(iTextureObject_, "func_110552_b", "()I");
|
||||
minecraft_displayGuiScreen = m(minecraft_, "func_147108_a", "(" + guiScreen_.desc + ")V");
|
||||
minecraft_startGame = m(minecraft_, "func_71384_a", "()V");
|
||||
openGlHelper_setActiveTexture = m(openGlHelper_, "func_77473_a", "(I)V");
|
||||
render_renderShadow = m(render_, "func_76975_c", "(" + entity_.desc + "DDDFF)V");
|
||||
renderBlocks_renderBlockFluids = m(renderBlocks_, "func_147721_p", "(" + block_.desc + "III)Z");
|
||||
|
||||
@@ -204,7 +204,6 @@ public class Names {
|
||||
static Meth iTextureObject_loadTexture;
|
||||
static Meth iTextureObject_getGlTextureId;
|
||||
static Meth minecraft_displayGuiScreen;
|
||||
static Meth minecraft_startGame;
|
||||
static Meth openGlHelper_setActiveTexture;
|
||||
static Meth render_renderShadow;
|
||||
static Meth renderBlocks_renderBlockFluids;
|
||||
|
||||
Reference in new issue
Block a user