From f39e8134fcef5da8bd04503c5233b2b6de249b3a Mon Sep 17 00:00:00 2001
From: Alkalus <Draknyte1@hotmail.com>
Date: Sat, 28 Mar 2020 02:09:24 +0000
Subject: + 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.

---
 .../xmod/gregtech/api/enums/GregtechItemList.java      | 18 +++++++++++++++---
 .../base/GregtechMeta_MultiBlockBase.java              |  8 ++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index cd4b0947e4..c7fe473c44 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -2,13 +2,14 @@ package gtPlusPlus.xmod.gregtech.api.enums;
 
 import static gregtech.api.enums.GT_Values.W;
 
-import gregtech.api.util.*;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
 import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
 
 /**
  * Class containing all non-OreDict Items of GregTech.
@@ -130,6 +131,14 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Farm_Processor_ZPM, 
 	Farm_Processor_UV,
 	
+	// Upgrade chip for Distillus
+	Distillus_Upgrade_Chip,
+	
+	
+	// Chips used to nerf my multis via custom behavioural attachments
+	Chip_MultiNerf_NoOutputBonus,
+	Chip_MultiNerf_NoSpeedBonus,
+	Chip_MultiNerf_NoEuBonus,
 
 	//----------------------------------------------------------------------------
 	
@@ -308,7 +317,9 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Machine_Adv_ImplosionCompressor, 
 	Machine_Adv_DistillationTower,
 
-
+	//Advanced Assembly Line
+	Machine_Adv_AssemblyLine,
+	
 	//Advanced Vacuum Freezer
 	Industrial_Cryogenic_Freezer, 
 	Casing_AdvancedVacuum,	
@@ -579,6 +590,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Generator_SemiFluid_LV, 
 	Generator_SemiFluid_MV, 
 	Generator_SemiFluid_HV, 
+	Controller_LargeSemifluidGenerator,
 
 
 	//Advanced Mixer 4x4
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index ef5429af62..b6b75808fc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -16,7 +16,6 @@ import org.apache.commons.lang3.ArrayUtils;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.TAE;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -2213,7 +2212,7 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 			}
 
 		}
-		return super.addDynamoToMachineList(aTileEntity, aBaseCasingIndex);
+		return addToMachineList(aTileEntity, aBaseCasingIndex);
 	}
 	
 	
@@ -2536,9 +2535,10 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 		boolean isHatch = false;
 		if (aBaseMetaTileEntity != null) {
 
-			if (aCasingID < 64) {
+			// Unsure why this check exists?
+			/*if (aCasingID < 64) {
 				aCasingID = TAE.GTPP_INDEX(aCasingID);
-			}
+			}*/
 
 			isHatch = this.addToMachineList(aBaseMetaTileEntity, aCasingID);
 			if (isHatch) {
-- 
cgit