Merge pull request #147 from GTNewHorizons/bartimaeusnek-fixes

Various fixes

3 files changed, 66 insertions, 39 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 95c83dd7e9..20752dfad7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -22,6 +22,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;

 import net.minecraftforge.fluids.FluidStack;

 

+import static gregtech.GT_Mod.GT_FML_LOGGER;

+

 public class GT_MetaTileEntity_AssemblyLine

         extends GT_MetaTileEntity_MultiBlockBase {

 

@@ -77,22 +79,26 @@ public class GT_MetaTileEntity_AssemblyLine
     }

 

     public boolean checkRecipe(ItemStack aStack) {

-        if(GT_Values.D1)System.out.println("Start ALine recipe check");

+        if(GT_Values.D1)

+            GT_FML_LOGGER.info("Start ALine recipe check");

         ArrayList<ItemStack> tDataStickList = getDataItems(2);

         if (tDataStickList.size() == 0) return false;

-        if(GT_Values.D1)System.out.println("Stick accepted, " + tDataStickList.size() + " Data Sticks found");

+            if(GT_Values.D1)

+                GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");

 

         ItemStack tStack[] = new ItemStack[15];

         FluidStack[] tFluids = new FluidStack[4];

         boolean findRecipe = false;

         nextDS:for (ItemStack tDataStick : tDataStickList){

             NBTTagCompound tTag = tDataStick.getTagCompound();

-            if (tTag == null) continue;

+            if (tTag == null)

+                continue;

             for (int i = 0; i < 15; i++) {

     			int count = tTag.getInteger("a"+i);

-                if (!tTag.hasKey("" + i) && count <= 0) continue;

+                if (!tTag.hasKey("" + i) && count <= 0)

+                    continue;

                 if (mInputBusses.get(i) == null) {

-                	continue nextDS;

+                    continue nextDS;

                 }

                 

                 ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);

@@ -101,7 +107,8 @@ public class GT_MetaTileEntity_AssemblyLine
             		for (int j = 0; j < count; j++) {

             			tStack[i] = GT_Utility.loadItem(tTag, "a" + i + ":" + j);

             			if (tStack[i] == null) continue;

-            			if(GT_Values.D1)System.out.println("Item "+i+" : "+tStack[i].getUnlocalizedName());

+            			    if(GT_Values.D1)

+            			        GT_FML_LOGGER.info("Item "+i+" : "+tStack[i].getUnlocalizedName());

             			if (GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) && tStack[i].stackSize <= stackInSlot.stackSize) {

             				flag = false;

             				break;

@@ -114,66 +121,79 @@ public class GT_MetaTileEntity_AssemblyLine
             			flag = false;

             			continue;

             		}

-            		if(GT_Values.D1)System.out.println("Item "+i+" : "+tStack[i].getUnlocalizedName());

+            		if(GT_Values.D1)

+            		    GT_FML_LOGGER.info("Item "+i+" : "+tStack[i].getUnlocalizedName());

         			if (GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) && tStack[i].stackSize <= stackInSlot.stackSize) {

         				flag = false;

         			}

             	}

-                if(GT_Values.D1) System.out.println(i + (flag ? " not accepted" : " accepted"));

-                if (flag) continue nextDS;

+                if(GT_Values.D1)

+                    GT_FML_LOGGER.info(i + (flag ? " not accepted" : " accepted"));

+                if (flag)

+                    continue nextDS;

             }

 

-            if(GT_Values.D1)System.out.println("All Items done, start fluid check");

