Merge branch 'experimental' into LCE2

3 files changed, 40 insertions, 32 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 6ceebc3877..21a407f6e2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -5,10 +5,10 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMachineCallback;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Log;
@@ -16,9 +16,9 @@ import gregtech.api.util.GT_Recipe;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 
 import static gregtech.api.enums.GT_Values.debugCleanroom;
-import static gregtech.api.enums.GT_Values.V;
 
 public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBase {
     private int mHeight = -1;
@@ -207,24 +207,8 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 		if (this.mMaintenanceHatches.size() != 1 || this.mEnergyHatches.size() != 1 || mDoorCount != 2 || mHullCount > 10) {
 			return false;
 		}
-		for (int dX = -x + 1; dX <= x - 1; dX++) {
-			for (int dZ = -z + 1; dZ <= z - 1; dZ++) {
-				for (int dY = -1; dY >= y + 1; dY--) {
-					IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(dX, dY, dZ);
-					if (tTileEntity != null) {
-						IMetaTileEntity aMetaTileEntity = tTileEntity.getMetaTileEntity();
-						if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicMachine) {
-							if (debugCleanroom) {
-								GT_Log.out.println(
-									"Cleanroom: Machine detected, adding pointer back to cleanroom"
-								);
-							}
-							((GT_MetaTileEntity_BasicMachine) aMetaTileEntity).mCleanroom = this;
-						}
-					}
-				}
-			}
-		}
+
+		setCallbacks(x, y, z, aBaseMetaTileEntity);
 
         if (doorState) {
 			this.mEfficiency = Math.max(0, this.mEfficiency - 200);
@@ -240,7 +224,34 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 
         return mPlascreteCount>=20 && mGlassCount < (int) Math.floor(ratio);
     }
-    
+
+    private void setCallbacks(int x, int y, int z, IGregTechTileEntity aBaseMetaTileEntity){
+		for (int dX = -x + 1; dX <= x - 1; dX++)
+			for (int dZ = -z + 1; dZ <= z - 1; dZ++)
+				for (int dY = -1; dY >= y + 1; dY--) {
+					TileEntity tTileEntity = aBaseMetaTileEntity.getTileEntityOffset(dX, dY, dZ);
+
+					if (tTileEntity instanceof IGregTechTileEntity) {
+						IMetaTileEntity iMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
+
+						if (iMetaTileEntity instanceof IMachineCallback<?>)
+							checkAndSetCallback((IMachineCallback<?>) iMetaTileEntity);
+
+					} else if (tTileEntity instanceof IMachineCallback<?>)
+						checkAndSetCallback((IMachineCallback<?>) tTileEntity);
+				}
+	}
+
+    @SuppressWarnings("unchecked")
+    private void checkAndSetCallback(IMachineCallback<?> iMachineCallback) {
+		if (debugCleanroom)
+			GT_Log.out.println(
+					"Cleanroom: IMachineCallback detected, checking for cleanroom: " + (iMachineCallback.getType() == this.getClass())
+			);
+		if (iMachineCallback.getType() == this.getClass())
+			((IMachineCallback<GT_MetaTileEntity_Cleanroom>) iMachineCallback).setCallbackBase(this);
+	}
+
     @Override
     public boolean allowGeneralRedstoneOutput(){
     	return true;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
index 13764b928e..fad880e5e4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
@@ -190,7 +190,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu
 			}
 
 		}
-		return casingAmount >= 8 && hasHeatingCoil;
+		return casingAmount >= 8 && hasHeatingCoil && !mEnergyHatches.isEmpty() && !mMaintenanceHatches.isEmpty();
 	}
 
 	@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
index 3c59bee520..5ead0bf896 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -13,6 +13,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
+
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -318,15 +319,12 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         Block block = getBaseMetaTileEntity().getBlock(x, y, z);
         int blockMeta = getBaseMetaTileEntity().getMetaID(x, y, z);
         ChunkPosition blockPos = new ChunkPosition(x, y, z);
-        if (oreBlockPositions.contains(blockPos))
-            return;
-        if (block instanceof GT_Block_Ores_Abstract) {
-            TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(x, y, z);
-            if (tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural)
-                oreBlockPositions.add(blockPos);
-        } else {
-            ItemData association = GT_OreDictUnificator.getAssociation(new ItemStack(block, 1, blockMeta));
-            if (association != null && association.mPrefix.toString().startsWith("ore"))
+        if (!oreBlockPositions.contains(blockPos)) {
+            if (block instanceof GT_Block_Ores_Abstract) {
+                TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, y, z);
+                if (tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural)
+                    oreBlockPositions.add(blockPos);
+            } else if (GT_Utility.isOre(new ItemStack(block, 1, blockMeta)))
                 oreBlockPositions.add(blockPos);
         }
     }
@@ -337,7 +335,6 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
 
     protected String[] getDescriptionInternal(String tierSuffix) {
         String casings = getCasingBlockItem().get(0).getDisplayName();
-        int d = getRadiusInChunks() * 2;
         return new String[]{
                 "Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : ""),
                 "Size(WxHxD): 3x7x3, Controller (Front middle bottom)",