From 5fdc677926b9157dfc95a0480f0d79458a88ce16 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 23 May 2016 18:51:08 -0400 Subject: [PATCH 1/4] Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction --- .../common/base/EnergyAcceptorWrapper.java | 12 +++++++++--- .../common/tile/TileEntityAdvancedFactory.java | 3 +++ .../common/tile/TileEntityBoilerValve.java | 14 +++++++------- .../common/tile/TileEntityEliteFactory.java | 3 +++ src/main/java/mekanism/common/util/CableUtils.java | 5 +++-- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 853fbbfa1..b8059e239 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -103,7 +103,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double transferEnergyToAcceptor(ForgeDirection side, double amount) { - int needed = acceptor.getMaxEnergyStored(side)-acceptor.getEnergyStored(side); + int needed = Math.min(acceptor.getMaxEnergyStored(side)-acceptor.getEnergyStored(side), Integer.MAX_VALUE); int transferred = acceptor.receiveEnergy(side, Math.min(needed, toRF(amount)), false); return fromRF(transferred); @@ -138,7 +138,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public boolean needsEnergy(ForgeDirection side) { - return acceptor.receiveEnergy(side, 1, true) > 0; + return acceptor.receiveEnergy(side, 1, true) > 0 || getEnergyNeeded(side) > 0; } public int toRF(double joules) @@ -150,6 +150,11 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { return rf * general.FROM_TE; } + + public int getEnergyNeeded(ForgeDirection side) + { + return acceptor.getMaxEnergyStored(side) - acceptor.getEnergyStored(side); + } } public static class IC2Acceptor extends EnergyAcceptorWrapper @@ -164,7 +169,8 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double transferEnergyToAcceptor(ForgeDirection side, double amount) { - return amount - fromEU(acceptor.injectEnergy(side, Math.min(acceptor.getDemandedEnergy(), toEU(amount)), 0)); + double toTransfer = Math.min(Math.min(acceptor.getDemandedEnergy(), toEU(amount)), Integer.MAX_VALUE); + return amount - fromEU(acceptor.injectEnergy(side, toTransfer, 0)); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java index ce894bc39..fe5b0ee39 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; +import mekanism.common.Upgrade; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.tile.component.TileComponentConfig; @@ -33,6 +34,8 @@ public class TileEntityAdvancedFactory extends TileEntityFactory configComponent.setInputConfig(TransmissionType.ENERGY); upgradeComponent = new TileComponentUpgrade(this, 0); + upgradeComponent.setSupported(Upgrade.MUFFLING); + ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java index aed92b032..0ab2b12b0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java @@ -32,7 +32,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl if(!worldObj.isRemote) { - if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord-1) { if(structure.steamStored != null && structure.steamStored.amount > 0) { @@ -63,7 +63,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - if(structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + if(structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord-1) { return new FluidTankInfo[] {steamTank.getInfo()}; } @@ -78,7 +78,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(structure != null && structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord-1) { return waterTank.fill(resource, doFill); } @@ -89,7 +89,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord-1) { if(structure.steamStored != null) { @@ -106,7 +106,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord-1) { return steamTank.drain(maxDrain, doDrain); } @@ -119,7 +119,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord; + return structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord-1; } return false; @@ -130,7 +130,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord; + return structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord-1; } return false; diff --git a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java index 38be32721..25acd9bea 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; +import mekanism.common.Upgrade; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.tile.component.TileComponentConfig; @@ -33,6 +34,8 @@ public class TileEntityEliteFactory extends TileEntityFactory configComponent.setInputConfig(TransmissionType.ENERGY); upgradeComponent = new TileComponentUpgrade(this, 0); + upgradeComponent.setSupported(Upgrade.MUFFLING); + ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index e305f60b0..9e8af6cd4 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -241,7 +241,8 @@ public final class CableUtils if(handler.canConnectEnergy(side.getOpposite())) { - int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(currentSending*general.TO_TE), false); + int toSend = Math.min((int)Math.round(currentSending*general.TO_TE), Integer.MAX_VALUE); + int used = handler.receiveEnergy(side.getOpposite(), toSend, false); sent += used*general.FROM_TE; } } @@ -250,7 +251,7 @@ public final class CableUtils if(((IEnergySink)tileEntity).acceptsEnergyFrom((TileEntity)from, side.getOpposite())) { double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)tileEntity).getSinkTier())*general.FROM_IC2); - toSend = Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2); + toSend = Math.min(Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2), Integer.MAX_VALUE); sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2)); } } From 38490db21dd267781ff38c5d3186f13ef5f4e5fe Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 28 May 2016 02:01:21 -0400 Subject: [PATCH 2/4] Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes --- src/main/java/mekanism/api/MekanismConfig.java | 2 +- src/main/java/mekanism/common/CommonProxy.java | 2 +- src/main/java/mekanism/common/block/BlockMachine.java | 5 +++++ .../java/mekanism/common/tile/TileEntityPersonalChest.java | 2 +- .../generators/client/render/RenderIndustrialTurbine.java | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 1e4c5a5c7..8eb2870c2 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -64,7 +64,7 @@ public class MekanismConfig public static double energyPerHeat = 1000; public static double maxEnergyPerSteam = 100; public static double superheatingHeatTransfer = 10000; - public static double heatPerFuelTick = 1; + public static double heatPerFuelTick = 4; } public static class client diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 4664ad06c..f0d6a066a 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -296,7 +296,7 @@ public class CommonProxy implements IGuiProvider general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble(); general.maxEnergyPerSteam = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D).getDouble(); general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble(); - general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 1D).getDouble(); + general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index aacf4298a..a40e30e03 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1080,6 +1080,11 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { MachineType type = MachineType.get(blockType, world.getBlockMetadata(x, y, z)); + + if(type == null) + { + return; + } switch(type) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index 26b7f77b0..4ce381b37 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -84,7 +84,7 @@ public class TileEntityPersonalChest extends TileEntityContainerBlock implements else { if(INV == null) { - INV = new int[55]; + INV = new int[54]; for(int i = 0; i < INV.length; i++) { diff --git a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java index 4f13cde8b..ae96b19f8 100644 --- a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java @@ -40,7 +40,7 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityTurbineCasing tileEntity, double x, double y, double z, float partialTick) { - if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null) + if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.complex != null) { RenderTurbineRotor.internalRender = true; Coord4D coord = tileEntity.structure.complex; From 02d2aa1550415f23f122040b3d081465f4c04911 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 28 May 2016 02:02:31 -0400 Subject: [PATCH 3/4] Bump version to 9.0.2 --- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 ++-- .../java/mekanism/generators/common/MekanismGenerators.java | 4 ++-- src/main/java/mekanism/tools/common/MekanismTools.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index 1ae7a9b8f..3f05658fc 100644 --- a/build.properties +++ b/build.properties @@ -4,4 +4,4 @@ FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=9.0.1 +mod_version=9.0.2 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index acb34290f..78fae24c2 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -142,7 +142,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.2", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -168,7 +168,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 0, 1); + public static Version versionNumber = new Version(9, 0, 2); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index a7b601a66..a283661a3 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -43,7 +43,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.2", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") @@ -53,7 +53,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(9, 0, 1); + public static Version versionNumber = new Version(9, 0, 2); public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index c3f69ddf0..3e6a82efb 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -29,7 +29,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.2", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -39,7 +39,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(9, 0, 1); + public static Version versionNumber = new Version(9, 0, 2); //Enums: Tools public static ToolMaterial toolOBSIDIAN; From 985e5afbfcbf3b36f8db2b0d807f23971d8f89dd Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 28 May 2016 02:24:50 -0400 Subject: [PATCH 4/4] Fixed Turbines unable to be formed in other dimensions --- src/main/java/mekanism/api/Chunk3D.java | 4 ++-- src/main/java/mekanism/common/LaserManager.java | 2 +- .../mekanism/common/content/boiler/BoilerUpdateProtocol.java | 2 +- src/main/java/mekanism/common/entity/EntityFlame.java | 2 +- .../java/mekanism/common/tile/TileEntityDigitalMiner.java | 2 +- src/main/java/mekanism/common/tile/TileEntityLaser.java | 4 ++-- .../java/mekanism/common/tile/TileEntityLaserAmplifier.java | 4 ++-- .../java/mekanism/common/tile/TileEntityLaserTractorBeam.java | 4 ++-- src/main/java/mekanism/common/util/MekanismUtils.java | 2 +- .../common/content/turbine/TurbineUpdateProtocol.java | 2 +- .../common/tile/TileEntityAdvancedSolarGenerator.java | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/mekanism/api/Chunk3D.java b/src/main/java/mekanism/api/Chunk3D.java index f469d5db5..28a0949d3 100644 --- a/src/main/java/mekanism/api/Chunk3D.java +++ b/src/main/java/mekanism/api/Chunk3D.java @@ -86,9 +86,9 @@ public class Chunk3D } @Override - public Coord4D clone() + public Chunk3D clone() { - return new Coord4D(xCoord, zCoord, dimensionId); + return new Chunk3D(xCoord, zCoord, dimensionId); } @Override diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 77b3b4b39..3f8b06c91 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -36,7 +36,7 @@ public class LaserManager if(mop != null) { to = new Pos3D(mop.hitVec); - Coord4D toCoord = new Coord4D(mop.blockX, mop.blockY, mop.blockZ); + Coord4D toCoord = new Coord4D(mop.blockX, mop.blockY, mop.blockZ, world.provider.dimensionId); TileEntity tile = toCoord.getTileEntity(world); if(tile instanceof ILaserReceptor) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index d2440063f..f7f018faa 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -169,7 +169,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol int steamHeight = (structure.renderLocation.yCoord+structure.volHeight-2)-initDisperser.yCoord; structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; - structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord); + structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord, pointer.getWorldObj().provider.dimensionId); return true; } diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 699da0778..ac5aeeea6 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -189,7 +189,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData if(general.aestheticWorldDamage && !fluid && (sideCoord.isAirBlock(worldObj) || sideCoord.isReplaceable(worldObj))) { - if(mode != ItemFlamethrower.FlamethrowerMode.COMBAT && !smeltBlock(new Coord4D(mop.blockX, mop.blockY, mop.blockZ))) + if(mode != ItemFlamethrower.FlamethrowerMode.COMBAT && !smeltBlock(new Coord4D(mop.blockX, mop.blockY, mop.blockZ, worldObj.provider.dimensionId))) { if(mode == ItemFlamethrower.FlamethrowerMode.INFERNO && !worldObj.isRemote) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index b45ffbcf9..0010f168a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1127,7 +1127,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I continue; } - MekanismUtils.makeAdvancedBoundingBlock(worldObj, new Coord4D(x, y, z), Coord4D.get(this)); + MekanismUtils.makeAdvancedBoundingBlock(worldObj, new Coord4D(x, y, z, worldObj.provider.dimensionId), Coord4D.get(this)); worldObj.func_147453_f(x, y, z, getBlockType()); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 4c422c295..52f44b84c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -48,7 +48,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc if(isActive) { MovingObjectPosition mop = LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), usage.laserUsage, worldObj); - Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); + Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ, worldObj.provider.dimensionId); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -80,7 +80,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc setActive(true); LaserInfo info = LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), usage.laserUsage, worldObj); - Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ); + Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ, worldObj.provider.dimensionId); if(hitCoord == null || !hitCoord.equals(digging)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 4c1a33e01..4ef9fc5ee 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -74,7 +74,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement if(on) { MovingObjectPosition mop = LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), lastFired, worldObj); - Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); + Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ, worldObj.provider.dimensionId); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -126,7 +126,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } LaserInfo info = LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), firing, worldObj); - Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ); + Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ, worldObj.provider.dimensionId); if(hitCoord == null || !hitCoord.equals(digging)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 45c679709..04c49ee59 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -64,7 +64,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme if(on) { MovingObjectPosition mop = LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), lastFired, worldObj); - Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); + Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ, worldObj.provider.dimensionId); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -103,7 +103,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } LaserInfo info = LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), firing, worldObj); - Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ); + Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ, worldObj.provider.dimensionId); if(hitCoord == null || !hitCoord.equals(digging)) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index ccb9c29d9..7540d655c 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -854,7 +854,7 @@ public final class MekanismUtils */ public static void updateBlock(World world, int x, int y, int z) { - Coord4D pos = new Coord4D(x, y, z); + Coord4D pos = new Coord4D(x, y, z, world.provider.dimensionId); if(!(pos.getTileEntity(world) instanceof IActiveState) || ((IActiveState)pos.getTileEntity(world)).renderUpdate()) { world.func_147479_m(pos.xCoord, pos.yCoord, pos.zCoord); diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index e2707ac7e..85910ea3f 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -129,7 +129,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol