+ Made Sub-Station a block taller.

% Changed Sub-Station power handling.

1 files changed, 208 insertions, 63 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java
index 657ef3029e..dfebe40848 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java
@@ -6,7 +6,8 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;
@@ -17,12 +18,13 @@ import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTileEntity_MultiBlockBase {
 
 	private static boolean controller;
-	
+
 	public GregtechMetaTileEntity_PowerSubStationController(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
@@ -36,7 +38,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 		return new String[]{
 				"Controller Block for the Power Sub-Station",
 				"Stores quite a lot of power.",
-				"Size(WxHxD): 5x3x5, Controller (One above the Bottom)",
+				"Size(WxHxD): 5x4x5, Controller (One above the Bottom)",
 				CORE.GT_Tooltip};
 	}
 
@@ -44,9 +46,9 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
 		if (aSide == aFacing) {
 			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(24)],
-					new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE : Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER)};
+					new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER)};
 		}
-		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(24)]};
+		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(23)]};
 	}
 
 	@Override
@@ -61,6 +63,9 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
+		
+		
+		
 		return false;
 	}
 
@@ -69,53 +74,67 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 		Utils.LOG_MACHINE_INFO("Checking structure for Industrial Power Sub-Station.");
 		final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 2;
 		final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 2;
-		
+
 		/*if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) {
 			Utils.LOG_MACHINE_INFO("Don't know why this exists?");
 			return false;
 		}*/
-		
+
 		int tAmount = 0;
 		controller = false;
 		for (int i = -2; i < 3; i++) {
 			for (int j = -2; j < 3; j++) {
-				for (int h = 0; h < 3; h++) {
-					
+				for (int h = 0; h < 4; h++) {
+
 					final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
 
-					// Sifter Floor/Roof inner 5x5
+					// Station Floor/Roof inner 5x5
 					if (((i != -2) && (i != 2)) && ((j != -2) && (j != 2))) {
 
-						// Sifter Floor & Roof (Inner 5x5) + Mufflers, Dynamos and Fluid outputs.
-						if ((h == 0) || (h == 2 || h == 1)) {
-							
+						// Station Floor & Roof (Inner 5x5) + Mufflers, Dynamos and Fluid outputs.
+						if ((h == 0 || h == 3) || (h == 2 || h == 1)) {
+
 							if (h == 2 || h == 1){						
-							//If not a hatch, continue, else add hatch and continue.
-							if ((!this.addMufflerToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(24)))) {
+								//If not a hatch, continue, else add hatch and continue.
 								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
-									Utils.LOG_MACHINE_INFO("Sifter Casing(s) Missing from one of the top layers inner 3x3.");
+									Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the top layers inner 3x3.");
 									Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
 									return false;
 								}
-								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 6) {
-									Utils.LOG_MACHINE_INFO("Sifter Casing(s) Missing from one of the top layers inner 3x3. Wrong Meta for Casing. Found:"+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName()+" with meta:"+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j));
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 7) {
+									Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the top layers inner 3x3. Wrong Meta for Casing. Found:"+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName()+" with meta:"+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j));
 									return false;
 								}
 							}
-							}
 							else {
-								if ((!this.addMufflerToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(24)))) {
-									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
-										Utils.LOG_MACHINE_INFO("Sifter Casing(s) Missing from one of the bottom layers inner 3x3.");
-										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-										return false;
-									}
-									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 5) {
-										Utils.LOG_MACHINE_INFO("Sifter Casing(s) Missing from one of the bottom layers inner 3x3. Wrong Meta for Casing. Found:"+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName()+" with meta:"+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j));
-										return false;
+								if (h==0){
+									if (!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) {
+										if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
+											Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the bottom layers inner 3x3.");
+											Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
+											return false;
+										}
+										if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 8) {
+											Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the bottom layers inner 3x3. Wrong Meta for Casing. Found:"+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName()+" with meta:"+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j));
+											return false;
+										}
+										tAmount++;
 									}
-									tAmount++;
 								}
+								if (h==3){
+									if (!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) {
+										if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
+											Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the top layers inner 3x3.");
+											Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
+											return false;
+										}
+										if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 8) {
+											Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the top layers inner 3x3. Wrong Meta for Casing. Found:"+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName()+" with meta:"+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j));
+											return false;
+										}
+										tAmount++;
+									}
+								}								
 							}
 						}
 					}
