+ Added some ASM to fix Aspect safety in TC.

$ Minor fixes to the 5 custom TC4 Aspects.

5 files changed, 235 insertions, 40 deletions

diff --git a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
index 01efcfb412..c29d8423d8 100644
--- a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
+++ b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
@@ -19,6 +19,7 @@ public class AsmConfig {
 	public static boolean enableCofhPatch;
 	public static boolean enableGcFuelChanges;
 	public static boolean enableRcFlowFix;
+	public static boolean enableTcAspectSafety;
 
 	public AsmConfig(File file) {
 		if (!loaded) {
@@ -91,6 +92,13 @@ public class AsmConfig {
 			propOrder.add(prop.getName());
 			
 			
+			//TC Aspect Safety			
+			prop = config.get("general", "enableTcAspectSafety", true);
+			prop.comment = "Fixes small oversights in Thaumcraft 4.";
+			prop.setLanguageKey("gtpp.enableTcAspectSafety").setRequiresMcRestart(true);
+			enableTcAspectSafety = prop.getBoolean(true);
+			propOrder.add(prop.getName());
+			
 
 			config.setCategoryPropertyOrder("general", propOrder);
 			config.setCategoryPropertyOrder("debug", propOrderDebug);
@@ -104,6 +112,8 @@ public class AsmConfig {
 			FMLLog.log(Level.INFO, "[GT++ ASM] Gt Tooltip Fix - Enabled: "+enableGtTooltipFix, new Object[0]);
 			FMLLog.log(Level.INFO, "[GT++ ASM] COFH Patch - Enabled: "+enableCofhPatch, new Object[0]);
 			FMLLog.log(Level.INFO, "[GT++ ASM] Gc Fuel Changes Patch - Enabled: "+enableGcFuelChanges, new Object[0]);
+			FMLLog.log(Level.INFO, "[GT++ ASM] Railcraft Fluid Flow Patch - Enabled: "+enableRcFlowFix, new Object[0]);
+			FMLLog.log(Level.INFO, "[GT++ ASM] Thaumcraft Aspect Safety Patch - Enabled: "+enableTcAspectSafety, new Object[0]);
 			
 		} catch (Exception var3) {
 			FMLLog.log(Level.ERROR, var3, "GT++ ASM had a problem loading it's config", new Object[0]);
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
new file mode 100644
index 0000000000..6241cc81d4
--- /dev/null
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
@@ -0,0 +1,187 @@
+package gtPlusPlus.preloader.asm.transformers;
+
+import static org.objectweb.asm.Opcodes.*;
+
+import org.apache.logging.log4j.Level;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+
+public class ClassTransformer_TC_ItemWispEssence {	
+
+	private final boolean isValid;
+	private final ClassReader reader;
+	private final ClassWriter writer;
+
+	public ClassTransformer_TC_ItemWispEssence(byte[] basicClass, boolean obfuscated2) {
+		ClassReader aTempReader = null;
+		ClassWriter aTempWriter = null;	
+
+		boolean obfuscated = false;
+		boolean a1 = false;
+		boolean a2 = false;		
+
+		if (a1) {
+			obfuscated = false;
+		}
+		else if (a2) {
+			obfuscated = true;
+		}
+		else {
+			//Fallback
+			obfuscated = false;
+		}	
+		FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Are we patching obfuscated methods? "+obfuscated);	
+
+		aTempReader = new ClassReader(basicClass);
+		aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);	
+		aTempReader.accept(new AddAdapter(aTempWriter), 0);
+
+		injectMethod("getAspects", aTempWriter, obfuscated);
+
+		if (aTempReader != null && aTempWriter != null) {
+			isValid = true;
+		}
+		else {
+			isValid = false;
+		}		
+
+		FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Valid? "+isValid+".");	
+		reader = aTempReader;
+		writer = aTempWriter;		
+	}
+
+	public boolean isValidTransformer() {
+		return isValid;
+	}
+
+	public ClassReader getReader() {
+		return reader;
+	}
+
+	public ClassWriter getWriter() {
+		return writer;
+	}
+
+	public boolean injectMethod(String aMethodName, ClassWriter cw, boolean obfuscated) {
+		MethodVisitor mv;
+		boolean didInject = false;
+		FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Injecting " + aMethodName + ".");
+
+
+		if (aMethodName.equals("getAspects")) {
+			mv = cw.visitMethod(ACC_PUBLIC, "getAspects", "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;", null, null);
+			mv.visitCode();
+			Label l0 = new Label();
+			mv.visitLabel(l0);
+			mv.visitLineNumber(141, l0);
+			mv.visitVarInsn(ALOAD, 1);
+			Label l1 = new Label();
+			mv.visitJumpInsn(IFNONNULL, l1);
+			Label l2 = new Label();
+			mv.visitLabel(l2);
+			mv.visitLineNumber(142, l2);
+			mv.visitInsn(ACONST_NULL);
+			mv.visitInsn(ARETURN);
+			mv.visitLabel(l1);
+			mv.visitLineNumber(144, l1);
+			mv.visitFrame(F_SAME, 0, null, 0, null);
+			mv.visitVarInsn(ALOAD, 1);
+			mv.visitMethodInsn(INVOKEVIRTUAL, "net/minecraft/item/ItemStack", "hasTagCompound", "()Z", false);
+			Label l3 = new Label();
+			mv.visitJumpInsn(IFEQ, l3);
+			Label l4 = new Label();
+			mv.visitLabel(l4);
+			mv.visitLineNumber(145, l4);
+			mv.visitTypeInsn(NEW, "thaumcraft/api/aspects/AspectList");
+			mv.visitInsn(DUP);
+			mv.visitMethodInsn(INVOKESPECIAL, "thaumcraft/api/aspects/AspectList", "<init>", "()V", false);
+			mv.visitVarInsn(ASTORE, 2);
+			Label l5 = new Label();
+			mv.visitLabel(l5);
+			mv.visitLineNumber(146, l5);
+			mv.visitVarInsn(ALOAD, 2);
+			mv.visitVarInsn(ALOAD, 1);
+			mv.visitMethodInsn(INVOKEVIRTUAL, "net/minecraft/item/ItemStack", "getTagCompound", "()Lnet/minecraft/nbt/NBTTagCompound;", false);
+			mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/api/aspects/AspectList", "readFromNBT", "(Lnet/minecraft/nbt/NBTTagCompound;)V", false);
+			Label l6 = new Label();
+			mv.visitLabel(l6);
+			mv.visitLineNumber(147, l6);
+			mv.visitVarInsn(ALOAD, 2);
+			mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/api/aspects/AspectList", "size", "()I", false);
+			Label l7 = new Label();
+			mv.visitJumpInsn(IFLE, l7);
+			mv.visitVarInsn(ALOAD, 2);
+			Label l8 = new Label();
+			mv.visitJumpInsn(GOTO, l8);
+			mv.visitLabel(l7);
+			mv.visitFrame(F_APPEND,1, new Object[] {"thaumcraft/api/aspects/AspectList"}, 0, null);
+			mv.visitInsn(ACONST_NULL);
+			mv.visitLabel(l8);
+			mv.visitFrame(F_SAME1, 0, null, 1, new Object[] {"thaumcraft/api/aspects/AspectList"});
+			mv.visitInsn(ARETURN);
+			mv.visitLabel(l3);
+			mv.visitLineNumber(149, l3);
+			mv.visitFrame(F_CHOP,1, null, 0, null);
+			mv.visitInsn(ACONST_NULL);
+			mv.visitInsn(ARETURN);
+			Label l9 = new Label();
+			mv.visitLabel(l9);
+			mv.visitLocalVariable("this", "LgtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence;", null, l0, l9, 0);
+			mv.visitLocalVariable("itemstack", "Lnet/minecraft/item/ItemStack;", null, l0, l9, 1);
+			mv.visitLocalVariable("aspects", "Lthaumcraft/api/aspects/AspectList;", null, l5, l3, 2);
+			mv.visitMaxs(2, 3);
+			mv.visitEnd();
+			didInject = true;
+		}
+
+		FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Method injection complete. "+(obfuscated ? "Obfuscated" : "Non-Obfuscated"));
+		return didInject;
+	}
+
+	public class AddAdapter extends ClassVisitor {
+
+		public AddAdapter(ClassVisitor cv) {
+			super(ASM5, cv);
+			this.cv = cv;
+		}
+
+		private final String[] aMethodsToStrip = new String[] {"getAspects"};
+
+
+		@Override
+		public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+
+			MethodVisitor methodVisitor;			
+			boolean found = false;
+
+			for (String s : aMethodsToStrip) {
+				if (name.equals(s)) {
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);				
+			}
+			else {
+				methodVisitor = null;
+			}
+
+			if (found) {
+				FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO,
+						"Found method " + name + ", removing.");
+			}
+			return methodVisitor;
+		}
+
+	}
+
+
+
+
+}
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 0cb25d259b..38fd1e0508 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -197,6 +197,15 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 				return new ClassTransformer_IC2_GetHarvestTool(basicClass, probablyShouldBeFalse, transformedName).getWriter().toByteArray();			
 			}
 		}
