diff options
-rw-r--r-- | src/main/java/common/Recipes.java | 2 | ||||
-rw-r--r-- | src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java | 22 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 6a4ccffea8..66ccc6b2f1 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -1,9 +1,7 @@ package common; -import com.github.technus.tectech.thing.CustomItemList; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java index d509b4c333..4ea0f06bb4 100644 --- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java +++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java @@ -210,7 +210,6 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock minCasingAmount--; } else { formationChecklist = false; - break; } } } @@ -242,7 +241,6 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock break; } else { formationChecklist = false; - break; } } } @@ -256,27 +254,25 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock 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) && (X == -2 || X == 2) && (Z == -1 || Z == 4)){ - if(glassNameBorosilicate.equals(blockNameAt)) { - if(firstGlassMeta == -1) { - firstGlassMeta = meta; - } else if(meta != firstGlassMeta) { + if((Y < firstGlassHeight)){ + if(X == -2 || X == 2 || Z == 0 || Z == 4){ + if(glassNameBorosilicate.equals(blockNameAt)) { + if(firstGlassMeta == -1) { + firstGlassMeta = meta; + } else if(meta != firstGlassMeta) { + formationChecklist = false; + } + } else { formationChecklist = false; - break; } - } else { - formationChecklist = false; - break; } } else { if (glassNameBorosilicate.equals(blockNameAt)) { if(meta != firstGlassMeta) { formationChecklist = false; - break; } } else { formationChecklist = false; - break; } } } |