+ Added more 'Special Behaviour' items for my multiblocks as Examples.

+ Added '/gtpp hand' command.
+ Added TungstenSteel & Neutronium tool variants to NEI while in dev.
+ Added Large Semifluid Generator and a crafting recipe for it.
+ Added Placeholder for Adv. Assembly Line.
+ Added Distillus Upgrade Chip and a crafting recipe for it.
% Updated build.gradle.
% Reworked a few recipes.
$ Fixed ULV Overflow Covers using 0L Water in assembler. (https://github.com/GTNewHorizons/NewHorizons/issues/5700)
$ Fixed Integral Encasement I using 0L Steel in assembler. (https://github.com/GTNewHorizons/NewHorizons/issues/5617)
$ Fixed Thaumcraft based FakePlayer's triggering Fluorite drops. (https://github.com/GTNewHorizons/NewHorizons/issues/5744)
$ Fixed bad handling of hatch textures on a few multiblocks.
$ Semi-Fixed Distillus.
$ Fixed Semifluid Generator recipes.
$ Fixed Semifluid Generators crashing the game when mined.
$ Fixed bad handling of calls to ItemList.java.
$ Began work fixing all ASM to be more compatible with ProGuard.
$ Fixed compiler complaining about varargs.
^ Bumped version to 1.7.05.x.

5 files changed, 43 insertions, 39 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
index 3490e8d8be..5d2f5b414d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
@@ -197,7 +197,7 @@ public class GregtechComponentAssembler {
 			ItemStack Input[] = { wireStack, cableStack, rodStack, magrodStack };
 
 			return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-					ItemList.valueOf("Electric_Motor_" + GT_Values.VN[tier]).get(1), (tier * 40),
+					CI.getElectricMotor(tier, 1), (tier * 40),
 					((int) GT_Values.V[tier] / 16) * 15);
 		}
 		catch (Throwable t) {
@@ -213,12 +213,12 @@ public class GregtechComponentAssembler {
 			ItemStack rodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, mat, 2);
 			ItemStack plateStack = ItemUtils.getGregtechOreStack(OrePrefixes.plate, mat, 3);
 			ItemStack gearStack = ItemUtils.getGregtechOreStack(OrePrefixes.gearGtSmall, mat, 1);
-			ItemStack motorStack = ItemList.valueOf("Electric_Motor_" + GT_Values.VN[tier]).get(1);
+			ItemStack motorStack = CI.getElectricMotor(tier, 1);
 
 			ItemStack Input[] = { plateStack, cableStack, rodStack, gearStack, motorStack };
 
 			return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-					ItemList.valueOf("Electric_Piston_" + GT_Values.VN[tier]).get(1), (tier * 40),
+					CI.getElectricPiston(tier, 1), (tier * 40),
 					((int) GT_Values.V[tier] / 16) * 15);
 		}
 		catch (Throwable t) {
@@ -230,7 +230,7 @@ public class GregtechComponentAssembler {
 		try {
 			OrePrefixes prefixCable = OrePrefixes.cableGt01;
 			ItemStack cableStack = ItemUtils.getGregtechOreStack(prefixCable, cable, 1);
-			ItemStack motorStack = ItemList.valueOf("Electric_Motor_" + GT_Values.VN[tier]).get(2);
+			ItemStack motorStack = CI.getElectricMotor(tier, 2);
 			boolean mAdd[];
 			final ArrayList<ItemStack> oreDictList = OreDictionary.getOres("plateAnyRubber");
 			if (!oreDictList.isEmpty()) {
@@ -241,7 +241,7 @@ public class GregtechComponentAssembler {
 					returnValue.stackSize = 6;
 					ItemStack Input[] = { cableStack, motorStack, returnValue };
 					mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-							ItemList.valueOf("Conveyor_Module_" + GT_Values.VN[tier]).get(1), (tier * 40),
+							CI.getConveyor(tier, 1), (tier * 40),
 							((int) GT_Values.V[tier] / 16) * 15);
 				}
 				int added = 0;
@@ -261,7 +261,7 @@ public class GregtechComponentAssembler {
 				ItemStack Input[] = { cableStack, motorStack,
 						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateRubber", 6) };
 				return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-						ItemList.valueOf("Conveyor_Module_" + GT_Values.VN[tier]).get(1), (tier * 40),
+						CI.getConveyor(tier, 1), (tier * 40),
 						((int) GT_Values.V[tier] / 16) * 15);
 			}
 
@@ -277,7 +277,7 @@ public class GregtechComponentAssembler {
 			ItemStack screwStack = ItemUtils.getGregtechOreStack(OrePrefixes.screw, main, 1);
 			ItemStack rotorStack = ItemUtils.getGregtechOreStack(OrePrefixes.rotor, main, 1);
 			ItemStack pipeStack = ItemUtils.getGregtechOreStack(OrePrefixes.pipeMedium, pipe, 1);
-			ItemStack motorStack = ItemList.valueOf("Electric_Motor_" + GT_Values.VN[tier]).get(1);
+			ItemStack motorStack = CI.getElectricMotor(tier, 1);
 			boolean mAdd[];
 			final ArrayList<ItemStack> oreDictList = OreDictionary.getOres("ringAnyRubber");
 			if (!oreDictList.isEmpty()) {
@@ -288,7 +288,7 @@ public class GregtechComponentAssembler {
 					returnValue.stackSize = 2;
 					ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack, returnValue };
 					mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-							ItemList.valueOf("Electric_Pump_" + GT_Values.VN[tier]).get(1), (tier * 40),
+							CI.getElectricPump(tier, 1), (tier * 40),
 							((int) GT_Values.V[tier] / 16) * 15);
 				}
 				int added = 0;
@@ -308,7 +308,7 @@ public class GregtechComponentAssembler {
 				ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack,
 						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ringRubber", 2) };
 				return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-						ItemList.valueOf("Electric_Pump_" + GT_Values.VN[tier]).get(1), (tier * 40),
+						CI.getElectricPump(tier, 1), (tier * 40),
 						((int) GT_Values.V[tier] / 16) * 15);
 			}
 
@@ -322,8 +322,8 @@ public class GregtechComponentAssembler {
 		try {
 			ItemStack cableStack = ItemUtils.getGregtechOreStack(OrePrefixes.cableGt01, cable, 3);
 			ItemStack rodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, stick, 2);
-			ItemStack motorStack = ItemList.valueOf("Electric_Motor_" + GT_Values.VN[tier]).get(2);
-			ItemStack pistonStack = ItemList.valueOf("Electric_Piston_" + GT_Values.VN[tier]).get(1);
+			ItemStack motorStack = CI.getElectricMotor(tier, 2);
+			ItemStack pistonStack = CI.getElectricPiston(tier, 1);
 			
 			boolean mAdd[];
 			final ItemStack oreDictList[] = CI.getAllCircuitsOfTier(tier);
@@ -335,7 +335,7 @@ public class GregtechComponentAssembler {
 					returnValue.stackSize = 1;					
 					ItemStack Input[] = { returnValue, cableStack, rodStack, pistonStack, motorStack  };
 					mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-							ItemList.valueOf("Robot_Arm_" + GT_Values.VN[tier]).get(1), (tier * 40),
+							CI.getRobotArm(tier, 1), (tier * 40),
 							((int) GT_Values.V[tier] / 16) * 15);					
 				}
 				for (boolean y : mAdd) {
@@ -353,7 +353,7 @@ public class GregtechComponentAssembler {
 			else {
 				ItemStack Input[] = { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1), cableStack, rodStack, pistonStack, motorStack  };
 				return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-						ItemList.valueOf("Robot_Arm_" + GT_Values.VN[tier]).get(1), (tier * 40),
+						CI.getRobotArm(tier, 1), (tier * 40),
 						((int) GT_Values.V[tier] / 16) * 15);
 			}
 			
@@ -381,8 +381,8 @@ public class GregtechComponentAssembler {
 			else
 				mWT = "01";
 			
-			ItemStack eyeQuantum = ItemList.valueOf("QuantumEye").get(1);
-			ItemStack starQuantum = ItemList.valueOf("QuantumStar").get(1);
+			ItemStack eyeQuantum = ItemUtils.getValueOfItemList("QuantumEye", 1, ItemUtils.getSimpleStack(Items.ender_eye, 4));
+			ItemStack starQuantum = ItemUtils.getValueOfItemList("QuantumStar", 1, ItemUtils.getSimpleStack(Items.nether_star, 4));
 
 			if (tier == 1)
 				gem = ItemUtils.getSimpleStack(Items.ender_pearl);
@@ -410,7 +410,7 @@ public class GregtechComponentAssembler {
 					returnValue.stackSize = 4;					
 					ItemStack Input[] = { returnValue, wireStack, gem };
 					mAdd[mcount++] =  CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-							ItemList.valueOf("Field_Generator_" + GT_Values.VN[tier]).get(1), (tier * 40),
+							CI.getFieldGenerator(tier, 1), (tier * 40),
 							((int) GT_Values.V[tier] / 16) * 15);					
 				}
 				for (boolean y : mAdd) {
@@ -428,7 +428,7 @@ public class GregtechComponentAssembler {
 			else {				
 				ItemStack Input[] = { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 4), wireStack, gem };
 				return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-						ItemList.valueOf("Field_Generator_" + GT_Values.VN[tier]).get(1), (tier * 40),
+						CI.getFieldGenerator(tier, 1), (tier * 40),
 						((int) GT_Values.V[tier] / 16) * 15);
 			}		
 			
@@ -454,7 +454,7 @@ public class GregtechComponentAssembler {
 					returnValue.stackSize = 2;					
 					ItemStack Input[] = { returnValue, cableStack, gemstack, magrodStack };
 					mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-							ItemList.valueOf("Emitter_" + GT_Values.VN[tier]).get(1), (tier * 40),
+							CI.getEmitter(tier, 1), (tier * 40),
 							((int) GT_Values.V[tier] / 16) * 15);					
 				}
 				for (boolean y : mAdd) {
@@ -472,7 +472,7 @@ public class GregtechComponentAssembler {
 			else {
 				ItemStack Input[] = { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 2), cableStack, gemstack, magrodStack };
 				return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-						ItemList.valueOf("Emitter_" + GT_Values.VN[tier]).get(1), (tier * 40),
+						CI.getEmitter(tier, 1), (tier * 40),
 						((int) GT_Values.V[tier] / 16) * 15);
 			}	
 			
@@ -500,7 +500,7 @@ public class GregtechComponentAssembler {
 					returnValue.stackSize = 1;					
 					ItemStack Input[] = { gemStack, cableStack, returnValue, magrodStack };
 					mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-							ItemList.valueOf("Sensor_" + GT_Values.VN[tier]).get(1), (tier * 40),
+							CI.getSensor(tier, 1), (tier * 40),
 							((int) GT_Values.V[tier] / 16) * 15);					
 				}
 				for (boolean y : mAdd) {
@@ -518,7 +518,7 @@ public class GregtechComponentAssembler {
 			else {
 				ItemStack Input[] = { gemStack, cableStack, magrodStack, ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1) };
 				return CORE.RA.addComponentMakerRecipe(Input, GT_Values.NF,
-						ItemList.valueOf("Sensor_" + GT_Values.VN[tier]).get(1), (tier * 40),
+						CI.getSensor(tier, 1), (tier * 40),
 						((int) GT_Values.V[tier] / 16) * 15);
 			}
 			
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index 54e4fbf024..2c622b9d8e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -5,8 +5,8 @@ import java.lang.reflect.InvocationTargetException;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ControlCore;
@@ -23,12 +23,9 @@ public class GregtechCustomHatches {
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches.");
 			run1();
-
-			//No pollution in 5.08
-			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			if (PollutionUtils.isPollutionEnabled()) {
 				run2();
-			}
-			
+			}			
 			run3();
 		}
 	}