@@ -123,53 +142,70 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 					//Dealt with inner 5x5, now deal with the exterior.
 					else {
 
-						//Deal with all 4 sides (Sifter walls)
-						if ((h == 1) || (h == 2)) {
-							if (h == 2){
+						//Deal with all 4 sides (Station walls)
+						if ((h == 1) || (h == 2) || (h == 3)) {
+							if (h == 3){
 								if (!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) {
 									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
-										Utils.LOG_MACHINE_INFO("Sifter Casings Missing from somewhere in the top layer edge.");
+										Utils.LOG_MACHINE_INFO("Station Casings Missing from somewhere in the top layer edge. 3");
 										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
 										return false;
 									}
-									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 5) {
-										Utils.LOG_MACHINE_INFO("Sifter Casings Missing from somewhere in the top layer edge.");
+									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 8) {
+										Utils.LOG_MACHINE_INFO("Station Casings Missing from somewhere in the top layer edge. 3");
 										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
 										return false;
 									}
 									tAmount++;
 								}
 							}
-							else {
-								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
-									Utils.LOG_MACHINE_INFO("Sifter Casings Missing from somewhere in the second layer.");
-									Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-									return false;
+							else if (h == 2){
+								if (!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) {
+									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
+										Utils.LOG_MACHINE_INFO("Station Casings Missing from somewhere in the top layer edge. 2");
+										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
+										return false;
+									}
+									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 8) {
+										Utils.LOG_MACHINE_INFO("Station Casings Missing from somewhere in the top layer edge. 2");
+										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
+										return false;
+									}
+									tAmount++;
 								}
-								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 5) {
-									Utils.LOG_MACHINE_INFO("Sifter Casings Missing from somewhere in the second layer.");
-									Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-									return false;
+							}
+							else {
+								if (!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) {
+									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
+										Utils.LOG_MACHINE_INFO("Station Casings Missing from somewhere in the second layer. 1");
+										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
+										return false;
+									}
+									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 8) {
+										Utils.LOG_MACHINE_INFO("Station Casings Missing from somewhere in the second layer. 1");
+										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
+										return false;
+									}
+									tAmount++;
 								}
-								tAmount++;
 							}
 						}
 
 						//Deal with top and Bottom edges (Inner 5x5)
-						else if ((h == 0) || (h == 2)) {
-							if ((!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) && (!this.addInputToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(24)))) {
+						else if ((h == 0) || (h == 3)) {
+							if (!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(24))) {
 								if (((xDir + i) != 0) || ((zDir + j) != 0)) {//no controller
 
 									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings2Misc) {
-										Utils.LOG_MACHINE_INFO("Sifter Casing(s) Missing from one of the edges on the top layer.");
+										Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the edges on the top layer.");
 										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
 										return false;
 									}
-									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 5) {
-										Utils.LOG_MACHINE_INFO("Sifter Casing(s) Missing from one of the edges on the top layer. "+h);
+									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 8) {
+										Utils.LOG_MACHINE_INFO("Station Casing(s) Missing from one of the edges on the top layer. "+h);
 										Utils.LOG_MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
 										if (h ==0){
-											if (tTileEntity instanceof GregtechMetaTileEntity_IndustrialSifter){
+											if (tTileEntity instanceof GregtechMetaTileEntity_PowerSubStationController){
 
 											}
 										}
@@ -181,27 +217,27 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 							}
 						}
 					}
-					
+
 				}
 			}
 		}
 		if ((this.mInputBusses.size() != 1) || (this.mOutputBusses.size() != 1)
-				|| (this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() >= 1)
-				|| (this.mDynamoHatches.size() >= 1)) {
+				|| (this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() < 1)
+				|| (this.mDynamoHatches.size() < 1)) {
 			Utils.LOG_MACHINE_INFO("Returned False 3");
-			Utils.LOG_MACHINE_INFO("Input Buses: "+this.mInputBusses.size()+" | expected: 1");
-			Utils.LOG_MACHINE_INFO("Output Buses: "+this.mOutputBusses.size()+" | expected: 1");
-			Utils.LOG_MACHINE_INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: >= 1");
-			Utils.LOG_MACHINE_INFO("Dynamo Hatches: "+this.mDynamoHatches.size()+" | expected: >= 1");
-			Utils.LOG_MACHINE_INFO("Maint. Hatches: "+this.mMaintenanceHatches.size()+" | expected: 1");
+			Utils.LOG_MACHINE_INFO("Input Buses: "+this.mInputBusses.size()+" | expected: 1 | "+(this.mInputBusses.size() != 1));
+			Utils.LOG_MACHINE_INFO("Output Buses: "+this.mOutputBusses.size()+" | expected: 1 | "+(this.mOutputBusses.size() != 1));
+			Utils.LOG_MACHINE_INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: < 1 | "+(this.mEnergyHatches.size() < 1));
+			Utils.LOG_MACHINE_INFO("Dynamo Hatches: "+this.mDynamoHatches.size()+" | expected: < 1 | "+(this.mDynamoHatches.size() < 1));
+			Utils.LOG_MACHINE_INFO("Maint. Hatches: "+this.mMaintenanceHatches.size()+" | expected: 1 | "+(this.mMaintenanceHatches.size() != 1));
 			return false;
 		}