+		
+		//Fix Thaumcraft Shit
+		//Patching ItemWispEssence to allow invalid item handling
+		if (transformedName.equals("thaumcraft.common.items.ItemWispEssence") && mConfig.enableTcAspectSafety) {	
+			FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_TC_ItemWispEssence(basicClass, obfuscated).getWriter().toByteArray();
+		}
+		
+		
 		return basicClass;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
index d5a19a91fc..5ac85e38cd 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
@@ -7,9 +7,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 
 import gregtech.api.enums.TC_Aspects;
-import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.GT_ThaumcraftCompat;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
@@ -105,10 +105,10 @@ public class GTPP_AspectCompat {
 						"Sagrausten",
 						Utils.rgbtoHexValue(125, 125, 125),
 						new TC_Aspect_Wrapper[]{
-								get(TC_Aspects.GELUM),
-								get(TC_Aspects.IGNIS)
+								ASPECT_STARBOUND,
+								get(TC_Aspects.RADIO)
 								},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.RADIO.name() + ".png"),
+				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Sagrausten.png"),
 				false,
 				1);
 
@@ -117,10 +117,10 @@ public class GTPP_AspectCompat {
 						"Slusium",
 						Utils.rgbtoHexValue(175, 125, 25),
 						new TC_Aspect_Wrapper[]{
-								get(TC_Aspects.CORPUS),
-								get(TC_Aspects.ORDO)
+								ASPECT_BALANCE,
+								get(TC_Aspects.NEBRISUM)
 								},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.NEBRISUM.name() + ".png"),