@@ -201,32 +198,31 @@ public class GregtechCustomHatches {
 		Class<?> aBusEntity = aClass;
 		Constructor<?> constructor;
 		try {
-			constructor = aBusEntity.getConstructor(int.class, String.class, String.class,  int.class, int.class);
+			constructor = aBusEntity.getConstructor(int.class, String.class, String.class, int.class, int.class);
 			if (constructor != null) {
-				Object aPipe;
+				Object aBus;
 				try {
-					aPipe = constructor.newInstance(
+					aBus = constructor.newInstance(
 							aID, aUnlocalName,
 							aLocalName,
 							aTier,
 							(1+ aTier) * 32);
-					if (aPipe == null) {
-						//Logger.INFO("Failed to Generate "+aMaterial+" Hexadecuple pipes.");
+					if (aBus == null) {
+						Logger.INFO("Failed to Generate "+aLocalName+".");
 					}
 					else {
 						Logger.INFO("Generated "+aLocalName+".");
-						return aPipe;
-						//GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L));
+						return aBus;
 					}
 				} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
 						| InvocationTargetException e) {
-					//Logger.INFO("Failed to Generate "+aMaterial+" Hexadecuple pipes. [Ecx]");
 					e.printStackTrace();
+					Logger.INFO("Failed to Generate "+aLocalName+".");
 				}
 			}
 		} catch (NoSuchMethodException | SecurityException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
+			Logger.INFO("Failed to Generate "+aLocalName+".");
 		}
 		return null;
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
index 86cbdb75fa..67c54a7699 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
@@ -1,8 +1,10 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialVacuumFreezer;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_AssemblyLine;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_DistillationTower;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_EBF;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Fusion_MK4;
@@ -24,6 +26,9 @@ public class GregtechFactoryGradeReplacementMultis {
 	
 		//31021
 		GregtechItemList.Machine_Adv_DistillationTower.set(new GregtechMetaTileEntity_Adv_DistillationTower(31021, "multimachine.adv.distillationtower", "Dangote Distillus").getStackForm(1L));
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			GregtechItemList.Machine_Adv_AssemblyLine.set(new GregtechMetaTileEntity_Adv_AssemblyLine(31024, "multimachine.adv.assemblyline", "Compound Fabricator").getStackForm(1L));
+		}
 		
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index 2d548a57b7..5a7d3a50d7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -12,7 +12,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeRocketEngine;
@@ -28,13 +28,13 @@ public class GregtechRocketFuelGenerator {
 		}
 
 	}
-
+	
 	private static void run1() {
 		GregtechItemList.Controller_RocketEngine.set(
 				new GregtechMetaTileEntity_LargeRocketEngine(996, "gtpp.multimachine.rocketengine", "Rocketdyne F-1A Engine").getStackForm(1L));
 				
 		
-		ItemList aDieselEngine = Utils.getValueOfItemList("Machine_Multi_DieselEngine", ItemList.Machine_Multi_LargeBoiler_TungstenSteel);
+		ItemList aDieselEngine = ItemUtils.getValueOfItemList("Machine_Multi_DieselEngine", ItemList.Machine_Multi_LargeBoiler_TungstenSteel);
 		
 		 GT_ModHandler.addCraftingRecipe(
 				 GregtechItemList.Controller_RocketEngine.get(1L),
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
index c4141a6a77..6b38415db1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_SemiFluidGenerator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeSemifluidGenerator;
 
 public class GregtechSemiFluidgenerators {
 
@@ -12,6 +13,8 @@ public class GregtechSemiFluidgenerators {
 				"Advanced Semi-Fluid Generator", 2).getStackForm(1L));
 		GregtechItemList.Generator_SemiFluid_HV.set(new GT_MetaTileEntity_SemiFluidGenerator(839, "basicgenerator.semifluid.tier.03",
 				"Turbo Semi-Fluid Generator", 3).getStackForm(1L));
+		GregtechItemList.Controller_LargeSemifluidGenerator.set(new GregtechMetaTileEntity_LargeSemifluidGenerator(31026, "gtpp.multimachine.semifluidgenerator", "Large Semifluid Burner").getStackForm(1L));
+		
 	}
 	
 }