-		
-		Utils.LOG_INFO("Structure Built? "+(tAmount>35));
-		
+
+		Utils.LOG_INFO("Structure Built? "+""+tAmount+" | "+(tAmount>=35));
+
 		return tAmount >= 35;
 	}
-	
+
 	public boolean ignoreController(final Block tTileEntity) {
 		if (!controller && (tTileEntity == GregTech_API.sBlockMachines)) {
 			return true;
@@ -243,4 +279,113 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 		return new GregtechMetaTileEntity_PowerSubStationController(this.mName);
 	}
 
+	//NBT Power Storage handling
+	long mPowerStorageBuffer = 0;
+	int mPowerStorageMultiplier = 32;
+	long mActualStoredEU = 0;
+	
+	
+	
+	@Override
+	public void saveNBTData(NBTTagCompound aNBT) {
+		aNBT.setLong("mPowerStorageBuffer", this.mPowerStorageBuffer);
+		aNBT.setInteger("mPowerStorageMultiplier", this.mPowerStorageMultiplier);
+		aNBT.setLong("mActualStoredEU", this.mActualStoredEU);
+		super.saveNBTData(aNBT);
+	}
+
+	@Override
+	public void loadNBTData(NBTTagCompound aNBT) {
+		this.mPowerStorageBuffer = aNBT.getLong("mPowerStorageBuffer");
+		this.mPowerStorageMultiplier = aNBT.getInteger("mPowerStorageMultiplier");
+		this.mActualStoredEU = aNBT.getLong("mActualStoredEU");
+		super.loadNBTData(aNBT);
+	}
+
+	@Override
+	public int maxProgresstime() {
+		if (this.mActualStoredEU <= 0){
+			return 0;
+		}
+		else {
+			return 1;
+		}
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		mActualStoredEU = this.getEUVar();
+		super.onPostTick(aBaseMetaTileEntity, aTick);
+	}
+
+	@Override
+	public boolean onRunningTick(ItemStack aStack) {
+		this.addEnergyOutput(512);
+		return super.onRunningTick(aStack);
+	}
+
+	@Override
+	public boolean drainEnergyInput(long aEU) {
+		if (aEU <= 0L)
+			return true;
+		for (GT_MetaTileEntity_Hatch_Energy tHatch : this.mEnergyHatches) {
+			if ((isValidMetaTileEntity(tHatch))	&& (tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(aEU, false))){
+				if (this.mActualStoredEU<this.maxEUStore()){
+					this.getBaseMetaTileEntity().increaseStoredEnergyUnits(aEU, false);
+				}
+				return true;
+		}
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean addEnergyOutput(long aEU) {
+		if (aEU <= 0L)
+			return true;
+		for (GT_MetaTileEntity_Hatch_Dynamo tHatch : this.mDynamoHatches) {
+			if ((isValidMetaTileEntity(tHatch))
+					&& (tHatch.getBaseMetaTileEntity().increaseStoredEnergyUnits(aEU, false))) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public long maxEUStore() {
+		return 9200000000000000000L;
+	}
+
+	@Override
+	public long getEUVar() {
+		// TODO Auto-generated method stub
+		return super.getEUVar();
+	}
+
+	@Override
+	public long getMinimumStoredEU() {
+		// TODO Auto-generated method stub
+		return super.getMinimumStoredEU();
+	}
+
+	@Override
+	public int dechargerSlotStartIndex() {
+		// TODO Auto-generated method stub
+		return super.dechargerSlotStartIndex();
+	}
+
+	@Override
+	public int dechargerSlotCount() {
+		// TODO Auto-generated method stub
+		return super.dechargerSlotCount();
+	}
+
+	@Override
+	public int getCapacity() {
+		// TODO Auto-generated method stub
+		return super.getCapacity();
+	}
+
 }
\ No newline at end of file