From b97f3c433f5159e77c2264a18113beb4f0f55f3a Mon Sep 17 00:00:00 2001 From: pupnewfster Date: Sun, 7 Jul 2019 15:45:29 -0400 Subject: [PATCH] Change TileEntityBasicBlock#canSetFacing and setFacing to use EnumFacing instead of an int --- .../particle/MekanismParticleHelper.java | 41 +++++++++---------- .../mekanism/common/block/BlockBasic.java | 33 ++++++++------- .../common/block/BlockEnergyCube.java | 30 +++++++------- .../mekanism/common/block/BlockGasTank.java | 21 +++++----- .../mekanism/common/block/BlockMachine.java | 41 +++++++++---------- .../mekanism/common/tile/TileEntityBin.java | 4 +- .../common/tile/TileEntityChargepad.java | 4 +- .../tile/TileEntityChemicalCrystallizer.java | 4 +- .../TileEntityChemicalDissolutionChamber.java | 4 +- .../tile/TileEntityChemicalInfuser.java | 4 +- .../tile/TileEntityChemicalOxidizer.java | 4 +- .../common/tile/TileEntityChemicalWasher.java | 4 +- .../common/tile/TileEntityDigitalMiner.java | 4 +- .../common/tile/TileEntityElectricPump.java | 4 +- .../tile/TileEntityElectrolyticSeparator.java | 4 +- .../common/tile/TileEntityEnergyCube.java | 2 +- .../common/tile/TileEntityFactory.java | 4 +- .../common/tile/TileEntityFluidTank.java | 2 +- .../tile/TileEntityFluidicPlenisher.java | 4 +- .../TileEntityFormulaicAssemblicator.java | 4 +- .../common/tile/TileEntityFuelwoodHeater.java | 4 +- .../common/tile/TileEntityGasTank.java | 4 +- .../tile/TileEntityLogisticalSorter.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 4 +- .../tile/TileEntityOredictionificator.java | 4 +- .../common/tile/TileEntityPersonalChest.java | 4 +- .../tile/TileEntityResistiveHeater.java | 4 +- .../tile/TileEntitySeismicVibrator.java | 4 +- .../tile/TileEntitySolarNeutronActivator.java | 4 +- ...ileEntityThermalEvaporationController.java | 4 +- .../tile/prefab/TileEntityBasicBlock.java | 8 ++-- .../common/tile/prefab/TileEntityMachine.java | 5 ++- .../common/block/BlockGenerator.java | 38 ++++++++--------- .../common/tile/TileEntityBioGenerator.java | 4 +- .../common/tile/TileEntityGenerator.java | 4 +- .../common/tile/TileEntitySolarGenerator.java | 4 +- 36 files changed, 160 insertions(+), 163 deletions(-) diff --git a/src/main/java/mekanism/client/render/particle/MekanismParticleHelper.java b/src/main/java/mekanism/client/render/particle/MekanismParticleHelper.java index a2c1abdc4..234505212 100644 --- a/src/main/java/mekanism/client/render/particle/MekanismParticleHelper.java +++ b/src/main/java/mekanism/client/render/particle/MekanismParticleHelper.java @@ -54,28 +54,25 @@ public class MekanismParticleHelper { double particleY = (double) blockY + world.rand.nextDouble() * (axisalignedbb.maxY - axisalignedbb.minY - OFFSET_1) + OFFSET_2 + axisalignedbb.minY; double particleZ = (double) blockZ + world.rand.nextDouble() * (axisalignedbb.maxZ - axisalignedbb.minZ - OFFSET_1) + OFFSET_2 + axisalignedbb.minZ; - if (side == EnumFacing.DOWN) { - particleY = (double) blockY + axisalignedbb.minY - OFFSET_2; - } - - if (side == EnumFacing.UP) { - particleY = (double) blockY + axisalignedbb.maxY + OFFSET_2; - } - - if (side == EnumFacing.NORTH) { - particleZ = (double) blockZ + axisalignedbb.minZ - OFFSET_2; - } - - if (side == EnumFacing.SOUTH) { - particleZ = (double) blockZ + axisalignedbb.maxZ + OFFSET_2; - } - - if (side == EnumFacing.WEST) { - particleX = (double) blockX + axisalignedbb.minX - OFFSET_2; - } - - if (side == EnumFacing.EAST) { - particleX = (double) blockX + axisalignedbb.maxX + OFFSET_2; + switch (side) { + case DOWN: + particleY = (double) blockY + axisalignedbb.minY - OFFSET_2; + break; + case UP: + particleY = (double) blockY + axisalignedbb.maxY + OFFSET_2; + break; + case NORTH: + particleZ = (double) blockZ + axisalignedbb.minZ - OFFSET_2; + break; + case SOUTH: + particleZ = (double) blockZ + axisalignedbb.maxZ + OFFSET_2; + break; + case WEST: + particleX = (double) blockX + axisalignedbb.minX - OFFSET_2; + break; + case EAST: + particleX = (double) blockX + axisalignedbb.maxX + OFFSET_2; + break; } manager.addEffect(new TieredParticleDigging(world, particleX, particleY, particleZ, 0, 0, 0, iblockstate, color) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 048b07334..10a465034 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -451,8 +451,7 @@ public abstract class BlockBasic extends BlockTileDrops { MekanismUtils.dismantleBlock(this, state, world, pos); return true; } - int change = bin.facing.rotateY().ordinal(); - bin.setFacing((short) change); + bin.setFacing(bin.facing.rotateY()); world.notifyNeighborsOfStateChange(pos, this, true); } return true; @@ -596,33 +595,33 @@ public abstract class BlockBasic extends BlockTileDrops { TileEntity te = world.getTileEntity(pos); if (te instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock) te; - int side = MathHelper.floor((placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int height = Math.round(placer.rotationPitch); - int change = 3; - if (tileEntity.canSetFacing(0) && tileEntity.canSetFacing(1)) { + EnumFacing change = EnumFacing.SOUTH; + if (tileEntity.canSetFacing(EnumFacing.DOWN) && tileEntity.canSetFacing(EnumFacing.UP)) { + int height = Math.round(placer.rotationPitch); if (height >= 65) { - change = 1; + change = EnumFacing.UP; } else if (height <= -65) { - change = 0; + change = EnumFacing.DOWN; } } - if (change != 0 && change != 1) { + if (change != EnumFacing.DOWN && change != EnumFacing.UP) { + int side = MathHelper.floor((placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; switch (side) { case 0: - change = 2; + change = EnumFacing.NORTH; break; case 1: - change = 5; + change = EnumFacing.EAST; break; case 2: - change = 3; + change = EnumFacing.SOUTH; break; case 3: - change = 4; + change = EnumFacing.WEST; break; } } - tileEntity.setFacing((short) change); + tileEntity.setFacing(change); tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; if (tileEntity instanceof TileEntitySecurityDesk) { @@ -703,7 +702,7 @@ public abstract class BlockBasic extends BlockTileDrops { if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; for (EnumFacing dir : EnumFacing.VALUES) { - if (basicTile.canSetFacing(dir.ordinal())) { + if (basicTile.canSetFacing(dir)) { valid[dir.ordinal()] = dir; } } @@ -716,8 +715,8 @@ public abstract class BlockBasic extends BlockTileDrops { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; - if (basicTile.canSetFacing(axis.ordinal())) { - basicTile.setFacing((short) axis.ordinal()); + if (basicTile.canSetFacing(axis)) { + basicTile.setFacing(axis); return true; } } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 18ca86336..8f167d7a0 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -105,31 +105,34 @@ public class BlockEnergyCube extends BlockMekanismContainer { @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock) world.getTileEntity(pos); - int side = MathHelper.floor((double) (placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + if (tileEntity == null) { + return; + } int height = Math.round(placer.rotationPitch); - int change = 3; + EnumFacing change = EnumFacing.SOUTH; if (height >= 65) { - change = 1; + change = EnumFacing.UP; } else if (height <= -65) { - change = 0; + change = EnumFacing.DOWN; } else { + int side = MathHelper.floor((double) (placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; switch (side) { case 0: - change = 2; + change = EnumFacing.NORTH; break; case 1: - change = 5; + change = EnumFacing.EAST; break; case 2: - change = 3; + change = EnumFacing.SOUTH; break; case 3: - change = 4; + change = EnumFacing.WEST; break; } } - tileEntity.setFacing((short) change); + tileEntity.setFacing(change); tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; } @@ -173,8 +176,7 @@ public class BlockEnergyCube extends BlockMekanismContainer { return true; } if (tileEntity != null) { - int change = tileEntity.facing.rotateAround(side.getAxis()).ordinal(); - tileEntity.setFacing((short) change); + tileEntity.setFacing(tileEntity.facing.rotateAround(side.getAxis())); world.notifyNeighborsOfStateChange(pos, this, true); } } else { @@ -273,7 +275,7 @@ public class BlockEnergyCube extends BlockMekanismContainer { if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; for (EnumFacing dir : EnumFacing.VALUES) { - if (basicTile.canSetFacing(dir.ordinal())) { + if (basicTile.canSetFacing(dir)) { valid[dir.ordinal()] = dir; } } @@ -286,8 +288,8 @@ public class BlockEnergyCube extends BlockMekanismContainer { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; - if (basicTile.canSetFacing(axis.ordinal())) { - basicTile.setFacing((short) axis.ordinal()); + if (basicTile.canSetFacing(axis)) { + basicTile.setFacing(axis); return true; } } diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 5ea50be83..d9d2c681b 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -88,23 +88,23 @@ public class BlockGasTank extends BlockMekanismContainer { @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock) world.getTileEntity(pos); + EnumFacing change = EnumFacing.SOUTH; int side = MathHelper.floor((double) (placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int change = 3; switch (side) { case 0: - change = 2; + change = EnumFacing.NORTH; break; case 1: - change = 5; + change = EnumFacing.EAST; break; case 2: - change = 3; + change = EnumFacing.SOUTH; break; case 3: - change = 4; + change = EnumFacing.WEST; break; } - tileEntity.setFacing((short) change); + tileEntity.setFacing(change); tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; } @@ -145,8 +145,7 @@ public class BlockGasTank extends BlockMekanismContainer { return true; } if (tileEntity != null) { - int change = tileEntity.facing.rotateY().ordinal(); - tileEntity.setFacing((short) change); + tileEntity.setFacing(tileEntity.facing.rotateY()); world.notifyNeighborsOfStateChange(pos, this, true); } } else { @@ -243,7 +242,7 @@ public class BlockGasTank extends BlockMekanismContainer { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; for (EnumFacing dir : EnumFacing.VALUES) { - if (basicTile.canSetFacing(dir.ordinal())) { + if (basicTile.canSetFacing(dir)) { valid[dir.ordinal()] = dir; } } @@ -257,8 +256,8 @@ public class BlockGasTank extends BlockMekanismContainer { if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; - if (basicTile.canSetFacing(axis.ordinal())) { - basicTile.setFacing((short) axis.ordinal()); + if (basicTile.canSetFacing(axis)) { + basicTile.setFacing(axis); return true; } } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 5e61e1ff7..8e838b14c 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -166,40 +166,39 @@ public abstract class BlockMachine extends BlockMekanismContainer { @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock) world.getTileEntity(pos); - int side = MathHelper.floor((placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int height = Math.round(placer.rotationPitch); - int change = 3; - if (tileEntity == null) { return; } - if (tileEntity.canSetFacing(0) && tileEntity.canSetFacing(1)) { + EnumFacing change = EnumFacing.SOUTH; + if (tileEntity.canSetFacing(EnumFacing.DOWN) && tileEntity.canSetFacing(EnumFacing.UP)) { + int height = Math.round(placer.rotationPitch); if (height >= 65) { - change = 1; + change = EnumFacing.UP; } else if (height <= -65) { - change = 0; + change = EnumFacing.DOWN; } } - if (change != 0 && change != 1) { + if (change != EnumFacing.DOWN && change != EnumFacing.UP) { + int side = MathHelper.floor((placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; switch (side) { case 0: - change = 2; + change = EnumFacing.NORTH; break; case 1: - change = 5; + change = EnumFacing.EAST; break; case 2: - change = 3; + change = EnumFacing.SOUTH; break; case 3: - change = 4; + change = EnumFacing.WEST; break; } } - tileEntity.setFacing((short) change); + tileEntity.setFacing(change); tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; if (tileEntity instanceof TileEntityLogisticalSorter) { @@ -208,7 +207,7 @@ public abstract class BlockMachine extends BlockMekanismContainer { for (EnumFacing dir : EnumFacing.VALUES) { TileEntity tile = Coord4D.get(transporter).offset(dir).getTileEntity(world); if (InventoryUtils.isItemHandler(tile, dir)) { - tileEntity.setFacing((short) dir.getOpposite().ordinal()); + tileEntity.setFacing(dir.getOpposite()); break; } } @@ -338,19 +337,19 @@ public abstract class BlockMachine extends BlockMekanismContainer { return true; } if (tileEntity != null) { - int change = tileEntity.facing.rotateY().ordinal(); + EnumFacing change = tileEntity.facing.rotateY(); if (tileEntity instanceof TileEntityLogisticalSorter) { if (!((TileEntityLogisticalSorter) tileEntity).hasInventory()) { for (EnumFacing dir : EnumFacing.VALUES) { TileEntity tile = Coord4D.get(tileEntity).offset(dir).getTileEntity(world); if (InventoryUtils.isItemHandler(tile, dir)) { - change = dir.getOpposite().ordinal(); + change = dir.getOpposite(); break; } } } } - tileEntity.setFacing((short) change); + tileEntity.setFacing(change); world.notifyNeighborsOfStateChange(pos, this, true); } } else { @@ -578,7 +577,7 @@ public abstract class BlockMachine extends BlockMekanismContainer { for (EnumFacing dir : EnumFacing.VALUES) { TileEntity tile = Coord4D.get(tileEntity).offset(dir).getTileEntity(world); if (InventoryUtils.isItemHandler(tile, dir)) { - sorter.setFacing((short) dir.getOpposite().ordinal()); + sorter.setFacing(dir.getOpposite()); return; } } @@ -756,7 +755,7 @@ public abstract class BlockMachine extends BlockMekanismContainer { if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; for (EnumFacing dir : EnumFacing.VALUES) { - if (basicTile.canSetFacing(dir.ordinal())) { + if (basicTile.canSetFacing(dir)) { valid[dir.ordinal()] = dir; } } @@ -769,8 +768,8 @@ public abstract class BlockMachine extends BlockMekanismContainer { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; - if (basicTile.canSetFacing(axis.ordinal())) { - basicTile.setFacing((short) axis.ordinal()); + if (basicTile.canSetFacing(axis)) { + basicTile.setFacing(axis); return true; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index f1b5ed29d..12ea0e63d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -455,8 +455,8 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public boolean canSetFacing(int facing) { - return facing != 0 && facing != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 9973a9da6..0cb11134f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -145,8 +145,8 @@ public class TileEntityChargepad extends TileEntityEffectsBlock { } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index cc8454ccf..979b6e12d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -149,8 +149,8 @@ public class TileEntityChemicalCrystallizer extends TileEntityOperationalMachine } @Override - public boolean canSetFacing(int i) { - return i != 0 && i != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 76763a755..d8d80cde8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -200,8 +200,8 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl } @Override - public boolean canSetFacing(int i) { - return i != 0 && i != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 546289c13..635324e56 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -156,8 +156,8 @@ public class TileEntityChemicalInfuser extends TileEntityMachine implements IGas } @Override - public boolean canSetFacing(int i) { - return i != 0 && i != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } public GasTank getTank(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index ebb589b3a..b140a35ec 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -151,8 +151,8 @@ public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine imp } @Override - public boolean canSetFacing(int i) { - return i != 0 && i != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index fe33b0987..7291fb8f2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -170,8 +170,8 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public boolean canSetFacing(int i) { - return i != 0 && i != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } public GasTank getTank(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index df93eae58..484d53f39 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -848,8 +848,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index fa0b4a18a..2cb4a659e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -328,8 +328,8 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Nonnull diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index b1b072cbd..9ff2f0769 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -280,8 +280,8 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index b11639ca3..00d2b945a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -138,7 +138,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public boolean canSetFacing(int side) { + public boolean canSetFacing(@Nonnull EnumFacing facing) { return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 2d8d4b985..6d8b30ba6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -864,8 +864,8 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index ab46fcc79..b329d600b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -97,7 +97,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public boolean canSetFacing(int facing) { + public boolean canSetFacing(@Nonnull EnumFacing facing) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index f6cd07984..9508e424a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -292,8 +292,8 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Nonnull diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index e38b18709..3ab91d59f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -451,8 +451,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Nonnull diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 2aa9fa498..fb11c9587 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -150,8 +150,8 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Nonnull diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 3b37b4132..ef401bd7d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -291,8 +291,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 275392f10..0a5cd0bf9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -422,7 +422,7 @@ public class TileEntityLogisticalSorter extends TileEntityEffectsBlock implement } @Override - public boolean canSetFacing(int facing) { + public boolean canSetFacing(@Nonnull EnumFacing facing) { return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index cdcaaf825..9ac8b13fa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -319,8 +319,8 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 9175774db..3f89de4f1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -341,8 +341,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public boolean canSetFacing(int i) { - return i != 0 && i != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } public static class OredictionificatorFilter implements IFilter { diff --git a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index 62060bb5a..9ec25d8b3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -99,8 +99,8 @@ public class TileEntityPersonalChest extends TileEntityContainerBlock implements } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 865a340e7..9e9d272e0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -106,8 +106,8 @@ public class TileEntityResistiveHeater extends TileEntityEffectsBlock implements } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index f0a409ea3..ff2a1ba26 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -156,8 +156,8 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement } @Override - public boolean canSetFacing(int facing) { - return facing != 0 && facing != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index bbe3be8d7..376d9047c 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -184,8 +184,8 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im } @Override - public boolean canSetFacing(int i) { - return i != 0 && i != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 9ba6e9107..f02f7c036 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -489,8 +489,8 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva } @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index 897c2d1ea..c4360fa11 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -195,11 +195,11 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe return super.getCapability(capability, facing); } - public void setFacing(short direction) { + public void setFacing(@Nonnull EnumFacing direction) { if (canSetFacing(direction)) { - facing = EnumFacing.byIndex(direction); + facing = direction; } - if (!(facing == clientFacing || world.isRemote)) { + if (facing != clientFacing && !world.isRemote) { Mekanism.packetHandler.sendUpdatePacket(this); markDirty(); clientFacing = facing; @@ -213,7 +213,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe * * @return if the block's orientation can be changed */ - public boolean canSetFacing(int facing) { + public boolean canSetFacing(@Nonnull EnumFacing facing) { return true; } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java index 22432f3a7..45bf46ea9 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java @@ -13,6 +13,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.FMLCommonHandler; public abstract class TileEntityMachine extends TileEntityEffectsBlock implements IUpgradeTile, IRedstoneControl, ISecurityTile { @@ -40,8 +41,8 @@ public abstract class TileEntityMachine extends TileEntityEffectsBlock implement } @Override - public boolean canSetFacing(int facing) { - return facing != 0 && facing != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index a3ae08585..a97c03340 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -142,37 +142,38 @@ public abstract class BlockGenerator extends BlockMekanismContainer { @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entityliving, ItemStack itemstack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock) world.getTileEntity(pos); - - int side = MathHelper.floor((double) (entityliving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int height = Math.round(entityliving.rotationPitch); - int change = 3; - - if (tileEntity.canSetFacing(0) && tileEntity.canSetFacing(1)) { + if (tileEntity == null) { + return; + } + EnumFacing change = EnumFacing.SOUTH; + if (tileEntity.canSetFacing(EnumFacing.DOWN) && tileEntity.canSetFacing(EnumFacing.UP)) { + int height = Math.round(entityliving.rotationPitch); if (height >= 65) { - change = 1; + change = EnumFacing.UP; } else if (height <= -65) { - change = 0; + change = EnumFacing.DOWN; } } - if (change != 0 && change != 1) { + if (change != EnumFacing.DOWN && change != EnumFacing.UP) { + int side = MathHelper.floor((double) (entityliving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; switch (side) { case 0: - change = 2; + change = EnumFacing.NORTH; break; case 1: - change = 5; + change = EnumFacing.EAST; break; case 2: - change = 3; + change = EnumFacing.SOUTH; break; case 3: - change = 4; + change = EnumFacing.WEST; break; } } - tileEntity.setFacing((short) change); + tileEntity.setFacing(change); tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; if (tileEntity instanceof IBoundingBlock) { ((IBoundingBlock) tileEntity).onPlace(); @@ -319,8 +320,7 @@ public abstract class BlockGenerator extends BlockMekanismContainer { return true; } if (tileEntity != null) { - int change = tileEntity.facing.rotateY().ordinal(); - tileEntity.setFacing((short) change); + tileEntity.setFacing(tileEntity.facing.rotateY()); world.notifyNeighborsOfStateChange(pos, this, true); } } else { @@ -516,7 +516,7 @@ public abstract class BlockGenerator extends BlockMekanismContainer { if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; for (EnumFacing dir : EnumFacing.VALUES) { - if (basicTile.canSetFacing(dir.ordinal())) { + if (basicTile.canSetFacing(dir)) { valid[dir.ordinal()] = dir; } } @@ -529,8 +529,8 @@ public abstract class BlockGenerator extends BlockMekanismContainer { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock) tile; - if (basicTile.canSetFacing(axis.ordinal())) { - basicTile.setFacing((short) axis.ordinal()); + if (basicTile.canSetFacing(axis)) { + basicTile.setFacing(axis); return true; } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 717f3a924..12adea173 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -151,8 +151,8 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public boolean canSetFacing(int facing) { - return facing != 0 && facing != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 7d3e279b5..3b5e569f0 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -88,8 +88,8 @@ public abstract class TileEntityGenerator extends TileEntityEffectsBlock impleme public abstract boolean canOperate(); @Override - public boolean canSetFacing(int side) { - return side != 0 && side != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index efb51c873..a4e8b73cc 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -41,8 +41,8 @@ public class TileEntitySolarGenerator extends TileEntityGenerator { } @Override - public boolean canSetFacing(int facing) { - return facing != 0 && facing != 1; + public boolean canSetFacing(@Nonnull EnumFacing facing) { + return facing != EnumFacing.DOWN && facing != EnumFacing.UP; }