diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index e432a9907..078ec2ec4 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -90,7 +90,7 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index d235ac86d..d6b911fdc 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -106,7 +106,7 @@ public class GuiChemicalInfuser extends GuiMekanism if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index eb2b69d9c..4bd2f30ef 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -83,7 +83,7 @@ public class GuiChemicalOxidizer extends GuiMekanism if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 950fae1f5..7abd33f09 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -102,7 +102,7 @@ public class GuiChemicalWasher extends GuiMekanism if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 0b8f092b5..33f57d2c7 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -205,7 +205,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 164 && xAxis <= 168 && yAxis >= 25 && yAxis <= 77) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61) diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 64e3ef792..958ddc9c4 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -69,7 +69,7 @@ public class GuiElectricPump extends GuiMekanism { fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); - fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00); String text = tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid"); renderScaledText(text, 51, 35, 0x00CD00, 74); diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 27ee6dd34..58334e8f7 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -53,7 +53,7 @@ public class GuiEnergyCube extends GuiMekanism public List getInfo() { return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index f215b84ed..d34d19e4f 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -76,7 +76,7 @@ public class GuiFactory extends GuiMekanism if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } if(xAxis >= 8 && xAxis <= 168 && yAxis >= 78 && yAxis <= 83) diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 86137ec1c..16d879c59 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -69,7 +69,7 @@ public class GuiFluidicPlenisher extends GuiMekanism { fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); - fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00); fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid"), 51, 44, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 747fe2813..8213293f3 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -35,7 +35,7 @@ public class GuiInductionMatrix extends GuiMekanism public List getInfo() { return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"); } @@ -57,7 +57,7 @@ public class GuiInductionMatrix extends GuiMekanism if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 495bdec52..22febb852 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -64,7 +64,7 @@ public class GuiLaserAmplifier extends GuiMekanism @Override public String getText(double level) { - return LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level); + return LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level, tileEntity.getMaxEnergy()); } }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 10)); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index e0559be97..dd631b4c6 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -75,7 +75,7 @@ public class GuiMatrixStats extends GuiMekanism public List getInfo() { return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 8f7086a6e..bf10d97d2 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -111,7 +111,7 @@ public class GuiRobitMain extends GuiMekanism { CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName(); fontRendererObj.drawString(LangUtils.localize("gui.robit.greeting") + " " + robit.getName() + "!", 29, 18, 0x00CD00); - fontRendererObj.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy(), robit.MAX_ELECTRICITY), 29, 36-4, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.robit.owner") + ": " + owner, 29, 63-4, 0x00CD00); @@ -122,7 +122,7 @@ public class GuiRobitMain extends GuiMekanism if(xAxis >= 28 && xAxis <= 148 && yAxis >= 75 && yAxis <= 79) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(robit.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(robit.getEnergy(), robit.MAX_ELECTRICITY), xAxis, yAxis); } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 38ad90d36..4cac49aba 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -124,7 +124,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis); } if(xAxis >= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22) diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 7c7a00cfa..0113b1997 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -92,7 +92,7 @@ public class GuiTeleporter extends GuiMekanism @Override public String getTooltip() { - return MekanismUtils.getEnergyDisplay(getEnergy()); + return MekanismUtils.getEnergyDisplay(getEnergy(), getMaxEnergy()); } @Override @@ -124,7 +124,7 @@ public class GuiTeleporter extends GuiMekanism @Override public String getTooltip() { - return MekanismUtils.getEnergyDisplay(getEnergy()); + return MekanismUtils.getEnergyDisplay(getEnergy(), getMaxEnergy()); } @Override diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index 0f14e864f..e4105fc40 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -52,7 +52,7 @@ public class GuiEnergyGauge extends GuiGauge @Override public String getTooltipText() { - return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy()) : LangUtils.localize("gui.empty"); + return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy(), infoHandler.getEnergyStorage().getMaxEnergy()) : LangUtils.localize("gui.empty"); } public static interface IEnergyInfoHandler diff --git a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java index 8e07de717..98f513b84 100644 --- a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java @@ -31,7 +31,7 @@ public class GuiPowerBar extends GuiElement @Override public String getTooltip() { - return MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()); + return MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()); } @Override diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a2860b183..4033bc225 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1426,11 +1426,21 @@ public class Mekanism public void onBlacklistUpdate(BoxBlacklistEvent event) { MekanismAPI.addBoxBlacklist(MekanismBlocks.CardboardBox, OreDictionary.WILDCARD_VALUE); + + // Mekanism multiblock structures MekanismAPI.addBoxBlacklist(MekanismBlocks.BoundingBlock, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(MekanismBlocks.BasicBlock2, 9); // Security Desk + MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock, 4); // Digital Miner + MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock2, 9); // Seismic Vibrator + MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock3, 1); // Solar Neutron Activator + + // Minecraft unobtainable MekanismAPI.addBoxBlacklist(Blocks.BEDROCK, 0); MekanismAPI.addBoxBlacklist(Blocks.PORTAL, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL_FRAME, OreDictionary.WILDCARD_VALUE); + + // Minecraft multiblock structures MekanismAPI.addBoxBlacklist(Blocks.BED, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.OAK_DOOR, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.SPRUCE_DOOR, OreDictionary.WILDCARD_VALUE); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 6be823ca1..88d14786a 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -51,6 +51,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -59,6 +60,7 @@ import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; @@ -158,8 +160,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); - + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); + if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null) { state = state.withProperty(BlockStateFacing.facingProperty, ((TileEntityBasicBlock)tile).facing); @@ -344,7 +346,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock return false; case 9: case 11: - TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(pos); + TileEntityDynamicTank tileEntity = (TileEntityDynamicTank) MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity != null) { @@ -372,7 +374,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock case 2: case 7: case 8: - TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(pos); + TileEntityMultiblock tileEntity = (TileEntityMultiblock) MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity != null) { @@ -412,12 +414,27 @@ public abstract class BlockBasic extends Block implements ICTMBlock { if(!bin.bottomStack.isEmpty()) { - if(!player.isSneaking()) + ItemStack stack; + if(player.isSneaking()) { - world.spawnEntity(new EntityItem(world, player.posX, player.posY, player.posZ, bin.removeStack().copy())); + stack = bin.remove(1).copy(); } - else { - world.spawnEntity(new EntityItem(world, player.posX, player.posY, player.posZ, bin.remove(1).copy())); + else + { + stack = bin.removeStack().copy(); + } + + if(!player.inventory.addItemStackToInventory(stack)) + { + BlockPos dropPos = pos.offset(bin.facing); + Entity item = new EntityItem(world, dropPos.getX() + .5f, dropPos.getY() + .3f, dropPos.getZ() + .5f, stack); + item.addVelocity(-item.motionX, -item.motionY, -item.motionZ); + world.spawnEntity(item); + } + else + { + world.playSound(null, pos.getX() + .5f, pos.getY() + .5f, pos.getZ() + .5f, + SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } } } @@ -716,7 +733,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); int metadata = state.getBlock().getMetaFromState(state); if(tileEntity instanceof IActiveState) @@ -1044,4 +1061,4 @@ public abstract class BlockBasic extends Block implements ICTMBlock { return BasicBlockType.get(world.getBlockState(pos)).isBeaconBase; } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index b2afc4857..45d337ab6 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -87,7 +87,7 @@ public class BlockEnergyCube extends BlockContainer @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityEnergyCube) { diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 64297680f..f30c2c5c9 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -74,7 +74,7 @@ public class BlockGasTank extends BlockContainer @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityGasTank) { diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java index 0480378b6..7aeea339d 100644 --- a/src/main/java/mekanism/common/block/BlockGlowPanel.java +++ b/src/main/java/mekanism/common/block/BlockGlowPanel.java @@ -9,6 +9,7 @@ import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateGlowPanel; import mekanism.common.tile.TileEntityGlowPanel; +import mekanism.common.util.MekanismUtils; import mekanism.common.util.MultipartUtils; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; @@ -71,7 +72,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); + TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state; } @@ -79,8 +80,8 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); - + TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); + if(tileEntity != null) { state = state.withProperty(BlockStateFacing.facingProperty, tileEntity.side); @@ -117,7 +118,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); + TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); if(!tileEntity.getWorld().isRemote && !canStay(tileEntity)) { @@ -137,7 +138,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile != null && tile instanceof TileEntityGlowPanel) { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 6529f9ed9..b29cee243 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -206,7 +206,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null) { @@ -383,7 +383,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock { if(client.enableAmbientLighting) { - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity instanceof IActiveState) { @@ -992,7 +992,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { MachineType type = MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state)); - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(type == null) { @@ -1025,12 +1025,6 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock { return false; } - - @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getCollisionBoundingBox(state, world, pos); - } @Override public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) @@ -1111,7 +1105,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock @Override public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile instanceof TileEntityLaserAmplifier) { diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 4b10f95f4..43061a2ab 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -14,9 +14,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index 7b094a3fd..260025099 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -95,7 +95,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntitySidedPipe) { @@ -129,7 +129,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)w.getTileEntity(pos); + TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(w, pos); if(tile != null) { @@ -147,7 +147,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile instanceof TileEntitySidedPipe && ((TileEntitySidedPipe)tile).getTransmitterType().getSize() == Size.SMALL) { @@ -301,7 +301,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos); + TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(world, pos); EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); tile.onNeighborTileChange(side); } diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 0c175ea0a..cf30580f7 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -38,7 +38,7 @@ public class ItemBlockCardboardBox extends ItemBlock public ItemBlockCardboardBox(Block block) { super(block); - setMaxStackSize(1); + setMaxStackSize(16); metaBlock = block; MinecraftForge.EVENT_BUS.register(this); @@ -168,4 +168,15 @@ public class ItemBlockCardboardBox extends ItemBlock event.setCanceled(true); } } + + @Override + public int getItemStackLimit(ItemStack stack) + { + BlockData blockData = getBlockData(stack); + if(blockData != null) + { + return 1; + } + return super.getItemStackLimit(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 0464af627..014c708d3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -61,7 +61,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI super(block); metaBlock = block; setHasSubtypes(true); - setMaxStackSize(1); + setMaxStackSize(16); setCreativeTab(Mekanism.tabMekanism); } @@ -333,7 +333,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public boolean showDurabilityBar(ItemStack stack) { - return true; + return getGas(stack) != null; // No bar for empty containers as bars are drawn on top of stack count number } @Override @@ -399,4 +399,15 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { return hasSecurity(stack); } + + @Override + public int getItemStackLimit(ItemStack stack) + { + GasStack gasStack = getGas(stack); + if(gasStack != null) + { + return 1; + } + return super.getItemStackLimit(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index b89a13254..3cf75f52e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -244,7 +244,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(type.isElectric) { - list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack))); } if(hasTank(itemstack) && type != MachineType.FLUID_TANK) @@ -971,4 +971,18 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } + + @Override + public int getItemStackLimit(ItemStack stack) + { + if(MachineType.get(stack) == MachineType.FLUID_TANK) + { + if(getFluidStack(stack) != null) + { + return 1; + } + return 16; + } + return super.getItemStackLimit(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index be5b11559..301eba34c 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -66,7 +66,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack))); } public ItemStack getUnchargedItem() diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 49574a28c..2f952f890 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -82,7 +82,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack))); } public ItemStack getUnchargedItem() diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 330829f5f..37602c11c 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -13,8 +13,10 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.items.ItemHandlerHelper; -public final class FluidContainerUtils +public final class FluidContainerUtils { + private FluidContainerUtils(){} + public static boolean isFluidContainer(ItemStack stack) { return !stack.isEmpty() && stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); @@ -27,28 +29,25 @@ public final class FluidContainerUtils public static FluidStack extractFluid(FluidTank tileTank, TileEntityContainerBlock tile, int slotID, FluidChecker checker) { - FluidStack ret = extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), tile.inventory.get(slotID), checker); - tile.inventory.set(slotID, FluidUtil.getFluidHandler(tile.inventory.get(slotID)).getContainer()); - return ret; + return extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), tile.inventory.get(slotID), checker); } public static FluidStack extractFluid(int needed, ItemStack container, FluidChecker checker) { IFluidHandlerItem handler = FluidUtil.getFluidHandler(container); + FluidStack fluidStack = FluidUtil.getFluidContained(container); - if(handler == null || FluidUtil.getFluidContained(container) == null) + if(handler == null || fluidStack == null) { return null; } - if(checker != null && !checker.isValid(FluidUtil.getFluidContained(container).getFluid())) + if(checker != null && !checker.isValid(fluidStack.getFluid())) { return null; } - FluidStack ret = handler.drain(needed, true); - - return ret; + return handler.drain(needed, true); } public static int insertFluid(FluidTank tileTank, ItemStack container) @@ -60,7 +59,7 @@ public final class FluidContainerUtils { IFluidHandler handler = FluidUtil.getFluidHandler(container); - if(fluid == null) + if(fluid == null || handler == null) { return 0; } @@ -128,8 +127,9 @@ public final class FluidContainerUtils return (checker == null || checker.isValid(f)) && (storedFinal == null || storedFinal == f); } }); - - ItemStack inputCopy = FluidUtil.getFluidHandler(input).getContainer(); + + IFluidHandlerItem iFluidHandlerItem = FluidUtil.getFluidHandler(input); + ItemStack inputCopy = iFluidHandlerItem != null ? iFluidHandlerItem.getContainer() : ItemStack.EMPTY; if(FluidUtil.getFluidContained(inputCopy) == null && !inputCopy.isEmpty()) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 20967ad7d..ce2b9d4b8 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -84,10 +84,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.ChunkCache; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.UsernameCache; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -1106,6 +1108,19 @@ public final class MekanismUtils return "error"; } + + public static String getEnergyDisplay(double energy, double max) + { + if(energy == Double.MAX_VALUE) + { + return LangUtils.localize("gui.infinite"); + } + + String energyString = getEnergyDisplay(energy); + String maxString = getEnergyDisplay(max); + + return energyString + "/" + maxString; + } /** * Convert from the unit defined in the configuration to joules. @@ -1551,4 +1566,9 @@ public final class MekanismUtils return prefix + "/"; } } + + public static TileEntity getTileEntitySafe(IBlockAccess worldIn, BlockPos pos) + { + return worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); + } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 7b485ac41..069c7b06c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -77,7 +77,7 @@ public class GuiIndustrialTurbine extends GuiMekanism double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 511179fdd..b1968f619 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -41,7 +41,7 @@ public class GuiReactorController extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 53e8b53a6..19b330a31 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -53,7 +53,7 @@ public class GuiReactorFuel extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 4fe494ec4..8dbd7e168 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -58,7 +58,7 @@ public class GuiReactorHeat extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index a538404d3..22a12cfb8 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -45,7 +45,7 @@ public class GuiReactorStats extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 3692534e6..3f77222e0 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -56,7 +56,7 @@ public class GuiSolarGenerator extends GuiMekanism fontRendererObj.drawString(tileEntity.getName(), !tileEntity.fullName.contains("Advanced") ? 45 : 30, 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index 961249ae9..c7a69b862 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -41,7 +41,7 @@ public class GuiTurbineStats extends GuiMekanism double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index d4a10d34e..83222dafc 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -58,7 +58,7 @@ public class GuiWindGenerator extends GuiMekanism { fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.currentMultiplier)), 51, 35, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index af3d46d50..70e8fe0f3 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -1,6 +1,7 @@ package mekanism.generators.common; import mekanism.common.item.ItemMekanism; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; @@ -20,7 +21,7 @@ public class GeneratorsItems @Override public boolean doesSneakBypassUse(ItemStack stack, IBlockAccess world, BlockPos pos, EntityPlayer player) { - return world.getTileEntity(pos) instanceof TileEntityTurbineRotor; + return MekanismUtils.getTileEntitySafe(world, pos) instanceof TileEntityTurbineRotor; } }; diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index b06fb7bc0..0620e12a0 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.io.IOException; +import mekanism.api.MekanismAPI; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.infuse.InfuseRegistry; @@ -275,4 +276,12 @@ public class MekanismGenerators implements IModule TypeConfigManager.updateConfigRecipes(GeneratorType.getGeneratorsForConfig(), generators.generatorsManager); } } + + @SubscribeEvent + public void onBlacklistUpdate(MekanismAPI.BoxBlacklistEvent event) + { + // Mekanism Generators multiblock structures + MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 5); // Advanced Solar Generator + MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 6); // Wind Generator + } } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 03976ab9a..a02c398a5 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -169,7 +169,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null) { @@ -254,7 +254,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock { if(client.enableAmbientLighting) { - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity instanceof IActiveState && !(tileEntity instanceof TileEntitySolarGenerator)) { diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 00d86b305..dea26a93b 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -75,7 +75,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityReactorController) { @@ -293,7 +293,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti @Override public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile instanceof TileEntityReactorLogicAdapter) { diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 096990f2b..7c5f5b54f 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -140,7 +140,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } } - list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack))); if(hasTank(itemstack)) {