From 985e5afbfcbf3b36f8db2b0d807f23971d8f89dd Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 28 May 2016 02:24:50 -0400 Subject: [PATCH] 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