+ Added ASM config options to adjust RC fluid (un)loader IO rates.

% Split RC IO patch into two config options, default is now RC standard of 4k, but can be adjusted back to 26 (Or higher) as needed.

4 files changed, 156 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
index 88bcf6b28b..87ac77d5da 100644
--- a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
+++ b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
@@ -20,6 +20,9 @@ public class AsmConfig {
 	public static boolean enableCofhPatch;
 	public static boolean enableGcFuelChanges;
 	public static boolean enableRcFlowFix;
+	public static int maxRailcraftTankProcessVolume;
+	public static int maxRailcraftFluidLoaderFlow;
+	public static int maxRailcraftFluidUnloaderFlow;
 	public static boolean enableRcItemDupeFix;
 	public static boolean enableTcAspectSafety;
 	public static boolean enabledLwjglKeybindingFix;
@@ -118,11 +121,31 @@ public class AsmConfig {
 			
 			//Railcraft Tank fix
 			prop = config.get("general", "enableRcFlowFix", true);
-			prop.comment = "Quadruples max RC IO rates on tanks";
+			prop.comment = "Allows Custom max IO rates on RC tanks";
 			prop.setLanguageKey("gtpp.enableRcFlowFix").setRequiresMcRestart(true);
 			enableRcFlowFix = prop.getBoolean(true);
 			propOrder.add(prop.getName());
 			
+			prop = config.get("general", "maxRailcraftTankProcessVolume", 4000);
+			prop.comment = "Max IO for RC fluid tanks (Not Carts). 'enableRcFlowFix' Must be enabled.";
+			prop.setLanguageKey("gtpp.maxRailcraftTankProcessVolume").setRequiresMcRestart(true);
+			maxRailcraftTankProcessVolume = prop.getInt(4000);
+			propOrder.add(prop.getName());
+			
+			// Railcraft Loader Max flowrate
+			prop = config.get("general", "maxRailcraftFluidLoaderFlow", 20);
+			prop.comment = "Max Output rate for RC Fluid Loaders";
+			prop.setLanguageKey("gtpp.maxRailcraftFluidLoaderFlow").setRequiresMcRestart(true);
+			maxRailcraftFluidLoaderFlow = prop.getInt(20);
+			propOrder.add(prop.getName());
+			
+			// Railcraft Unloader Max flowrate
+			prop = config.get("general", "maxRailcraftFluidUnloaderFlow", 80);
+			prop.comment = "Max Output rate for RC Fluid Unloaders";
+			prop.setLanguageKey("gtpp.maxRailcraftFluidUnloaderFlow").setRequiresMcRestart(true);
+			maxRailcraftFluidUnloaderFlow = prop.getInt(80);
+			propOrder.add(prop.getName());
+			
 			//Railcraft Dupe Fix			
 			prop = config.get("general", "enableRcItemDupeFix", true);
 			prop.comment = "Fixes possible negative itemstacks";
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java
new file mode 100644
index 0000000000..bf71582ae7
--- /dev/null
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java
@@ -0,0 +1,117 @@
+package gtPlusPlus.preloader.asm.transformers;
+
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
+import static org.objectweb.asm.Opcodes.ASM5;
+
+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.FieldVisitor;
+
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.asm.AsmConfig;
+
+public class ClassTransformer_Railcraft_FluidCartHandling {	
+
+	private final boolean isValid;
+	private final ClassReader reader;
+	private final ClassWriter writer;	
+
+	//mods.railcraft.common.blocks.machine.gamma.TileFluidLoader
+	//mods.railcraft.common.blocks.machine.gamma.TileFluidLoader.TRANSFER_RATE
+	
+	//mods.railcraft.common.blocks.machine.gamma.TileFluidUnloader
+	//mods.railcraft.common.blocks.machine.gamma.TileFluidUnloader.TRANSFER_RATE
+
+	public static final int TileFluidLoader_RATE = 20;
+	public static final int TileFluidUnloader_RATE = 80;
+
+	private static final int TYPE_LOADER = 0;
+	private static final int TYPE_UNLOADER = 1;
+
+	public ClassTransformer_Railcraft_FluidCartHandling(byte[] basicClass, boolean obfuscated, String aClassName) {
+		ClassReader aTempReader = null;
+		ClassWriter aTempWriter = null;
+		boolean aLoader = aClassName.equals("mods.railcraft.common.blocks.machine.gamma.TileFluidLoader");
+		
+		FMLRelaunchLog.log("[GT++ ASM] Railcraft TRANSFER_RATE Patch", Level.INFO, "Attempting to patch field TRANSFER_RATE in "+aClassName+", default value is "+(aLoader ? 20 : 80));			
+		aTempReader = new ClassReader(basicClass);
+		aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
+		
+		if (aLoader) {
+			aTempReader.accept(new AddFieldAdapter(aTempWriter), 0);
+			addField(ACC_PRIVATE + ACC_FINAL + ACC_STATIC, "TRANSFER_RATE", aTempWriter, TYPE_LOADER);			
+		}
+		else {
+			aTempReader.accept(new AddFieldAdapter(aTempWriter), 0);
+			addField(ACC_PRIVATE + ACC_FINAL + ACC_STATIC, "TRANSFER_RATE", aTempWriter, TYPE_UNLOADER);			
+		}
+		
+		if (aTempReader != null && aTempWriter != null) {
+			isValid = true;
+			FMLRelaunchLog.log("[GT++ ASM] Railcraft TRANSFER_RATE Patch", Level.INFO, "Valid? "+isValid+".");	
+		}
+		else {
+			isValid = false;
+		}
+		reader = aTempReader;
+		writer = aTempWriter;		
+	}
+
+	public boolean isValidTransformer() {
+		return isValid;
+	}
+
+	public ClassReader getReader() {
+		return reader;
+	}
+
+	public ClassWriter getWriter() {
+		return writer;
+	}
+
+	public boolean addField(int access, String fieldName, ClassWriter cv, int aType) {
+		int aValue = (aType == TYPE_LOADER ? AsmConfig.maxRailcraftFluidLoaderFlow : AsmConfig.maxRailcraftFluidUnloaderFlow);
+		FMLRelaunchLog.log("[GT++ ASM] Railcraft TRANSFER_RATE Patch", Level.INFO, "Injecting " + fieldName + " with new value: "+aValue);
+		FieldVisitor fv = cv.visitField(access, fieldName, "I", null, new Integer(aValue));
+		if (fv != null) {
+			fv.visitEnd();
+			return true;
+		}
+		return false;
+	}
+
+
+
+
+	public class AddFieldAdapter extends ClassVisitor {
+
+		public AddFieldAdapter(ClassVisitor cv) {
+			super(ASM5, cv);
+			this.cv = cv;
+		}
+
+		@Override
+		public FieldVisitor visitField(
+				int access, String name, String desc, String signature, Object value) {
+			if (name.equals("TRANSFER_RATE") && desc.equals("I")) {
+				FMLRelaunchLog.log("[GT++ ASM] Railcraft TRANSFER_RATE Patch", Level.INFO, "Removing "+"TRANSFER_RATE"+".");	       
+				return null;
+			}
+			else {
+				FMLRelaunchLog.log("[GT++ ASM] Railcraft TRANSFER_RATE Patch", Level.INFO, "Found Field "+name+" | "+desc);				
+			}
+			return cv.visitField(access, name, desc, signature, value); 
+		}
+
+	}
+
+
+
+
+
+
+}
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java
index d1e2f1acb3..1249df0777 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java
@@ -13,6 +13,7 @@ import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.asm.AsmConfig;
 import net.minecraft.inventory.IInventory;
 
 public class ClassTransformer_Railcraft_FluidHelper {	
@@ -21,13 +22,16 @@ public class ClassTransformer_Railcraft_FluidHelper {
 	private final ClassReader reader;
 	private final ClassWriter writer;	
 
-	public static final int PROCESS_VOLUME = 16000;	
+	public static int PROCESS_VOLUME;	
 
 	public ClassTransformer_Railcraft_FluidHelper(byte[] basicClass, boolean obfuscated2) {
+		
+		PROCESS_VOLUME = AsmConfig.maxRailcraftTankProcessVolume;
+		
 		ClassReader aTempReader = null;
 		ClassWriter aTempWriter = null;
 
-		FMLRelaunchLog.log("[GT++ ASM] Railcraft PROCESS_VOLUME Patch", Level.INFO, "Attempting to patch field PROCESS_VOLUME in mods.railcraft.common.fluids.FluidHelper");	
+		FMLRelaunchLog.log("[GT++ ASM] Railcraft PROCESS_VOLUME Patch", Level.INFO, "Attempting to patch field PROCESS_VOLUME in mods.railcraft.common.fluids.FluidHelper with new value: "+PROCESS_VOLUME);	
 
 		boolean obfuscated = false;
 		boolean a1 = false;
@@ -99,7 +103,7 @@ public class ClassTransformer_Railcraft_FluidHelper {
 				"[GT++ ASM] Railcraft PROCESS_VOLUME Patch",
 				Level.INFO,	
 				"Injecting " + fieldName + " with new value.");
-		FieldVisitor fv = cv.visitField(access, fieldName, "I", null, 16000);
+		FieldVisitor fv = cv.visitField(access, fieldName, "I", null, PROCESS_VOLUME);
 		if (fv != null) {
 			fv.visitEnd();
 			return true;
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 6b9dc306b4..d378883665 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -119,11 +119,16 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 		}
 
 		//Fix RC stuff
-		//Patching PROCESS_VOLUME to allow 4x more transfer limits
-		if (transformedName.equals("mods.railcraft.common.fluids.FluidHelper") && mConfig.enableRcFlowFix) {	
+		//Patching PROCESS_VOLUME to allow more transfer limits
+		if (transformedName.equals("mods.railcraft.common.fluids.FluidHelper") && (mConfig.enableRcFlowFix && mConfig.maxRailcraftTankProcessVolume != 4000)) {	
 			FMLRelaunchLog.log("[GT++ ASM] Railcraft PROCESS_VOLUME Patch", Level.INFO, "Transforming %s", transformedName);
 			return new ClassTransformer_Railcraft_FluidHelper(basicClass, obfuscated).getWriter().toByteArray();
-		}
+		}		
+		//Patching TRANSFER_RATE in Fluid Loaders/Unloaders
+		if ((transformedName.equals("mods.railcraft.common.blocks.machine.gamma.TileFluidLoader") && mConfig.maxRailcraftFluidLoaderFlow != 20) || (transformedName.equals("mods.railcraft.common.blocks.machine.gamma.TileFluidUnloader") && mConfig.maxRailcraftFluidUnloaderFlow != 80)) {	
+			FMLRelaunchLog.log("[GT++ ASM] Railcraft TRANSFER_RATE Patch", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_Railcraft_FluidCartHandling(basicClass, obfuscated, transformedName).getWriter().toByteArray();
+		}		
 		//Fix Weird glitch involving negative itemstacks.
 		if (transformedName.equals("mods.railcraft.common.util.inventory.InvTools") && mConfig.enableRcItemDupeFix) {	
 			FMLRelaunchLog.log("[GT++ ASM] Railcraft negative ItemStack Fix", Level.INFO, "Transforming %s", transformedName);