fix pss and centrifuge texture

5 files changed, 48 insertions, 34 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
index 87f94ddb76..9ed424386b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -75,13 +75,13 @@ extends GregtechMeta_MultiBlockBase {
 				.beginStructureBlock(3, 3, 3, true)
 				.addController("Front Center")
 				.addCasingInfo("Centrifuge Casings", 10)
-				.addInputBus("Any Casing", 1)
-				.addOutputBus("Any Casing", 1)
-				.addInputHatch("Any Casing", 1)
-				.addOutputHatch("Any Casing", 1)
-				.addEnergyHatch("Any Casing", 1)
-				.addMaintenanceHatch("Any Casing", 1)
-				.addMufflerHatch("Any Casing", 1)
+				.addInputBus("Any Casing except front", 1)
+				.addOutputBus("Any Casing except front", 1)
+				.addInputHatch("Any Casing except front", 1)
+				.addOutputHatch("Any Casing except front", 1)
+				.addEnergyHatch("Any Casing except front", 1)
+				.addMaintenanceHatch("Any Casing except front", 1)
+				.addMufflerHatch("Any Casing except front", 1)
 				.toolTipFinisher("GT++");
 		return tt;
 	}
@@ -91,9 +91,9 @@ extends GregtechMeta_MultiBlockBase {
 		if (STRUCTURE_DEFINITION == null) {
 			STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCentrifuge>builder()
 					.addShape(mName, transpose(new String[][]{
-							{"CCC", "CCC", "CCC"},
-							{"C~C", "C-C", "CCC"},
-							{"CCC", "CCC", "CCC"},
+							{"XXX", "CCC", "CCC"},
+							{"X~X", "C-C", "CCC"},
+							{"XXX", "CCC", "CCC"},
 					}))
 					.addElement(
 							'C',
@@ -109,6 +109,12 @@ extends GregtechMeta_MultiBlockBase {
 									)
 							)
 					)
+					.addElement(
+							'X',
+							ofBlock(
+									ModBlocks.blockCasingsMisc, 0
+							)
+					)
 					.build();
 		}
 		return STRUCTURE_DEFINITION;
@@ -122,7 +128,7 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
 		mCasing = 0;
-		return checkPiece(mName, 1, 1, 0) && mCasing >= 10;
+		return checkPiece(mName, 1, 1, 0) && mCasing >= 10 - 8;
 	}
 
 	public final boolean addIndustrialCentrifugeList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
index ed67bfa48b..659c014fb7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
@@ -81,7 +81,7 @@ extends GregtechMeta_MultiBlockBase {
 							{"CCC", "C-C", "CCC"},
 					}))
 					.addShape(mName + "bottom", transpose(new String[][]{
-							{"BBB", "B~B", "BBB"},
+							{"B~B", "BBB", "BBB"},
 					}))
 					.addElement(
 							'C',
@@ -133,7 +133,7 @@ extends GregtechMeta_MultiBlockBase {
 		if (checkPiece(mName + "bottom", 1, 0 ,0)) {
 			while (mPerLayer < 4) {
 				if (!checkPiece(mName + "mid", 1, mPerLayer + 1, 0) ||
-						mPerLayer != mOutputBusses.size()) return false;
+						mPerLayer + 1 != mOutputBusses.size()) return false;
 				mPerLayer ++;
 			}
 			return checkPiece(mName + "top", 1, 5, 0) && mOutputBusses.size() == 5 && mCasing >= 26;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
index 2b8a8bfe2f..2639480a1c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
@@ -103,7 +103,7 @@ extends GregtechMeta_MultiBlockBase {
 									onElementPass(
 											x -> ++x.mCasing,
 											ofBlock(
-													ModBlocks.blockCasingsMisc, 14
+													ModBlocks.blockCasingsMisc, 15
 											)
 									)
 							)
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
index 3e97519a14..bfb86d4136 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
@@ -187,6 +187,7 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo
 					.addShape(mName, transpose(new String[][]{
 							{"CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"},
 							{"CGGGC", "G---G", "G---G", "G---G", "CGGGC"},
+							{"CGGGC", "G---G", "G---G", "G---G", "CGGGC"},
 							{"CC~CC", "CHHHC", "CHHHC", "CHHHC", "CCCCC"},
 					}))
 					.addElement(
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index f8715c962f..b09c5e611b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -6,7 +6,6 @@ import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -19,12 +18,10 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.preloader.asm.AsmConfig;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_PowerSubStation;
@@ -32,7 +29,6 @@ import gtPlusPlus.xmod.gregtech.api.gui.GUI_PowerSubStation;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialElectrolyzer;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -40,7 +36,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
@@ -113,13 +108,22 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 
 	@Override
 	public boolean hasSlotInGUI() {
-		return false;
+		return true;
 	}
 
 	@Override
 	public String getCustomGUIResourceName() {
 		return null;
-	}	
+	}
+
+	@Override
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+		if (mBatteryCapacity <= 0) return false;
+		if (!aBaseMetaTileEntity.isClientSide()) {
+			aBaseMetaTileEntity.openGUI(aPlayer);
+		}
+		return true;
+	}
 
 	@Override
 	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
@@ -265,15 +269,20 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 				return aIndex == tier;
 			}
 
