diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities')
4 files changed, 15 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java index 5e3b3d586b..7f8a954921 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialExtruder.java @@ -57,8 +57,8 @@ extends GregtechMeta_MultiBlockBase { "1x Input Bus (anywhere)", "1x Output Bus (anywhere)", "1x Energy Hatch (anywhere)", - "1x Maintenance Hatch (anywhere)", - "1x Muffler Hatch (Back Center)", + "1x Muffler Hatch (anywhere)", + "1x Maintenance Hatch (Back Center)", "Inconel Reinforced Casings for the rest (28 at least!)", CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java index ae0246ab4d..bbc8ebbb81 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java @@ -25,10 +25,6 @@ public class GregtechMetaTileEntity_BedrockMiningPlatform1 extends GregtechMetaT return (IMetaTileEntity) new GregtechMetaTileEntity_BedrockMiningPlatform1(this.mName); } - protected GregtechItemList getCasingBlockItem() { - return GregtechItemList.Casing_Cyclotron_External; - } - protected Material getFrameMaterial() { return ALLOY.INCONEL_690; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java index 09da08ea01..9e6b2fd4f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java @@ -26,10 +26,6 @@ public class GregtechMetaTileEntity_BedrockMiningPlatform2 extends GregtechMetaT return (IMetaTileEntity) new GregtechMetaTileEntity_BedrockMiningPlatform2(this.mName); } - protected GregtechItemList getCasingBlockItem() { - return GregtechItemList.Casing_Reactor_I; - } - protected Material getFrameMaterial() { return NUCLIDE.getInstance().AMERICIUM241; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java index 1d58fa2e34..e55db9d1ab 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java @@ -6,6 +6,7 @@ import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkPosition; @@ -28,6 +29,7 @@ import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraftforge.common.util.ForgeDirection; @@ -421,6 +423,7 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G for (int xOff = -1 + this.back.offsetX; xOff <= 1 + this.back.offsetX; ++xOff) { for (int zOff = -1 + this.back.offsetZ; zOff <= 1 + this.back.offsetZ; ++zOff) { if (xOff != 0 || zOff != 0) { + final Block tBlock = aBaseMetaTileEntity.getBlockOffset(xOff, 0, zOff); final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xOff, 0, zOff); if (!this.checkCasingBlock(xOff, 0, zOff) @@ -428,7 +431,10 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G && !this.addInputToMachineList(tTileEntity, this.casingTextureIndex) && !this.addOutputToMachineList(tTileEntity, this.casingTextureIndex) && !this.addEnergyInputToMachineList(tTileEntity, this.casingTextureIndex)) { - Logger.INFO("[Bedrock Miner] Found bad block in Structure."); + Logger.INFO("[Bedrock Miner] Found bad blosck in Structure."); + if (tBlock != null) { + //Logger.INFO("[Bedrock Miner] Found "+(new ItemStack(tBlock, tBlock.getDamageValue(aBaseMetaTileEntity.getWorld(), xOff, 0, zOff))).getDisplayName()+", expected "+this.getCasingBlockItem().get(0L, new Object[0]).getDisplayName()); + } return false; } } @@ -509,8 +515,7 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G private boolean checkFrameBlock(final int xOff, final int yOff, final int zOff) { return this.checkBlockAndMetaOffset(xOff, yOff, zOff, - GT_Utility.getBlockFromStack(this.getFrameMaterial().getFrameBox(1)), - 0); + Block.getBlockFromItem(this.getFrameMaterial().getFrameBox(1).getItem()), 0); } private boolean checkBlockAndMetaOffset(final int xOff, final int yOff, final int zOff, final Block block, @@ -519,8 +524,8 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G } private boolean checkBlockAndMeta(final int x, final int y, final int z, final Block block, final int meta) { - return (meta == 32767 || this.getBaseMetaTileEntity().getMetaID(x, y, z) == meta) - && this.getBaseMetaTileEntity().getBlock(x, y, z) == block; + Logger.INFO("Found "+this.getBaseMetaTileEntity().getBlock(x, y, z).getLocalizedName()+":"+this.getBaseMetaTileEntity().getMetaID(x, y, z)+" | Expected: "+block.getUnlocalizedName()+":"+meta); + return (this.getBaseMetaTileEntity().getMetaID(x, y, z) == meta) && this.getBaseMetaTileEntity().getBlock(x, y, z) == block; } public boolean isCorrectMachinePart(final ItemStack aStack) { @@ -543,7 +548,9 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G return false; } - protected abstract GregtechItemList getCasingBlockItem(); + protected GregtechItemList getCasingBlockItem() { + return GregtechItemList.Casing_BedrockMiner; + } protected abstract Material getFrameMaterial(); |