+				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Slusium.png"),
 				false,
 				1);
 
@@ -129,10 +129,8 @@ public class GTPP_AspectCompat {
 						"Xenil",
 						Utils.rgbtoHexValue(25, 25, 25),
 						new TC_Aspect_Wrapper[]{
-								get(TC_Aspects.ALIENIS),
-								ASPECT_BALANCE
 								},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.NEBRISUM.name() + ".png"),
+				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Xenil.png"),
 				false,
 				1);
 
@@ -141,10 +139,10 @@ public class GTPP_AspectCompat {
 						"Xablum",
 						Utils.rgbtoHexValue(25, 185, 25),
 						new TC_Aspect_Wrapper[]{
-								get(TC_Aspects.CORPUS),
+								ASPECT_STARBOUND,
 								ASPECT_LUST
 								},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.NEBRISUM.name() + ".png"),
+				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Xablum.png"),
 				false,
 				1);
 
@@ -153,29 +151,12 @@ public class GTPP_AspectCompat {
 						"Zetralt",
 						Utils.rgbtoHexValue(225, 225, 225),
 						new TC_Aspect_Wrapper[]{
-								get(TC_Aspects.COGNITIO),
-								ASPECT_BALANCE
+								get(TC_Aspects.AURAM),
+								ASPECT_TOXIC
 								},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.NEBRISUM.name() + ".png"),
+				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Zetralt.png"),
 				false,
 				1);
