diff options
Diffstat (limited to 'src/main/java/common/tileentities')
| -rw-r--r-- | src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java | 26 | ||||
| -rw-r--r-- | src/main/java/common/tileentities/TE_TFFTMultiHatch.java | 8 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java index c1cd7d7e58..d24baeeef6 100644 --- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java +++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java @@ -210,6 +210,7 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock minCasingAmount--; } else { formationChecklist = false; + break; } } } @@ -252,27 +253,30 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock for(int X = -2; X <= 2; X++) { for(int Z = 0; Z >= -4; Z--) { final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z); + final String blockNameAt = thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName(); final int meta = thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()); // Check only outer ring, except when on roof height - if(Y < firstGlassHeight){ - if((X == -2 || X == 2) && (Z == -1 || Z == 4)) { - if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameBorosilicate)) { - if(firstGlassMeta == -1) { - firstGlassMeta = meta; - } else if(meta != firstGlassMeta) { - formationChecklist = false; - } - } else { + if((Y < firstGlassHeight) && (X == -2 || X == 2) && (Z == -1 || Z == 4)){ + if(glassNameBorosilicate.equals(blockNameAt)) { + if(firstGlassMeta == -1) { + firstGlassMeta = meta; + } else if(meta != firstGlassMeta) { formationChecklist = false; + break; } + } else { + formationChecklist = false; + break; } } else { - if (!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameBorosilicate)) { + if (glassNameBorosilicate.equals(blockNameAt)) { if(meta != firstGlassMeta) { formationChecklist = false; + break; } } else { formationChecklist = false; + break; } } } @@ -296,8 +300,6 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock } } - KekzCore.LOGGER.info("Found " + mDynamoTunnelsTT.size() + "Laser Source Hatches"); - KekzCore.LOGGER.info("Found " + mEnergyTunnelsTT.size() + "Laser Target Hatches"); // Glass has to be at least UV-tier to allow TT Laser hatches if(colourCorrectedMeta < 5) { if(mEnergyTunnelsTT.size() > 0 || mDynamoTunnelsTT.size() > 0) { diff --git a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java index d334a92070..c4f9451478 100644 --- a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java +++ b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java @@ -179,14 +179,18 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler { @Override public void writeToNBT(NBTTagCompound nbt) { nbt = (nbt == null) ? new NBTTagCompound() : nbt; - + + nbt.setBoolean("autoOutput", autoOutput); + super.writeToNBT(nbt); } @Override public void readFromNBT(NBTTagCompound nbt) { nbt = (nbt == null) ? new NBTTagCompound() : nbt; - + + autoOutput = nbt.getBoolean("autoOutput"); + super.readFromNBT(nbt); } |