+            if(GT_Values.D1)GT_FML_LOGGER.info("All Items done, start fluid check");

             for (int i = 0; i < 4; i++) {

                 if (!tTag.hasKey("f" + i)) continue;

                 tFluids[i] = GT_Utility.loadFluid(tTag, "f" + i);

                 if (tFluids[i] == null) continue;

-                if(GT_Values.D1)System.out.println("Fluid "+i+" "+tFluids[i].getUnlocalizedName());

+                    if(GT_Values.D1)

+                        GT_FML_LOGGER.info("Fluid "+i+" "+tFluids[i].getUnlocalizedName());

                 if (mInputHatches.get(i) == null) {

                     continue nextDS;

                 }

                 FluidStack fluidInHatch = mInputHatches.get(i).mFluid;

                 if (fluidInHatch == null || !GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {

-                    if(GT_Values.D1)System.out.println(i+" not accepted");

+                    if(GT_Values.D1)

+                        GT_FML_LOGGER.info(i+" not accepted");

                     continue nextDS;

                 }

-                if(GT_Values.D1)System.out.println(i+" accepted");

+                if(GT_Values.D1)

+                    GT_FML_LOGGER.info(i+" accepted");

             }

 

-            if(GT_Values.D1)System.out.println("Input accepted, check other values");

-            if (!tTag.hasKey("output")) continue;

+            if(GT_Values.D1)

+                GT_FML_LOGGER.info("Input accepted, check other values");

+            if (!tTag.hasKey("output"))

+                continue;

             mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};

             if (mOutputItems[0] == null || !GT_Utility.isStackValid(mOutputItems[0]))

                 continue;

 

-            if (!tTag.hasKey("time")) continue;

+            if (!tTag.hasKey("time"))

+                continue;

             mMaxProgresstime = tTag.getInteger("time");

-            if (mMaxProgresstime <= 0) continue;

+            if (mMaxProgresstime <= 0)

+                continue;

 

-            if (!tTag.hasKey("eu")) continue;

+            if (!tTag.hasKey("eu"))

+                continue;

             mEUt = tTag.getInteger("eu");

 

-            if(GT_Values.D1)System.out.println("Find avaiable recipe");

-            findRecipe = true;

+            if(GT_Values.D1)GT_FML_LOGGER.info("Find avaiable recipe");

+                findRecipe = true;

             break;

         }

         if (!findRecipe) return false;

 

-        if(GT_Values.D1)System.out.println("All checked start consuming inputs");

+        if(GT_Values.D1)GT_FML_LOGGER.info("All checked start consuming inputs");

         for (int i = 0; i < 15; i++) {

-            if (tStack[i] == null) continue;

+            if (tStack[i] == null)

+                continue;

             ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);

             stackInSlot.stackSize -= tStack[i].stackSize;

         }

 

         for (int i = 0; i < 4; i++) {

-            if (tFluids[i] == null) continue;

+            if (tFluids[i] == null)

+                continue;

             mInputHatches.get(i).mFluid.amount -= tFluids[i].amount;

             if (mInputHatches.get(i).mFluid.amount <= 0) {

                 mInputHatches.get(i).mFluid = null;

             }

         }

-        if(GT_Values.D1)System.out.println("Check overclock");

+        if(GT_Values.D1)GT_FML_LOGGER.info("Check overclock");

 

         byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));

         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);

@@ -192,7 +212,8 @@ public class GT_MetaTileEntity_AssemblyLine
         }

         this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);

         updateSlots();

-        if(GT_Values.D1)System.out.println("Recipe sucessfull");

+        if(GT_Values.D1)

+            GT_FML_LOGGER.info("Recipe sucessfull");

         return true;

     }

 

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 d3b61a59bf..46c9acd232 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
@@ -1,6 +1,7 @@
 package gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