+			public int getIndex(int size) {
+				if (size > 6) size = 6;
+				return size + 3;
+			}
+
 			@Override
 			public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-				StructureLibAPI.hintParticle(world, x, y, z, getBlockFromTier(aIndex), getMetaFromTier(aIndex));
+				StructureLibAPI.hintParticle(world, x, y, z, getBlockFromTier(getIndex(trigger.stackSize)), getMetaFromTier(getIndex(trigger.stackSize)));
 				return true;
 			}
 
 			@Override
 			public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-				return world.setBlock(x, y, z, getBlockFromTier(aIndex), getMetaFromTier(aIndex), 3);
+				return world.setBlock(x, y, z, getBlockFromTier(getIndex(trigger.stackSize)), getMetaFromTier(getIndex(trigger.stackSize)), 3);
 			}
 		};
 	}
@@ -299,10 +308,10 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 		if (!checkPiece(mName + "bottom", 2, 0, 0))
 			return false;
 		int layer = 1;
-		while (!checkPiece(mName + "mid", 2, layer, 0)) {
+		while (checkPiece(mName + "mid", 2, layer, 0)) {
 			layer ++;
 		}
-		if (layer > 19 || !checkPiece(mName + "top", 2, layer - 1, 0))
+		if (layer > 19 || !checkPiece(mName + "top", 2, layer, 0))
 			return false;
 		int level = 0;
 		for (int i = 0; i < 6; i++) {
@@ -326,6 +335,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 			mAverageEuUsage = volSum / (mAllEnergyHatches.size() + mAllDynamoHatches.size());
 		}
 		else mAverageEuUsage = 0;
+		fixAllMaintenanceIssue();
 		return true;
 	}
 
@@ -341,10 +351,13 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
 				return this.mAllDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity);
 			} if (LoadedMods.TecTech) {
-				if (isThisHatchMultiDynamo(aMetaTileEntity))
+				if (isThisHatchMultiDynamo(aMetaTileEntity)) {
+					((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
 					return this.mAllDynamoHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity);
-				else if (isThisHatchMultiEnergy(aMetaTileEntity))
+				} else if (isThisHatchMultiEnergy(aMetaTileEntity)) {
+					((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
 					return this.mAllEnergyHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity);
+				}
 			}
 		}
 		return false;
@@ -401,13 +414,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 		
 		// Best not to get a long if the Tag Map is holding an int
 		if (aNBT.hasKey("mAverageEuUsage")) {
-			if (NBTUtils.isTagInteger(aNBT, "mAverageEuUsage")) {
-				int aAverageTag = aNBT.getInteger("mAverageEuUsage");
-				this.mAverageEuUsage = aAverageTag;
-			}
-			else {
-				this.mAverageEuUsage = aNBT.getLong("mAverageEuUsage");				
-			}
+			this.mAverageEuUsage = aNBT.getLong("mAverageEuUsage");
 		}		
 
 		//Usage Stats