-		
-		
-		
-		
-		/*GTPP_Aspects.CUSTOM_2.mAspect = new Aspect("custom2", 15658622, new Aspect[]{Aspect.MAGIC, Aspect.SLIME},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.RADIO.name() + ".png"), 1);
-		GTPP_Aspects.CUSTOM_3.mAspect = new Aspect("custom3", 12644078, new Aspect[]{Aspect.ENERGY, Aspect.ARMOR},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.RADIO.name() + ".png"), 1);
-		GTPP_Aspects.CUSTOM_4.mAspect = new Aspect("custom4", 12632256, new Aspect[]{Aspect.METAL, Aspect.POISON},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.RADIO.name() + ".png"), 1);
-		GTPP_Aspects.CUSTOM_5.mAspect = new Aspect("custom4", 12648384, new Aspect[]{Aspect.LIGHT, Aspect.SOUL},
-				new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.RADIO.name() + ".png"), 1);*/
-		GT_LanguageManager.addStringLocalization("tc.aspect.Sagrausten", "Balance");
-		GT_LanguageManager.addStringLocalization("tc.aspect.Slusium", "Lust");
-		GT_LanguageManager.addStringLocalization("tc.aspect.Xenil", "Starbound");
-		GT_LanguageManager.addStringLocalization("tc.aspect.Xablum", "Toxic");
-		GT_LanguageManager.addStringLocalization("tc.aspect.Zetralt", "Zetralt");
 	}
 	
 	private TC_Aspect_Wrapper get(TC_Aspects aGtObjects) {
diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
index ba448442d2..4759a04158 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
@@ -131,28 +131,32 @@ public class TC_Aspect_Wrapper {
 		this(tag, color, components, vanilla ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png") : new ResourceLocation(CORE.MODID, "textures/aspects/" + tag.toLowerCase() + ".png"), vanilla, blend);
 	}
 	
+	private static int aInternalAspectIDAllocation = 0;
 
-	public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, ResourceLocation image, boolean vanilla, int blend) {
+	public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, ResourceLocation image, boolean vanilla, int blend) {		
+		if (components == null) {
+			components = new TC_Aspect_Wrapper[] {};
+		}	
+		String aTag = vanilla ? tag.toLowerCase() : "custom"+(aInternalAspectIDAllocation++);		
 		if (getAspectList().containsKey(tag.toLowerCase())) {
-			this.tag = tag.toLowerCase();
+			this.tag = aTag;
 			this.components = components;
 			this.color = color;
 			this.image = image;
 			this.blend = blend;
 			this.mAspect = null;
 			this.mGtEnumField = null;
-		} else {
-			this.tag = tag.toLowerCase();
+		} else {			
+			this.tag = aTag;			
 			this.components = components;
 			this.color = color;
 			this.image = image;
 			this.blend = blend;
 			this.mAspect = vanilla ? getVanillaAspectObject(this.tag) : this.generateTcAspect();			
 			
-			//Set GT Type if exists
+			// Set GT Type if exists
 			TC_Aspects y = null;
 			for (TC_Aspects e : TC_Aspects.values()) {
-				TC_Aspect_Wrapper g;
 				try {
 					String gtTag = ThaumcraftUtils.getTagFromAspectObject(e.mAspect);
 					if (gtTag != null) {
@@ -166,7 +170,11 @@ public class TC_Aspect_Wrapper {
 				}
 			}
 			this.mGtEnumField = y;
-			mInternalAspectCache.put(this.tag, this);			
+			mInternalAspectCache.put(this.tag, this);
+			// Double link custom Aspects, but internalise names using custom# instead
+			if (!vanilla) {
+				mInternalAspectCache.put(tag.toLowerCase(), this);				
+			}			
 			Logger.INFO("[Thaumcraft++] Adding support for Aspect: "+tag);
 		}
 	}
@@ -282,7 +290,7 @@ public class TC_Aspect_Wrapper {
 	public Object generateTcAspect() {
 		try {			
 			//thaumcraft.api.aspects.Aspect.Aspect()
-			Object aAspectArray = (Object[]) Array.newInstance(mClass_Aspect, 1);
+			Object aAspectArray = (Object[]) Array.newInstance(mClass_Aspect, 0);
 			if (components.length > 0) {
 				aAspectArray = (Object[]) Array.newInstance(mClass_Aspect, components.length);
 				int i = 0;