mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-14 01:14:08 +00:00
Change naming (#7)
This commit is contained in:
1 parent
b5f36332ad
commit
cc8198984c
34 files changed
+181
-187
No files matched your search
+1
-1
@@ -14,7 +14,7 @@ jar {
|
||||
manifest {
|
||||
attributes([
|
||||
"Manifest-Version" : 1.0,
|
||||
"TweakClass" : "com.gtnewhorizons.angelica.loading.SMCTweaker",
|
||||
"TweakClass" : "com.gtnewhorizons.angelica.loading.ATweaker",
|
||||
"TweakOrder" : 1100,
|
||||
])
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import static org.lwjgl.opengl.ARBVertexShader.glDisableVertexAttribArrayARB;
|
||||
import static org.lwjgl.opengl.ARBVertexShader.glEnableVertexAttribArrayARB;
|
||||
import static org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.SMCLog;
|
||||
import com.gtnewhorizons.angelica.transform.ALog;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.ShortBuffer;
|
||||
import java.util.Arrays;
|
||||
@@ -23,7 +23,7 @@ public class ShadersTess {
|
||||
} else {
|
||||
tess.isDrawing = false;
|
||||
if (tess.drawMode == GL11.GL_QUADS && tess.vertexCount % 4 != 0) {
|
||||
SMCLog.warning("%s", "bad vertexCount");
|
||||
ALog.warning("%s", "bad vertexCount");
|
||||
}
|
||||
int voffset = 0;
|
||||
int realDrawMode = tess.drawMode;
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ import net.minecraft.launchwrapper.ITweaker;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import net.minecraft.launchwrapper.LaunchClassLoader;
|
||||
|
||||
public class SMCTweaker implements ITweaker {
|
||||
public class ATweaker implements ITweaker {
|
||||
public List<String> args;
|
||||
public File gameDir;
|
||||
public File assetsDir;
|
||||
@@ -25,7 +25,7 @@ public class SMCTweaker implements ITweaker {
|
||||
public void injectIntoClassLoader(LaunchClassLoader launchClassLoader) {
|
||||
launchClassLoader.addTransformerExclusion("com.gtnewhorizons.angelica.loading.");
|
||||
launchClassLoader.addTransformerExclusion("com.gtnewhorizons.angelica.transform.");
|
||||
launchClassLoader.registerTransformer("com.gtnewhorizons.angelica.transform.SMCClassTransformer");
|
||||
launchClassLoader.registerTransformer("com.gtnewhorizons.angelica.transform.AClassTransformer");
|
||||
}
|
||||
|
||||
@Override
|
||||
+3
-3
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTBlock implements IClassTransformer {
|
||||
public class ACTBlock implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
ALog.fine("transforming %s %s", par1, par2);
|
||||
ClassReader cr = new ClassReader(par3);
|
||||
ClassWriter cw = new ClassWriter(cr, 0);
|
||||
CVTransform cv = new CVTransform(cw);
|
||||
@@ -56,7 +56,7 @@ public class SMCCTBlock implements IClassTransformer {
|
||||
if (cst instanceof Float) {
|
||||
if (((Float) cst).floatValue() == 0.2f) {
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", "blockAoLight", "F");
|
||||
SMCLog.info(" blockAoLight");
|
||||
ALog.info(" blockAoLight");
|
||||
return;
|
||||
}
|
||||
}
|
||||
+11
-11
@@ -11,11 +11,11 @@ import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
/** transformer for net.minecraft.client.renderer.EntityRenderer */
|
||||
public class SMCCTEntityRenderer implements IClassTransformer {
|
||||
public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -41,29 +41,29 @@ public class SMCCTEntityRenderer implements IClassTransformer {
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
if (Names.entityRenderer_disableLightmap.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVdisableLightmap(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.entityRenderer_enableLightmap.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVenableLightmap(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.entityRenderer_updateFogColor.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVupdateFogColor(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.entityRenderer_setFogColorBuffer.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVsetFogColorBuffer(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.entityRenderer_setupFog.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVsetupFog(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.entityRenderer_renderCloudsCheck.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderCloudsCheck(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.entityRenderer_renderHand.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
access = access & (~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
return new MVrenderHand(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.entityRenderer_renderWorld.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderWorld(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -664,7 +664,7 @@ public class SMCCTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
if (state != stateEnd) SMCLog.severe(" state %d expect %d", state, stateEnd);
|
||||
if (state != stateEnd) ALog.severe(" state %d expect %d", state, stateEnd);
|
||||
mv.visitEnd();
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -10,11 +10,11 @@ import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTGuiOptions implements IClassTransformer {
|
||||
public class ACTGuiOptions implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -104,7 +104,7 @@ public class SMCCTGuiOptions implements IClassTransformer {
|
||||
mv.visitMethodInsn(INVOKESPECIAL, Names.guiButton_.clas, "<init>", "(IIIIILjava/lang/String;)V");
|
||||
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/List", "add", "(Ljava/lang/Object;)Z");
|
||||
mv.visitInsn(POP);
|
||||
SMCLog.finest(" add shaders button");
|
||||
ALog.finest(" add shaders button");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -119,7 +119,7 @@ public class SMCCTGuiOptions implements IClassTransformer {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitIntInsn(BIPUSH, 74);
|
||||
mv.visitIntInsn(BIPUSH, 20);
|
||||
SMCLog.finest(" decrease language button size");
|
||||
ALog.finest(" decrease language button size");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -175,7 +175,7 @@ public class SMCCTGuiOptions implements IClassTransformer {
|
||||
Names.minecraft_displayGuiScreen.desc);
|
||||
mv.visitLabel(l1);
|
||||
mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
|
||||
SMCLog.finest(" shaders button action");
|
||||
ALog.finest(" shaders button action");
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTItemBlock implements IClassTransformer {
|
||||
public class ACTItemBlock implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+5
-5
@@ -10,11 +10,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTItemRenderer implements IClassTransformer {
|
||||
public class ACTItemRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -47,13 +47,13 @@ public class SMCCTItemRenderer implements IClassTransformer {
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s",classname,name,desc);
|
||||
if (Names.itemRenderer_updateEquipped.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVupdate(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.itemRenderer_renderItem.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderItem(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (renderItemIrt.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderItem(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
+2
-2
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTMinecraft implements IClassTransformer {
|
||||
public class ACTMinecraft implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+2
-2
@@ -10,11 +10,11 @@ import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTModelRenderer implements IClassTransformer {
|
||||
public class ACTModelRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+3
-3
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTOpenGlHelper implements IClassTransformer {
|
||||
public class ACTOpenGlHelper implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -75,7 +75,7 @@ public class SMCCTOpenGlHelper implements IClassTransformer {
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ILOAD, 0);
|
||||
mv.visitFieldInsn(PUTSTATIC, "com/gtnewhorizons/angelica/client/Shaders", "activeTexUnit", "I");
|
||||
SMCLog.finest(" set activeTexUnit");
|
||||
ALog.finest(" set activeTexUnit");
|
||||
}
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
ALog.fine("transforming %s %s", par1, par2);
|
||||
ClassReader cr = new ClassReader(par3);
|
||||
ClassWriter cw = new ClassWriter(cr, 0);
|
||||
CVTransform cv = new CVTransform(cw);
|
||||
@@ -40,11 +40,11 @@ public class SMCCTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" %s%s",name,desc);
|
||||
if ("prepareRenderState".equals(name) && "()V".equals(desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVprepare(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
if ("restoreRenderState".equals(name) && "()V".equals(desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrestore(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -59,7 +59,7 @@ public class SMCCTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
if (Names.equals("codechicken/lib/render/CCRenderState", "reset", "()V", owner, name, desc)) {
|
||||
SMCLog.info(" beginHalo");
|
||||
ALog.info(" beginHalo");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginProjectRedHalo", "()V");
|
||||
}
|
||||
@@ -81,7 +81,7 @@ public class SMCCTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
super.visitMethodInsn(opcode, owner, name, desc);
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glDisable", "(I)V", owner, name, desc)) {
|
||||
SMCLog.info(" endHalo");
|
||||
ALog.info(" endHalo");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endProjectRedHalo", "()V");
|
||||
}
|
||||
+3
-3
@@ -10,11 +10,11 @@ import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTRender implements IClassTransformer {
|
||||
public class ACTRender implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -63,7 +63,7 @@ public class SMCCTRender implements IClassTransformer {
|
||||
mv.visitJumpInsn(IFEQ, l1);
|
||||
mv.visitInsn(RETURN);
|
||||
mv.visitLabel(l1);
|
||||
SMCLog.finer(" conditionally skip default shadow");
|
||||
ALog.finer(" conditionally skip default shadow");
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -13,11 +13,11 @@ import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
public class SMCCTRenderBlocks implements IClassTransformer {
|
||||
public class ACTRenderBlocks implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+24
-24
@@ -11,11 +11,11 @@ import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
public class ACTRenderGlobal implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -51,21 +51,21 @@ public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
// String remappedName = SMCRemap.remapper.mapMethodName(classname, name, desc);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderGlobal_renderEntities.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderEntities(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderGlobal_sortAndRender.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVendisTexFog(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderGlobal_renderSky.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderSky(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderGlobal_drawBlockDamageTexture.equalsNameDesc(name, desc)
|
||||
|| name.equals("drawBlockDamageTexture")) // Optifine
|
||||
{
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVdrawBlockDamageTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderGlobal_drawSelectionBox.equalsNameDesc(name, desc)) {
|
||||
SMCLog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVendisTexFog(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -109,20 +109,20 @@ public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
if (state == 1) {
|
||||
state = 2;
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginEntities", "()V");
|
||||
SMCLog.finest(" %s", "beginEntities");
|
||||
ALog.finest(" %s", "beginEntities");
|
||||
} else if (state == 4) {
|
||||
state = 5;
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endEntities", "()V");
|
||||
SMCLog.finest(" %s", "endEntities");
|
||||
ALog.finest(" %s", "endEntities");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginBlockEntities", "()V");
|
||||
SMCLog.finest(" %s", "beginTileEntities");
|
||||
ALog.finest(" %s", "beginTileEntities");
|
||||
} else if (state == 5) {
|
||||
if (Names.entityRenderer_disableLightmap.equals(owner, name, desc)) {
|
||||
state = 6;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endBlockEntities", "()V");
|
||||
SMCLog.finest(" %s", "endTileEntities");
|
||||
ALog.finest(" %s", "endTileEntities");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -154,21 +154,21 @@ public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "enableTexture2D", "()V");
|
||||
SMCLog.finest(" %s", "enableTexture2D");
|
||||
ALog.finest(" %s", "enableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "enableFog", "()V");
|
||||
SMCLog.finest(" %s", "enableFog");
|
||||
ALog.finest(" %s", "enableFog");
|
||||
}
|
||||
} else if (name.equals("glDisable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "disableTexture2D", "()V");
|
||||
SMCLog.finest(" %s", "disableTexture2D");
|
||||
ALog.finest(" %s", "disableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "disableFog", "()V");
|
||||
SMCLog.finest(" %s", "disableFog");
|
||||
ALog.finest(" %s", "disableFog");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -258,29 +258,29 @@ public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "enableTexture2D", "()V");
|
||||
SMCLog.finest(" %s", "enableTexture2D");
|
||||
ALog.finest(" %s", "enableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "enableFog", "()V");
|
||||
SMCLog.finest(" %s", "enableFog");
|
||||
ALog.finest(" %s", "enableFog");
|
||||
}
|
||||
} else if (name.equals("glDisable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "disableTexture2D", "()V");
|
||||
SMCLog.finest(" %s", "disableTexture2D");
|
||||
ALog.finest(" %s", "disableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "disableFog", "()V");
|
||||
SMCLog.finest(" %s", "disableFog");
|
||||
ALog.finest(" %s", "disableFog");
|
||||
}
|
||||
} else if (name.equals("glRotatef")) {
|
||||
SMCLog.finest(" *%s %d", "glRotatef", state);
|
||||
ALog.finest(" *%s %d", "glRotatef", state);
|
||||
if (state == 3) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "preCelestialRotate", "()V");
|
||||
SMCLog.finest(" %s", "preCelestialRotate");
|
||||
ALog.finest(" %s", "preCelestialRotate");
|
||||
} else if (state == 4) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
@@ -288,7 +288,7 @@ public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"postCelestialRotate",
|
||||
"()V");
|
||||
SMCLog.finest(" %s", "postCelestialRotate");
|
||||
ALog.finest(" %s", "postCelestialRotate");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -318,7 +318,7 @@ public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endBlockDestroyProgress",
|
||||
"()V");
|
||||
SMCLog.finest(" %s", "endBlockDestroyProgress");
|
||||
ALog.finest(" %s", "endBlockDestroyProgress");
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -337,7 +337,7 @@ public class SMCCTRenderGlobal implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginBlockDestroyProgress",
|
||||
"()V");
|
||||
SMCLog.finest(" %s", "beginBlockDestroyProgress");
|
||||
ALog.finest(" %s", "beginBlockDestroyProgress");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
+2
-2
@@ -10,11 +10,11 @@ import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
/** transformer for net.minecraft.client.renderer.Tessellator */
|
||||
public class SMCCTRenderManager implements IClassTransformer {
|
||||
public class ACTRenderManager implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
ALog.fine("transforming %s %s", par1, par2);
|
||||
ClassReader cr = new ClassReader(par3);
|
||||
ClassWriter cw = new ClassWriter(cr, 0);
|
||||
CVTransform cv = new CVTransform(cw);
|
||||
+2
-2
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTRenderSpider implements IClassTransformer {
|
||||
public class ACTRenderSpider implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+3
-3
@@ -12,11 +12,11 @@ import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTRendererLivingEntity implements IClassTransformer {
|
||||
public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -210,7 +210,7 @@ public class SMCCTRendererLivingEntity implements IClassTransformer {
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
if (state != stateEnd) {
|
||||
SMCLog.severe("state %d expected %d", state, stateEnd);
|
||||
ALog.severe("state %d expected %d", state, stateEnd);
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTSmartMoveModelRotationRenderer implements IClassTransformer {
|
||||
public class ACTSmartMoveModelRotationRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+2
-2
@@ -12,11 +12,11 @@ import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
/** transformer for net.minecraft.client.renderer.Tessellator */
|
||||
public class SMCCTTessellator implements IClassTransformer {
|
||||
public class ACTTessellator implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+2
-2
@@ -11,11 +11,11 @@ import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
/** transformer for net.minecraft.client.renderer.texture.AbstractTexture */
|
||||
public class SMCCTTextureAbstract implements IClassTransformer {
|
||||
public class ACTTextureAbstract implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+2
-2
@@ -12,11 +12,11 @@ import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
/** transformer for net.minecraft.client.renderer.texture.TextureAtlasSprite */
|
||||
public class SMCCTTextureAtlasSprite implements IClassTransformer {
|
||||
public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+3
-6
@@ -1,7 +1,5 @@
|
||||
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;
|
||||
@@ -9,11 +7,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureClock implements IClassTransformer {
|
||||
public class ACTTextureClock implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -41,8 +39,7 @@ public class SMCCTTextureClock implements IClassTransformer {
|
||||
// SMCLog.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);
|
||||
return new SMCCTTextureAtlasSprite.MVanimation(
|
||||
cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
return new ACTTextureAtlasSprite.MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
}
|
||||
+3
-6
@@ -1,7 +1,5 @@
|
||||
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;
|
||||
@@ -9,11 +7,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureCompass implements IClassTransformer {
|
||||
public class ACTTextureCompass implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -41,8 +39,7 @@ public class SMCCTTextureCompass implements IClassTransformer {
|
||||
// SMCLog.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);
|
||||
return new SMCCTTextureAtlasSprite.MVanimation(
|
||||
cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
return new ACTTextureAtlasSprite.MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
}
|
||||
+2
-2
@@ -11,11 +11,11 @@ import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureDownload implements IClassTransformer {
|
||||
public class ACTTextureDownload implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+2
-2
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureDynamic implements IClassTransformer {
|
||||
public class ACTTextureDynamic implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+2
-2
@@ -10,11 +10,11 @@ import org.objectweb.asm.Label;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureLayered implements IClassTransformer {
|
||||
public class ACTTextureLayered implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+2
-2
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureManager implements IClassTransformer {
|
||||
public class ACTTextureManager implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
+6
-6
@@ -10,11 +10,11 @@ import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureMap implements IClassTransformer {
|
||||
public class ACTTextureMap implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -109,7 +109,7 @@ public class SMCCTTextureMap implements IClassTransformer {
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" %s.%s%s",ownerM,nameM,descM);
|
||||
if (Names.iResourceManager_getResource.equals(owner, name, desc)) {
|
||||
SMCLog.finest(" %s", "loadRes");
|
||||
ALog.finest(" %s", "loadRes");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
@@ -121,7 +121,7 @@ public class SMCCTTextureMap implements IClassTransformer {
|
||||
&& Names.equals(Names.stitcher_.clas, "<init>", "(IIZII)V", owner, name, desc)) {
|
||||
isStitcher = true;
|
||||
} else if (Names.textureUtil_allocateTextureMipmapAniso.equals(owner, name, desc)) {
|
||||
SMCLog.finest(" %s", "allocateTextureMap");
|
||||
ALog.finest(" %s", "allocateTextureMap");
|
||||
mv.visitVarInsn(ALOAD, varStitcher);
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitMethodInsn(
|
||||
@@ -132,7 +132,7 @@ public class SMCCTTextureMap implements IClassTransformer {
|
||||
state = 1;
|
||||
return;
|
||||
} else if (state == 1 && Names.textureAtlasSpri_getIconName.equals(owner, name, desc)) {
|
||||
SMCLog.finest(" %s", "setSprite setIconName");
|
||||
ALog.finest(" %s", "setSprite setIconName");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
@@ -147,7 +147,7 @@ public class SMCCTTextureMap implements IClassTransformer {
|
||||
state = 0;
|
||||
return;
|
||||
} else if (Names.textureUtil_uploadTexSub.equals(owner, name, desc)) {
|
||||
SMCLog.finest(" %s", "uploadTexSubForLoadAtlas");
|
||||
ALog.finest(" %s", "uploadTexSubForLoadAtlas");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
+2
-2
@@ -9,11 +9,11 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureObject implements IClassTransformer {
|
||||
public class ACTTextureObject implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
ALog.fine("transforming %s %s", par1, par2);
|
||||
ClassReader cr = new ClassReader(par3);
|
||||
ClassWriter cw = new ClassWriter(cr, 0);
|
||||
CVTransform cv = new CVTransform(cw);
|
||||
+3
-3
@@ -9,13 +9,13 @@ import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class SMCCTTextureSimple implements IClassTransformer {
|
||||
public class ACTTextureSimple implements IClassTransformer {
|
||||
|
||||
private static final int logDetail = 0;
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
SMCLog.fine("transforming %s %s", par1, par2);
|
||||
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);
|
||||
@@ -77,7 +77,7 @@ public class SMCCTTextureSimple implements IClassTransformer {
|
||||
"loadSimpleTexture",
|
||||
"(ILjava/awt/image/BufferedImage;ZZ" + Names.iResourceManager_.desc
|
||||
+ Names.resourceLocation_.desc + "Lcom/gtnewhorizons/angelica/client/MultiTexID;)I");
|
||||
SMCLog.finer(" loadSimpleTexture");
|
||||
ALog.finer(" loadSimpleTexture");
|
||||
return;
|
||||
}
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
public class AClassTransformer implements IClassTransformer {
|
||||
|
||||
Names names;
|
||||
/** map of class transformer */
|
||||
protected Map<String, IClassTransformer> ctMap;
|
||||
|
||||
public void put(Names.Clas clas, IClassTransformer ct) {
|
||||
ctMap.put(clas.clas.replace('/', '.'), ct);
|
||||
}
|
||||
|
||||
// constructor
|
||||
public AClassTransformer() {
|
||||
names = new Names();
|
||||
InitNames.init();
|
||||
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());
|
||||
put(Names.tessellator_, new ACTTessellator());
|
||||
put(Names.renderBlocks_, new ACTRenderBlocks());
|
||||
put(Names.renderGlobal_, new ACTRenderGlobal());
|
||||
put(Names.entityRenderer_, new ACTEntityRenderer());
|
||||
put(Names.render_, new ACTRender());
|
||||
put(Names.renderManager_, new ACTRenderManager());
|
||||
put(Names.rendererLivingE_, new ACTRendererLivingEntity());
|
||||
put(Names.renderDragon_, new ACTRenderSpider());
|
||||
put(Names.renderEnderman_, new ACTRenderSpider());
|
||||
put(Names.renderSpider_, new ACTRenderSpider());
|
||||
put(Names.itemRenderer_, new ACTItemRenderer());
|
||||
put(Names.textureDownload_, new ACTTextureDownload());
|
||||
put(Names.abstractTexture_, new ACTTextureAbstract());
|
||||
put(Names.iTextureObject_, new ACTTextureObject());
|
||||
put(Names.simpleTexture_, new ACTTextureSimple());
|
||||
put(Names.layeredTexture_, new ACTTextureLayered());
|
||||
put(Names.dynamicTexture_, new ACTTextureDynamic());
|
||||
put(Names.textureMap_, new ACTTextureMap());
|
||||
put(Names.textureAtlasSpri_, new ACTTextureAtlasSprite());
|
||||
put(Names.textureClock_, new ACTTextureClock());
|
||||
put(Names.textureCompass_, new ACTTextureCompass());
|
||||
put(Names.textureManager_, new ACTTextureManager());
|
||||
ctMap.put("mrtjp.projectred.illumination.RenderHalo$", new ACTPrjRedIlluRenderHalo());
|
||||
ctMap.put("net.smart.render.ModelRotationRenderer", new ACTSmartMoveModelRotationRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
byte[] bytecode = par3;
|
||||
// if (par2.startsWith("mrtjp")) SMCLog.info("**** [%s]", par2);
|
||||
IClassTransformer ct = ctMap.get(par2);
|
||||
if (ct != null) {
|
||||
bytecode = ct.transform(par1, par2, bytecode);
|
||||
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);
|
||||
}
|
||||
return bytecode;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -12,7 +12,7 @@ import java.util.logging.Level;
|
||||
import java.util.logging.LogRecord;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public abstract class SMCLog {
|
||||
public abstract class ALog {
|
||||
|
||||
private static class SMCFormatter extends Formatter {
|
||||
int tzOffset;
|
||||
@@ -1,67 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
public class SMCClassTransformer implements IClassTransformer {
|
||||
|
||||
Names names;
|
||||
/** map of class transformer */
|
||||
protected Map<String, IClassTransformer> ctMap;
|
||||
|
||||
public void put(Names.Clas clas, IClassTransformer ct) {
|
||||
ctMap.put(clas.clas.replace('/', '.'), ct);
|
||||
}
|
||||
|
||||
// constructor
|
||||
public SMCClassTransformer() {
|
||||
names = new Names();
|
||||
InitNames.init();
|
||||
ctMap = new HashMap();
|
||||
put(Names.block_, new SMCCTBlock());
|
||||
put(Names.itemBlock_, new SMCCTItemBlock());
|
||||
put(Names.minecraft_, new SMCCTMinecraft());
|
||||
put(Names.guiOptions_, new SMCCTGuiOptions());
|
||||
put(Names.modelRenderer_, new SMCCTModelRenderer());
|
||||
put(Names.openGlHelper_, new SMCCTOpenGlHelper());
|
||||
put(Names.tessellator_, new SMCCTTessellator());
|
||||
put(Names.renderBlocks_, new SMCCTRenderBlocks());
|
||||
put(Names.renderGlobal_, new SMCCTRenderGlobal());
|
||||
put(Names.entityRenderer_, new SMCCTEntityRenderer());
|
||||
put(Names.render_, new SMCCTRender());
|
||||
put(Names.renderManager_, new SMCCTRenderManager());
|
||||
put(Names.rendererLivingE_, new SMCCTRendererLivingEntity());
|
||||
put(Names.renderDragon_, new SMCCTRenderSpider());
|
||||
put(Names.renderEnderman_, new SMCCTRenderSpider());
|
||||
put(Names.renderSpider_, new SMCCTRenderSpider());
|
||||
put(Names.itemRenderer_, new SMCCTItemRenderer());
|
||||
put(Names.textureDownload_, new SMCCTTextureDownload());
|
||||
put(Names.abstractTexture_, new SMCCTTextureAbstract());
|
||||
put(Names.iTextureObject_, new SMCCTTextureObject());
|
||||
put(Names.simpleTexture_, new SMCCTTextureSimple());
|
||||
put(Names.layeredTexture_, new SMCCTTextureLayered());
|
||||
put(Names.dynamicTexture_, new SMCCTTextureDynamic());
|
||||
put(Names.textureMap_, new SMCCTTextureMap());
|
||||
put(Names.textureAtlasSpri_, new SMCCTTextureAtlasSprite());
|
||||
put(Names.textureClock_, new SMCCTTextureClock());
|
||||
put(Names.textureCompass_, new SMCCTTextureCompass());
|
||||
put(Names.textureManager_, new SMCCTTextureManager());
|
||||
ctMap.put("mrtjp.projectred.illumination.RenderHalo$", new SMCCTPrjRedIlluRenderHalo());
|
||||
ctMap.put("net.smart.render.ModelRotationRenderer", new SMCCTSmartMoveModelRotationRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] transform(String par1, String par2, byte[] par3) {
|
||||
byte[] bytecode = par3;
|
||||
// if (par2.startsWith("mrtjp")) SMCLog.info("**** [%s]", par2);
|
||||
IClassTransformer ct = ctMap.get(par2);
|
||||
if (ct != null) {
|
||||
bytecode = ct.transform(par1, par2, bytecode);
|
||||
int len1 = par3.length; // arg2!=null?arg2.length:0;
|
||||
int len2 = bytecode.length; // bytecode!=null?bytecode.length:0;
|
||||
SMCLog.fine(" %d (%+d)", len2, len2 - len1);
|
||||
}
|
||||
return bytecode;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user