@@ -19,7 +20,6 @@ import net.minecraft.item.ItemStack;
 import static gregtech.api.enums.GT_Values.debugCleanroom;
 
 public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBase {
-    private int mHeatingCapacity = 0;
 
     public GT_MetaTileEntity_Cleanroom(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
@@ -31,7 +31,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 
 	@Override
 	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_Cleanroom(this.mName);
+		return new GT_MetaTileEntity_Cleanroom(mName);
 	}
 
 	@Override
@@ -45,6 +45,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 				"1x LV or 1x MV Energy Hatch, 1x Maintainance Hatch",
 				"Up to 10 Machine Hull Item & Energy transfer through walls",
 				"Remaining Blocks: Plascrete, 20 min",
+				GT_Values.cleanroomGlass+"% of the Plascrete can be Reinforced Glass (min 20 Plascrete still apply)",
 				"Consumes 40 EU/t when first turned on and 4 EU/t once at 100% efficiency",
 				"An energy hatch accepts up to 2A, so you can use 2A LV or 1A MV",
 				"2 LV batteries + 1 LV generator or 1 MV generator",
@@ -53,9 +54,9 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 
 	@Override
 	public boolean checkRecipe(ItemStack aStack) {
-		this.mEfficiencyIncrease = 100;
-		this.mMaxProgresstime = 100;
-		this.mEUt = -4;
+		mEfficiencyIncrease = 100;
+		mMaxProgresstime = 100;
+		mEUt = -4;
 		return true;
 	}
 
@@ -67,8 +68,9 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 		int mDoorCount = 0;
 		int mHullCount = 0;
 		int mPlascreteCount = 0;
+		int mGlassCount = 0;
 		boolean doorState = false;
-		mUpdate = 100;
+		this.mUpdate = 100;
 		
 		if (debugCleanroom) {
 			GT_Log.out.println(
@@ -138,9 +140,11 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 							}
 						} else if (tBlock == GregTech_API.sBlockReinforced && tMeta == 2) {
 							mPlascreteCount++;
+						} else if (tBlock != null && tBlock.getUnlocalizedName().equals("blockAlloyGlass")){
+							++mGlassCount;
 						} else {
 							IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(dX, dY, dZ);
-							if ((!addMaintenanceToMachineList(tTileEntity, 82)) && (!addEnergyInputToMachineList(tTileEntity, 82))) {
+							if ((!this.addMaintenanceToMachineList(tTileEntity, 82)) && (!this.addEnergyInputToMachineList(tTileEntity, 82))) {
 								if (tBlock instanceof ic2.core.block.BlockIC2Door) {
 									if ((tMeta & 8) == 0) {
 										doorState = (Math.abs(dX) > Math.abs(dZ) == ((tMeta & 1) != 0)) != ((tMeta & 4) != 0);
@@ -181,7 +185,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 				}
 			}
 		}
-		if (mMaintenanceHatches.size() != 1 || mEnergyHatches.size() != 1 || mDoorCount != 2 || mHullCount > 10) {
+		if (this.mMaintenanceHatches.size() != 1 || this.mEnergyHatches.size() != 1 || mDoorCount != 2 || mHullCount > 10) {
 			return false;
 		}
 		for (int dX = -x + 1; dX <= x - 1; dX++) {
@@ -204,14 +208,16 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 		}
 
         if (doorState) {
-            mEfficiency = Math.max(0, mEfficiency - 200);
+			this.mEfficiency = Math.max(0, this.mEfficiency - 200);
         }
         for(byte i = 0 ; i<6 ; i++){
-        	byte t = (byte) Math.max(1, (byte)(15/(10000f / mEfficiency)));
+        	byte t = (byte) Math.max(1, (byte)(15/(10000f / this.mEfficiency)));
         aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, t);
         }
-        
-        return mPlascreteCount>=20;
+
+        float ratio = (((float)mPlascreteCount)/100f)* GT_Values.cleanroomGlass;
+
+        return mPlascreteCount>=20 && mGlassCount < (int) Math.floor(ratio);
     }
     
     @Override
@@ -230,7 +236,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "MultiblockDisplay.png");
+		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "MultiblockDisplay.png");
 	}
 
 	@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
index ed2c62ac1c..2485c21171 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
@@ -124,7 +124,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             if(totalFlow<=0)return 0;
             tEU = GT_Utility.safeInt((long)((fuelValue / 20D) * (double)totalFlow));
 
-            //System.out.println(totalFlow+" : "+fuelValue+" : "+aOptFlow+" : "+actualOptimalFlow+" : "+tEU);
+            //GT_FML_LOGGER.info(totalFlow+" : "+fuelValue+" : "+aOptFlow+" : "+actualOptimalFlow+" : "+tEU);
 
             if (totalFlow != actualOptimalFlow) {
                 double efficiency = 1.0D - Math.abs((totalFlow - actualOptimalFlow) / (float)actualOptimalFlow);