From 499411aa21ac4a742b6d51ef3ce9c4046d0a22c1 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 25 Jan 2019 04:34:06 +0000
Subject: + Added recipes to obtain Astral Titanium, Celestial Tungsten
 Advanced Nitinol and Chromatic Glass. + Added Particle Physics, so some basic
 extent. + Added new textures for some Meta items. + Added new textures for
 all particles and ions. + Added Custom Debug NBT to error ingots, in the
 event one is obtained by a player. + Added more information to the tooltip of
 Control Cores. + Added more uniform ways to obtain tiered item components to
 CI. - Hard disable of GC Fuel tweaks for the moment. % Hopefully greatly
 improved the cape handler. Cape list is now stored on Overmind's site,
 meaning it can be updated outside of the mod. % Cape Handler now will store
 the cape data locally in a .dat for offline use, this can be updated anytime
 by removing it, or once a week if outdated) % Tweaked Cyclotron Recipe map to
 support new changes to functionality. % Tweaked RTG fuel pellet production
 time in Cyclotron to be 100x. % Adjusted requirements for Quicklime to
 generate (It may vanish after this commit, May be worth rolling back if an
 issue.). % Adjusted code to use checkForInvalidItems instead of direct item
 comparisons in several places. % Renamed Buffer Cores to Energy Cores. %
 Adjusted recipes for Energy Cores and Energy Buffers, they now require 6 slot
 assembly. $ Fixed Multiblock handling during structure checks, they'd
 accidentally detect the controller as an invalid block.

---
 .../base/GregtechMeta_MultiBlockBase.java          | 31 ++++++++++++++--------
 1 file changed, 20 insertions(+), 11 deletions(-)

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

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 bb822ec816..3e5c783a5c 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
@@ -1508,28 +1508,37 @@ GT_MetaTileEntity_MultiBlockBase {
 	public abstract boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack);
 	
 	
-	public boolean isValidBlockForStructure(IGregTechTileEntity aBaseMetaTileEntity, int aCasingID, boolean canBeHatch, Block aFoundBlock, int aFoundMeta, Block aExpectedBlock, int aExpectedMeta) {
-		boolean isHatch = false;		
+	public boolean isValidBlockForStructure(IGregTechTileEntity aBaseMetaTileEntity, int aCasingID, boolean canBeHatch,
+			Block aFoundBlock, int aFoundMeta, Block aExpectedBlock, int aExpectedMeta) {
+		boolean isHatch = false;
 		if (aBaseMetaTileEntity != null) {
 			isHatch = this.addToMachineList(aBaseMetaTileEntity, aCasingID);
 			if (isHatch) {
 				return true;
 			}
+			else {
+				//Found a controller
+				if (aFoundMeta > 0 && aFoundMeta < 1000 && aFoundBlock == GregTech_API.sBlockMachines) {
+					return true;
+				}
+			}
 		}
 		if (!isHatch) {
-			if (aFoundBlock != aExpectedBlock || aFoundMeta != aExpectedMeta) {
+			if (aFoundBlock == aExpectedBlock && aFoundMeta == aExpectedMeta) {
+				return true;
+			}
+			else if (aFoundBlock != aExpectedBlock) {
+				Logger.INFO("A1 - Found: "+aFoundBlock.getLocalizedName()+", Expected: "+aExpectedBlock.getLocalizedName());				
 				return false;
 			}
-			else {
-				return true;
+			else if (aFoundMeta != aExpectedMeta) {
+				Logger.INFO("A2");
+				return false;
 			}
+
 		}
-		else {
-			return true;
-		}
-		
-		
-		
+		Logger.INFO("A3");
+		return false;
 	}
 
 
-- 
cgit