From 244220f78ceab2a48c56422ed315c4ab7a368891 Mon Sep 17 00:00:00 2001 From: Sen Date: Fri, 27 Jun 2025 21:16:54 +0200 Subject: [PATCH] remove block metadata functions --- common/src/main/java/common/block/Block.java | 4 -- .../common/block/artificial/BlockBed.java | 5 --- .../common/block/artificial/BlockCake.java | 8 ---- .../common/block/artificial/BlockDoor.java | 8 ---- .../block/artificial/BlockFenceGate.java | 8 ---- .../common/block/artificial/BlockHay.java | 20 ---------- .../common/block/artificial/BlockLadder.java | 15 -------- .../common/block/artificial/BlockPortal.java | 9 ----- .../block/artificial/BlockPortalFrame.java | 8 ---- .../block/artificial/BlockQuartzPillar.java | 18 --------- .../common/block/artificial/BlockSkull.java | 4 -- .../common/block/artificial/BlockSlab.java | 8 ---- .../common/block/artificial/BlockStairs.java | 10 ----- .../block/artificial/BlockTrapDoor.java | 8 ---- .../common/block/foliage/BlockCactus.java | 8 ---- .../java/common/block/foliage/BlockCocoa.java | 8 ---- .../java/common/block/foliage/BlockCrops.java | 8 ---- .../block/foliage/BlockDoublePlant.java | 8 ---- .../common/block/foliage/BlockFarmland.java | 8 ---- .../block/foliage/BlockHugeMushroom.java | 8 ---- .../common/block/foliage/BlockLeaves.java | 4 -- .../common/block/foliage/BlockLilyPad.java | 10 ----- .../java/common/block/foliage/BlockLog.java | 22 ----------- .../common/block/foliage/BlockPumpkin.java | 4 -- .../java/common/block/foliage/BlockReed.java | 8 ---- .../common/block/foliage/BlockSapling.java | 8 ---- .../java/common/block/foliage/BlockStem.java | 8 ---- .../java/common/block/foliage/BlockVine.java | 8 ---- .../java/common/block/foliage/BlockWart.java | 8 ---- .../java/common/block/liquid/BlockLiquid.java | 8 ---- .../java/common/block/natural/BlockFire.java | 8 ---- .../java/common/block/natural/BlockSnow.java | 8 ---- .../java/common/block/tech/BlockAnvil.java | 8 ---- .../common/block/tech/BlockBrewingStand.java | 15 -------- .../java/common/block/tech/BlockButton.java | 37 ------------------- .../java/common/block/tech/BlockCauldron.java | 8 ---- .../java/common/block/tech/BlockChest.java | 15 -------- .../block/tech/BlockDaylightDetector.java | 8 ---- .../common/block/tech/BlockDispenser.java | 8 ---- .../java/common/block/tech/BlockFurnace.java | 15 -------- .../java/common/block/tech/BlockHopper.java | 8 ---- .../java/common/block/tech/BlockLever.java | 8 ---- .../java/common/block/tech/BlockMachine.java | 4 -- .../common/block/tech/BlockPistonBase.java | 8 ---- .../common/block/tech/BlockPistonHead.java | 8 ---- .../common/block/tech/BlockPistonMoving.java | 8 ---- .../common/block/tech/BlockPressurePlate.java | 8 ---- .../tech/BlockPressurePlateWeighted.java | 8 ---- .../java/common/block/tech/BlockRail.java | 8 ---- .../common/block/tech/BlockRailDetector.java | 8 ---- .../common/block/tech/BlockRailPowered.java | 8 ---- .../block/tech/BlockRedstoneComparator.java | 8 ---- .../block/tech/BlockRedstoneRepeater.java | 8 ---- .../common/block/tech/BlockRedstoneWire.java | 8 ---- .../main/java/common/block/tech/BlockTNT.java | 8 ---- .../java/common/block/tech/BlockTorch.java | 33 ----------------- .../java/common/block/tech/BlockTripWire.java | 8 ---- .../common/block/tech/BlockTripWireHook.java | 8 ---- .../common/block/tech/BlockWarpChest.java | 15 -------- .../common/block/tile/BlockBannerHanging.java | 12 ------ .../block/tile/BlockBannerStanding.java | 5 --- .../common/block/tile/BlockStandingSign.java | 8 ---- .../java/common/block/tile/BlockWallSign.java | 15 -------- 63 files changed, 619 deletions(-) diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index e7e54576..badb531d 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -455,10 +455,6 @@ public class Block { return this.savedProps; } - public State getStateFromMeta(int meta) { - return this.getState(); - } - public State getActualState(State state, IWorldAccess worldIn, BlockPos pos) { return state; } diff --git a/common/src/main/java/common/block/artificial/BlockBed.java b/common/src/main/java/common/block/artificial/BlockBed.java index d2697694..dc7701c9 100755 --- a/common/src/main/java/common/block/artificial/BlockBed.java +++ b/common/src/main/java/common/block/artificial/BlockBed.java @@ -180,11 +180,6 @@ public class BlockBed extends Block implements Rotatable { // } // } - public State getStateFromMeta(int meta) { - return this.getState().withProperty(PART, (meta & 8) > 0 ? BlockBed.EnumPartType.HEAD : BlockBed.EnumPartType.FOOT) - .withProperty(FACING, Facing.getHorizontal(meta)); - } - protected Property[] getProperties() { return new Property[] {FACING, PART}; } diff --git a/common/src/main/java/common/block/artificial/BlockCake.java b/common/src/main/java/common/block/artificial/BlockCake.java index 2befa3dc..1bf677da 100755 --- a/common/src/main/java/common/block/artificial/BlockCake.java +++ b/common/src/main/java/common/block/artificial/BlockCake.java @@ -214,14 +214,6 @@ public class BlockCake extends Block return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(BITES, Integer.valueOf(meta > 6 ? 0 : meta)); - } - protected Property[] getProperties() { return new Property[] {BITES}; diff --git a/common/src/main/java/common/block/artificial/BlockDoor.java b/common/src/main/java/common/block/artificial/BlockDoor.java index 00e5b7af..4a49dc81 100755 --- a/common/src/main/java/common/block/artificial/BlockDoor.java +++ b/common/src/main/java/common/block/artificial/BlockDoor.java @@ -314,14 +314,6 @@ public class BlockDoor extends Block implements Rotatable return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return (meta & 8) > 0 ? this.getState().withProperty(HALF, BlockDoor.EnumDoorHalf.UPPER).withProperty(HINGE, (meta & 1) > 0 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT).withProperty(POWERED, Boolean.valueOf((meta & 2) > 0)) : this.getState().withProperty(HALF, BlockDoor.EnumDoorHalf.LOWER).withProperty(FACING, Facing.getHorizontal(meta & 3).rotateYCCW()).withProperty(OPEN, Boolean.valueOf((meta & 4) > 0)); - } - public static Facing getFacing(IBlockAccess worldIn, BlockPos pos) { return worldIn.getState(pos).getValue(FACING); diff --git a/common/src/main/java/common/block/artificial/BlockFenceGate.java b/common/src/main/java/common/block/artificial/BlockFenceGate.java index eae45f15..9bea0794 100755 --- a/common/src/main/java/common/block/artificial/BlockFenceGate.java +++ b/common/src/main/java/common/block/artificial/BlockFenceGate.java @@ -171,14 +171,6 @@ public class BlockFenceGate extends Block implements Rotatable return true; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)).withProperty(OPEN, Boolean.valueOf((meta & 4) != 0)).withProperty(POWERED, Boolean.valueOf((meta & 8) != 0)); - } - protected Property[] getProperties() { return new Property[] {FACING, OPEN, POWERED, IN_WALL}; diff --git a/common/src/main/java/common/block/artificial/BlockHay.java b/common/src/main/java/common/block/artificial/BlockHay.java index 55946e64..1f6ddacf 100755 --- a/common/src/main/java/common/block/artificial/BlockHay.java +++ b/common/src/main/java/common/block/artificial/BlockHay.java @@ -21,26 +21,6 @@ public class BlockHay extends BlockRotatedPillar this.setFlammable(60, 20); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - Facing.Axis enumfacing$axis = Facing.Axis.Y; - int i = meta & 12; - - if (i == 4) - { - enumfacing$axis = Facing.Axis.X; - } - else if (i == 8) - { - enumfacing$axis = Facing.Axis.Z; - } - - return this.getState().withProperty(AXIS, enumfacing$axis); - } - protected Property[] getProperties() { return new Property[] {AXIS}; diff --git a/common/src/main/java/common/block/artificial/BlockLadder.java b/common/src/main/java/common/block/artificial/BlockLadder.java index 65bea537..dc25b822 100755 --- a/common/src/main/java/common/block/artificial/BlockLadder.java +++ b/common/src/main/java/common/block/artificial/BlockLadder.java @@ -136,21 +136,6 @@ public class BlockLadder extends Block implements Rotatable return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - Facing enumfacing = Facing.getFront(meta); - - if (enumfacing.getAxis() == Facing.Axis.Y) - { - enumfacing = Facing.NORTH; - } - - return this.getState().withProperty(FACING, enumfacing); - } - protected Property[] getProperties() { return new Property[] {FACING}; diff --git a/common/src/main/java/common/block/artificial/BlockPortal.java b/common/src/main/java/common/block/artificial/BlockPortal.java index 1c6a8848..cbcacabf 100755 --- a/common/src/main/java/common/block/artificial/BlockPortal.java +++ b/common/src/main/java/common/block/artificial/BlockPortal.java @@ -259,15 +259,6 @@ public class BlockPortal extends Block return this.getRenderColor(worldIn.getState(pos)); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(AXIS, (meta & 8) == 8 ? Facing.Axis.Z : Facing.Axis.X) - .withProperty(DIM, meta & 7); - } - protected Property[] getProperties() { return new Property[] {AXIS, DIM}; diff --git a/common/src/main/java/common/block/artificial/BlockPortalFrame.java b/common/src/main/java/common/block/artificial/BlockPortalFrame.java index 7b4d8705..c59580c0 100755 --- a/common/src/main/java/common/block/artificial/BlockPortalFrame.java +++ b/common/src/main/java/common/block/artificial/BlockPortalFrame.java @@ -107,14 +107,6 @@ public class BlockPortalFrame extends Block implements Rotatable return ((Boolean)worldIn.getState(pos).getValue(ORB)).booleanValue() ? 15 : 0; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(ORB, Boolean.valueOf((meta & 4) != 0)).withProperty(FACING, Facing.getHorizontal(meta & 3)); - } - protected Property[] getProperties() { return new Property[] {FACING, ORB}; diff --git a/common/src/main/java/common/block/artificial/BlockQuartzPillar.java b/common/src/main/java/common/block/artificial/BlockQuartzPillar.java index b8ca8a2f..8a494719 100644 --- a/common/src/main/java/common/block/artificial/BlockQuartzPillar.java +++ b/common/src/main/java/common/block/artificial/BlockQuartzPillar.java @@ -33,24 +33,6 @@ public class BlockQuartzPillar extends BlockRotatedPillar { return this.getState().withProperty(AXIS, facing.getAxis()); } - - public State getStateFromMeta(int meta) - { - State state = this.getState(); - switch (meta & 3) - { - default: - state = state.withProperty(AXIS, Facing.Axis.Y); - break; - case 1: - state = state.withProperty(AXIS, Facing.Axis.X); - break; - case 2: - state = state.withProperty(AXIS, Facing.Axis.Z); - break; - } - return state; - } protected Property[] getProperties() { diff --git a/common/src/main/java/common/block/artificial/BlockSkull.java b/common/src/main/java/common/block/artificial/BlockSkull.java index 6b307822..df7a2152 100755 --- a/common/src/main/java/common/block/artificial/BlockSkull.java +++ b/common/src/main/java/common/block/artificial/BlockSkull.java @@ -34,10 +34,6 @@ public class BlockSkull extends Block implements Rotatable { return this.getState().withProperty(FACING, placer.getHorizontalFacing().getOpposite()); } - public State getStateFromMeta(int meta) { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)); - } - protected Property[] getProperties() { return new Property[] {FACING}; } diff --git a/common/src/main/java/common/block/artificial/BlockSlab.java b/common/src/main/java/common/block/artificial/BlockSlab.java index fbb0fd1c..be532f8e 100755 --- a/common/src/main/java/common/block/artificial/BlockSlab.java +++ b/common/src/main/java/common/block/artificial/BlockSlab.java @@ -55,14 +55,6 @@ public class BlockSlab extends Block implements Directional this.textureSide = side; SLABS.add(this); } - - public State getStateFromMeta(int meta) - { - meta = meta & 7; - return this.getState().withProperty(DOUBLE, meta >= 6).withProperty(SEAMLESS, meta == 7) - .withProperty(FACING, (meta == 0 || meta >= 6) ? Facing.DOWN : - (meta == 1 ? Facing.UP : Facing.getHorizontal(meta - 2))); - } protected Property[] getProperties() { diff --git a/common/src/main/java/common/block/artificial/BlockStairs.java b/common/src/main/java/common/block/artificial/BlockStairs.java index 73888e39..ea4f31ec 100755 --- a/common/src/main/java/common/block/artificial/BlockStairs.java +++ b/common/src/main/java/common/block/artificial/BlockStairs.java @@ -736,16 +736,6 @@ public class BlockStairs extends Block implements Rotatable return movingobjectposition1; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - State iblockstate = this.getState().withProperty(HALF, (meta & 4) > 0 ? BlockStairs.EnumHalf.TOP : BlockStairs.EnumHalf.BOTTOM); - iblockstate = iblockstate.withProperty(FACING, Facing.getFront(5 - (meta & 3))); - return iblockstate; - } - /** * Get the actual Block state of this Block at the given position. This applies properties not visible in the * metadata, such as fence connections. diff --git a/common/src/main/java/common/block/artificial/BlockTrapDoor.java b/common/src/main/java/common/block/artificial/BlockTrapDoor.java index ca8e72d0..4261eab8 100755 --- a/common/src/main/java/common/block/artificial/BlockTrapDoor.java +++ b/common/src/main/java/common/block/artificial/BlockTrapDoor.java @@ -257,14 +257,6 @@ public class BlockTrapDoor extends Block implements Rotatable return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, getFacing(meta)).withProperty(OPEN, Boolean.valueOf((meta & 4) != 0)).withProperty(HALF, (meta & 8) == 0 ? BlockTrapDoor.DoorHalf.BOTTOM : BlockTrapDoor.DoorHalf.TOP); - } - protected Property[] getProperties() { return new Property[] {FACING, OPEN, HALF}; diff --git a/common/src/main/java/common/block/foliage/BlockCactus.java b/common/src/main/java/common/block/foliage/BlockCactus.java index 268e767e..3613c652 100755 --- a/common/src/main/java/common/block/foliage/BlockCactus.java +++ b/common/src/main/java/common/block/foliage/BlockCactus.java @@ -145,14 +145,6 @@ public class BlockCactus extends Block return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(AGE, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {AGE}; diff --git a/common/src/main/java/common/block/foliage/BlockCocoa.java b/common/src/main/java/common/block/foliage/BlockCocoa.java index aee6d9d9..8d531f36 100755 --- a/common/src/main/java/common/block/foliage/BlockCocoa.java +++ b/common/src/main/java/common/block/foliage/BlockCocoa.java @@ -200,14 +200,6 @@ public class BlockCocoa extends Block implements Rotatable, IGrowable return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)).withProperty(AGE, Integer.valueOf((meta & 12) == 12 ? 0 : ((meta & 12) >> 2))); - } - protected Property[] getProperties() { return new Property[] {FACING, AGE}; diff --git a/common/src/main/java/common/block/foliage/BlockCrops.java b/common/src/main/java/common/block/foliage/BlockCrops.java index c0294da8..4157a0a6 100755 --- a/common/src/main/java/common/block/foliage/BlockCrops.java +++ b/common/src/main/java/common/block/foliage/BlockCrops.java @@ -202,14 +202,6 @@ public class BlockCrops extends BlockBush implements IGrowable this.grow(worldIn, pos, state); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(AGE, Integer.valueOf(meta > 7 ? 0 : meta)); - } - protected Property[] getProperties() { return new Property[] {AGE}; diff --git a/common/src/main/java/common/block/foliage/BlockDoublePlant.java b/common/src/main/java/common/block/foliage/BlockDoublePlant.java index d92b04a0..322ebd45 100755 --- a/common/src/main/java/common/block/foliage/BlockDoublePlant.java +++ b/common/src/main/java/common/block/foliage/BlockDoublePlant.java @@ -256,14 +256,6 @@ public class BlockDoublePlant extends BlockBush implements IGrowable spawnAsEntity(worldIn, pos, new ItemStack(this.getItem())); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return (meta & 8) > 0 ? this.getState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.UPPER) : this.getState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER); - } - protected Property[] getProperties() { return new Property[] {HALF}; diff --git a/common/src/main/java/common/block/foliage/BlockFarmland.java b/common/src/main/java/common/block/foliage/BlockFarmland.java index a10af9f7..4552ccc2 100755 --- a/common/src/main/java/common/block/foliage/BlockFarmland.java +++ b/common/src/main/java/common/block/foliage/BlockFarmland.java @@ -156,14 +156,6 @@ public class BlockFarmland extends Block return Items.dirt; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(MOISTURE, Integer.valueOf(meta & 7)); - } - protected Property[] getProperties() { return new Property[] {MOISTURE}; diff --git a/common/src/main/java/common/block/foliage/BlockHugeMushroom.java b/common/src/main/java/common/block/foliage/BlockHugeMushroom.java index bb8c78e1..4db30b67 100755 --- a/common/src/main/java/common/block/foliage/BlockHugeMushroom.java +++ b/common/src/main/java/common/block/foliage/BlockHugeMushroom.java @@ -79,14 +79,6 @@ public class BlockHugeMushroom extends Block return this.getState(); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(VARIANT, BlockHugeMushroom.EnumType.byMetadata(meta)); - } - protected Property[] getProperties() { return new Property[] {VARIANT}; diff --git a/common/src/main/java/common/block/foliage/BlockLeaves.java b/common/src/main/java/common/block/foliage/BlockLeaves.java index 0c1cc2ff..7fec8c86 100755 --- a/common/src/main/java/common/block/foliage/BlockLeaves.java +++ b/common/src/main/java/common/block/foliage/BlockLeaves.java @@ -304,10 +304,6 @@ public class BlockLeaves extends BlockLeavesBase == null ? Colorizer.getFoliageColor(worldIn, pos) : this.type.getTintType().getColor()); } - public State getStateFromMeta(int meta) { - return this.getState().withProperty(DECAY, Boolean.valueOf((meta & 8) == 0)); - } - protected Property[] getProperties() { return new Property[] {DECAY}; } diff --git a/common/src/main/java/common/block/foliage/BlockLilyPad.java b/common/src/main/java/common/block/foliage/BlockLilyPad.java index 81a64ba6..a665d5a6 100755 --- a/common/src/main/java/common/block/foliage/BlockLilyPad.java +++ b/common/src/main/java/common/block/foliage/BlockLilyPad.java @@ -81,16 +81,6 @@ public class BlockLilyPad extends BlockBush implements Rotatable return false; } } - -// public int getMetaFromState(IBlockState state) -// { -// return 0; -// } - - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)); - } protected Property[] getProperties() { diff --git a/common/src/main/java/common/block/foliage/BlockLog.java b/common/src/main/java/common/block/foliage/BlockLog.java index aa16b972..eca7705e 100755 --- a/common/src/main/java/common/block/foliage/BlockLog.java +++ b/common/src/main/java/common/block/foliage/BlockLog.java @@ -66,28 +66,6 @@ public class BlockLog extends BlockRotatedPillar .e().rot(90); } } - - public State getStateFromMeta(int meta) - { - State state = this.getState(); - - switch (meta & 3) - { - default: - state = state.withProperty(AXIS, Facing.Axis.Y); - break; - - case 1: - state = state.withProperty(AXIS, Facing.Axis.X); - break; - - case 2: - state = state.withProperty(AXIS, Facing.Axis.Z); - break; - } - - return state; - } protected Property[] getProperties() { diff --git a/common/src/main/java/common/block/foliage/BlockPumpkin.java b/common/src/main/java/common/block/foliage/BlockPumpkin.java index d3b4c9be..74e0d570 100755 --- a/common/src/main/java/common/block/foliage/BlockPumpkin.java +++ b/common/src/main/java/common/block/foliage/BlockPumpkin.java @@ -29,10 +29,6 @@ public class BlockPumpkin extends Block implements Rotatable { return this.getState().withProperty(FACING, placer.getHorizontalFacing().getOpposite()); } - public State getStateFromMeta(int meta) { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)); - } - protected Property[] getProperties() { return new Property[] {FACING}; } diff --git a/common/src/main/java/common/block/foliage/BlockReed.java b/common/src/main/java/common/block/foliage/BlockReed.java index e791165b..191f7193 100755 --- a/common/src/main/java/common/block/foliage/BlockReed.java +++ b/common/src/main/java/common/block/foliage/BlockReed.java @@ -165,14 +165,6 @@ public class BlockReed extends Block return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(AGE, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {AGE}; diff --git a/common/src/main/java/common/block/foliage/BlockSapling.java b/common/src/main/java/common/block/foliage/BlockSapling.java index 7b082d6d..10f3cf17 100755 --- a/common/src/main/java/common/block/foliage/BlockSapling.java +++ b/common/src/main/java/common/block/foliage/BlockSapling.java @@ -114,14 +114,6 @@ public class BlockSapling extends BlockBush implements IGrowable this.grow(worldIn, pos, state, rand); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState() /* .withProperty(TYPE, BlockPlanks.EnumType.byMetadata(meta & 7)) */ .withProperty(STAGE, meta & 1); - } - protected Property[] getProperties() { return new Property[] {STAGE}; diff --git a/common/src/main/java/common/block/foliage/BlockStem.java b/common/src/main/java/common/block/foliage/BlockStem.java index 9e9d448d..50316ce5 100755 --- a/common/src/main/java/common/block/foliage/BlockStem.java +++ b/common/src/main/java/common/block/foliage/BlockStem.java @@ -213,14 +213,6 @@ public class BlockStem extends BlockBush implements DirectionalUp, IGrowable this.growStem(worldIn, pos, state); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(AGE, Integer.valueOf(meta > 7 ? 0 : meta)); - } - protected Property[] getProperties() { return new Property[] {AGE, FACING}; diff --git a/common/src/main/java/common/block/foliage/BlockVine.java b/common/src/main/java/common/block/foliage/BlockVine.java index 8904bd83..15f00556 100755 --- a/common/src/main/java/common/block/foliage/BlockVine.java +++ b/common/src/main/java/common/block/foliage/BlockVine.java @@ -441,14 +441,6 @@ public class BlockVine extends Block return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(SOUTH, Boolean.valueOf((meta & 1) > 0)).withProperty(WEST, Boolean.valueOf((meta & 2) > 0)).withProperty(NORTH, Boolean.valueOf((meta & 4) > 0)).withProperty(EAST, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {UP, NORTH, EAST, SOUTH, WEST}; diff --git a/common/src/main/java/common/block/foliage/BlockWart.java b/common/src/main/java/common/block/foliage/BlockWart.java index 144493fe..0a2fe850 100755 --- a/common/src/main/java/common/block/foliage/BlockWart.java +++ b/common/src/main/java/common/block/foliage/BlockWart.java @@ -108,14 +108,6 @@ public class BlockWart extends BlockBush return Items.soul_wart; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(AGE, Integer.valueOf(meta > 3 ? 0 : meta)); - } - protected Property[] getProperties() { return new Property[] {AGE}; diff --git a/common/src/main/java/common/block/liquid/BlockLiquid.java b/common/src/main/java/common/block/liquid/BlockLiquid.java index 5f1008e1..5b95adb5 100755 --- a/common/src/main/java/common/block/liquid/BlockLiquid.java +++ b/common/src/main/java/common/block/liquid/BlockLiquid.java @@ -378,14 +378,6 @@ public abstract class BlockLiquid extends Block } } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(LEVEL, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {LEVEL}; diff --git a/common/src/main/java/common/block/natural/BlockFire.java b/common/src/main/java/common/block/natural/BlockFire.java index 3de59193..f6c761a1 100755 --- a/common/src/main/java/common/block/natural/BlockFire.java +++ b/common/src/main/java/common/block/natural/BlockFire.java @@ -437,14 +437,6 @@ public class BlockFire extends Block return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(AGE, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {AGE, NORTH, EAST, SOUTH, WEST, UPPER, FLIP, ALT}; diff --git a/common/src/main/java/common/block/natural/BlockSnow.java b/common/src/main/java/common/block/natural/BlockSnow.java index b9c56207..5eeec18a 100755 --- a/common/src/main/java/common/block/natural/BlockSnow.java +++ b/common/src/main/java/common/block/natural/BlockSnow.java @@ -151,14 +151,6 @@ public class BlockSnow extends Block return side == Facing.UP ? true : super.shouldSideBeRendered(worldIn, pos, side); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(LAYERS, Integer.valueOf((meta & 7) + 1)); - } - /** * Whether this Block can be replaced directly by other blocks (true for e.g. tall grass) */ diff --git a/common/src/main/java/common/block/tech/BlockAnvil.java b/common/src/main/java/common/block/tech/BlockAnvil.java index e74bf4f3..cb82bd62 100755 --- a/common/src/main/java/common/block/tech/BlockAnvil.java +++ b/common/src/main/java/common/block/tech/BlockAnvil.java @@ -121,14 +121,6 @@ public class BlockAnvil extends BlockFalling implements Rotatable return this.getState().withProperty(FACING, Facing.SOUTH); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta & 3)); - } - protected Property[] getProperties() { return new Property[] {FACING}; diff --git a/common/src/main/java/common/block/tech/BlockBrewingStand.java b/common/src/main/java/common/block/tech/BlockBrewingStand.java index 5f034f20..2176b03b 100755 --- a/common/src/main/java/common/block/tech/BlockBrewingStand.java +++ b/common/src/main/java/common/block/tech/BlockBrewingStand.java @@ -501,21 +501,6 @@ public class BlockBrewingStand extends BlockContainer return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - State iblockstate = this.getState(); - - for (int i = 0; i < 3; ++i) - { - iblockstate = iblockstate.withProperty(HAS_BOTTLE[i], Boolean.valueOf((meta & 1 << i) > 0)); - } - - return iblockstate; - } - protected Property[] getProperties() { return new Property[] {HAS_BOTTLE[0], HAS_BOTTLE[1], HAS_BOTTLE[2]}; diff --git a/common/src/main/java/common/block/tech/BlockButton.java b/common/src/main/java/common/block/tech/BlockButton.java index c106c88b..91b6cc5f 100755 --- a/common/src/main/java/common/block/tech/BlockButton.java +++ b/common/src/main/java/common/block/tech/BlockButton.java @@ -316,43 +316,6 @@ public class BlockButton extends Block implements Directional worldIn.notifyNeighborsOfStateChange(pos.offset(facing.getOpposite()), this); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - Facing enumfacing; - - switch (meta & 7) - { - case 0: - enumfacing = Facing.DOWN; - break; - - case 1: - enumfacing = Facing.EAST; - break; - - case 2: - enumfacing = Facing.WEST; - break; - - case 3: - enumfacing = Facing.SOUTH; - break; - - case 4: - enumfacing = Facing.NORTH; - break; - - case 5: - default: - enumfacing = Facing.UP; - } - - return this.getState().withProperty(FACING, enumfacing).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {FACING, POWERED}; diff --git a/common/src/main/java/common/block/tech/BlockCauldron.java b/common/src/main/java/common/block/tech/BlockCauldron.java index 1d274257..fcd2dfe9 100755 --- a/common/src/main/java/common/block/tech/BlockCauldron.java +++ b/common/src/main/java/common/block/tech/BlockCauldron.java @@ -643,14 +643,6 @@ public class BlockCauldron extends Block return ((Integer)worldIn.getState(pos).getValue(LEVEL)).intValue(); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(LEVEL, Integer.valueOf(meta > 3 ? 0 : meta)); - } - protected Property[] getProperties() { return new Property[] {LEVEL}; diff --git a/common/src/main/java/common/block/tech/BlockChest.java b/common/src/main/java/common/block/tech/BlockChest.java index 43f3d33b..19f40489 100755 --- a/common/src/main/java/common/block/tech/BlockChest.java +++ b/common/src/main/java/common/block/tech/BlockChest.java @@ -604,21 +604,6 @@ public class BlockChest extends BlockContainer implements Rotatable return Container.calcRedstoneFromInventory(this.getLockableContainer(worldIn, pos)); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - Facing enumfacing = Facing.getFront(meta); - - if (enumfacing.getAxis() == Facing.Axis.Y) - { - enumfacing = Facing.NORTH; - } - - return this.getState().withProperty(FACING, enumfacing); - } - protected Property[] getProperties() { return new Property[] {FACING}; diff --git a/common/src/main/java/common/block/tech/BlockDaylightDetector.java b/common/src/main/java/common/block/tech/BlockDaylightDetector.java index 1a6e361f..eb84deda 100755 --- a/common/src/main/java/common/block/tech/BlockDaylightDetector.java +++ b/common/src/main/java/common/block/tech/BlockDaylightDetector.java @@ -156,14 +156,6 @@ public class BlockDaylightDetector extends BlockContainer return new TileEntityDaylightDetector(); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(POWER, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {POWER}; diff --git a/common/src/main/java/common/block/tech/BlockDispenser.java b/common/src/main/java/common/block/tech/BlockDispenser.java index ab5ea623..b526f5cc 100755 --- a/common/src/main/java/common/block/tech/BlockDispenser.java +++ b/common/src/main/java/common/block/tech/BlockDispenser.java @@ -274,14 +274,6 @@ public class BlockDispenser extends BlockContainer implements Directional return this.getState().withProperty(FACING, Facing.SOUTH); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, getFacing(meta)).withProperty(TRIGGERED, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {FACING, TRIGGERED}; diff --git a/common/src/main/java/common/block/tech/BlockFurnace.java b/common/src/main/java/common/block/tech/BlockFurnace.java index e69aef68..4fe9f887 100755 --- a/common/src/main/java/common/block/tech/BlockFurnace.java +++ b/common/src/main/java/common/block/tech/BlockFurnace.java @@ -247,21 +247,6 @@ public class BlockFurnace extends BlockContainer implements Rotatable return this.getState().withProperty(FACING, Facing.SOUTH); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - Facing enumfacing = Facing.getFront(meta); - - if (enumfacing.getAxis() == Facing.Axis.Y) - { - enumfacing = Facing.NORTH; - } - - return this.getState().withProperty(FACING, enumfacing); - } - protected Property[] getProperties() { return new Property[] {FACING}; diff --git a/common/src/main/java/common/block/tech/BlockHopper.java b/common/src/main/java/common/block/tech/BlockHopper.java index a6eaddf1..92105e84 100755 --- a/common/src/main/java/common/block/tech/BlockHopper.java +++ b/common/src/main/java/common/block/tech/BlockHopper.java @@ -271,14 +271,6 @@ public class BlockHopper extends BlockContainer implements DirectionalDown return BlockLayer.CUTOUT_MIPPED; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, getFacing(((meta & 7) == 1 || (meta & 7) > 5) ? 0 : meta)).withProperty(ENABLED, Boolean.valueOf(isEnabled(meta))); - } - protected Property[] getProperties() { return new Property[] {FACING, ENABLED}; diff --git a/common/src/main/java/common/block/tech/BlockLever.java b/common/src/main/java/common/block/tech/BlockLever.java index 00e9edc5..2af9312b 100755 --- a/common/src/main/java/common/block/tech/BlockLever.java +++ b/common/src/main/java/common/block/tech/BlockLever.java @@ -249,14 +249,6 @@ public class BlockLever extends Block return true; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, BlockLever.EnumOrientation.byMetadata(meta & 7)).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {FACING, POWERED}; diff --git a/common/src/main/java/common/block/tech/BlockMachine.java b/common/src/main/java/common/block/tech/BlockMachine.java index 339459bb..23760ed9 100755 --- a/common/src/main/java/common/block/tech/BlockMachine.java +++ b/common/src/main/java/common/block/tech/BlockMachine.java @@ -85,10 +85,6 @@ public abstract class BlockMachine extends Block implements Rotatable, ITileEnti return this.getState().withProperty(FACING, placer.getHorizontalFacing()); } - public State getStateFromMeta(int meta) { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)); - } - protected Property[] getProperties() { return new Property[] {FACING}; } diff --git a/common/src/main/java/common/block/tech/BlockPistonBase.java b/common/src/main/java/common/block/tech/BlockPistonBase.java index 7394de33..c8e40eb4 100755 --- a/common/src/main/java/common/block/tech/BlockPistonBase.java +++ b/common/src/main/java/common/block/tech/BlockPistonBase.java @@ -679,14 +679,6 @@ public class BlockPistonBase extends Block implements Directional return this.getState().withProperty(FACING, Facing.UP); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, getFacing(meta)).withProperty(EXTENDED, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {FACING, EXTENDED}; diff --git a/common/src/main/java/common/block/tech/BlockPistonHead.java b/common/src/main/java/common/block/tech/BlockPistonHead.java index 054580e4..add4e4b6 100755 --- a/common/src/main/java/common/block/tech/BlockPistonHead.java +++ b/common/src/main/java/common/block/tech/BlockPistonHead.java @@ -230,14 +230,6 @@ public class BlockPistonHead extends Block implements Directional return worldIn.getState(pos).getValue(TYPE) == BlockPistonHead.EnumPistonType.STICKY ? Items.sticky_piston : Items.piston; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, getFacing(meta)).withProperty(TYPE, (meta & 8) > 0 ? BlockPistonHead.EnumPistonType.STICKY : BlockPistonHead.EnumPistonType.DEFAULT); - } - protected Property[] getProperties() { return new Property[] {FACING, TYPE, SHORT}; diff --git a/common/src/main/java/common/block/tech/BlockPistonMoving.java b/common/src/main/java/common/block/tech/BlockPistonMoving.java index 479e42e6..558c7503 100755 --- a/common/src/main/java/common/block/tech/BlockPistonMoving.java +++ b/common/src/main/java/common/block/tech/BlockPistonMoving.java @@ -282,14 +282,6 @@ public class BlockPistonMoving extends BlockContainer return null; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, BlockPistonHead.getFacing(meta)).withProperty(TYPE, (meta & 8) > 0 ? BlockPistonHead.EnumPistonType.STICKY : BlockPistonHead.EnumPistonType.DEFAULT); - } - protected Property[] getProperties() { return new Property[] {FACING, TYPE}; diff --git a/common/src/main/java/common/block/tech/BlockPressurePlate.java b/common/src/main/java/common/block/tech/BlockPressurePlate.java index 2eb17df8..373077e0 100755 --- a/common/src/main/java/common/block/tech/BlockPressurePlate.java +++ b/common/src/main/java/common/block/tech/BlockPressurePlate.java @@ -67,14 +67,6 @@ public class BlockPressurePlate extends BlockBasePressurePlate return 0; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(POWERED, Boolean.valueOf(meta == 1)); - } - protected Property[] getProperties() { return new Property[] {POWERED}; diff --git a/common/src/main/java/common/block/tech/BlockPressurePlateWeighted.java b/common/src/main/java/common/block/tech/BlockPressurePlateWeighted.java index 64d5acf2..90009041 100755 --- a/common/src/main/java/common/block/tech/BlockPressurePlateWeighted.java +++ b/common/src/main/java/common/block/tech/BlockPressurePlateWeighted.java @@ -54,14 +54,6 @@ public class BlockPressurePlateWeighted extends BlockBasePressurePlate return 10; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(POWER, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {POWER}; diff --git a/common/src/main/java/common/block/tech/BlockRail.java b/common/src/main/java/common/block/tech/BlockRail.java index c5f77876..b7d42d5b 100755 --- a/common/src/main/java/common/block/tech/BlockRail.java +++ b/common/src/main/java/common/block/tech/BlockRail.java @@ -30,14 +30,6 @@ public class BlockRail extends BlockRailBase return SHAPE; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(SHAPE, BlockRailBase.EnumRailDirection.byMetadata(meta)); - } - protected Property[] getProperties() { return new Property[] {SHAPE}; diff --git a/common/src/main/java/common/block/tech/BlockRailDetector.java b/common/src/main/java/common/block/tech/BlockRailDetector.java index 126e33d6..e1e032d5 100755 --- a/common/src/main/java/common/block/tech/BlockRailDetector.java +++ b/common/src/main/java/common/block/tech/BlockRailDetector.java @@ -176,14 +176,6 @@ public class BlockRailDetector extends BlockRailBase return new BoundingBox((double)((float)pos.getX() + 0.2F), (double)pos.getY(), (double)((float)pos.getZ() + 0.2F), (double)((float)(pos.getX() + 1) - 0.2F), (double)((float)(pos.getY() + 1) - 0.2F), (double)((float)(pos.getZ() + 1) - 0.2F)); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(SHAPE, BlockRailBase.EnumRailDirection.byMetadata((meta & 7) > 5 ? 0 : (meta & 7))).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {SHAPE, POWERED}; diff --git a/common/src/main/java/common/block/tech/BlockRailPowered.java b/common/src/main/java/common/block/tech/BlockRailPowered.java index cc62294e..f8cc7adc 100755 --- a/common/src/main/java/common/block/tech/BlockRailPowered.java +++ b/common/src/main/java/common/block/tech/BlockRailPowered.java @@ -163,14 +163,6 @@ public class BlockRailPowered extends BlockRailBase return SHAPE; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(SHAPE, BlockRailBase.EnumRailDirection.byMetadata((meta & 7) > 5 ? 0 : (meta & 7))).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {SHAPE, POWERED}; diff --git a/common/src/main/java/common/block/tech/BlockRedstoneComparator.java b/common/src/main/java/common/block/tech/BlockRedstoneComparator.java index d45048ed..2650229c 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneComparator.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneComparator.java @@ -274,14 +274,6 @@ public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITile return new TileEntityComparator(); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)).withProperty(MODE, (meta & 4) > 0 ? BlockRedstoneComparator.Mode.SUBTRACT : BlockRedstoneComparator.Mode.COMPARE); - } - protected Property[] getProperties() { return new Property[] {FACING, MODE, POWERED}; diff --git a/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java b/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java index 0d83b6fe..f8783947 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java @@ -136,14 +136,6 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode this.notifyNeighbors(worldIn, pos, state); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta)).withProperty(LOCKED, Boolean.valueOf(false)).withProperty(DELAY, Integer.valueOf(1 + (meta >> 2))); - } - protected Property[] getProperties() { return new Property[] {FACING, DELAY, LOCKED}; diff --git a/common/src/main/java/common/block/tech/BlockRedstoneWire.java b/common/src/main/java/common/block/tech/BlockRedstoneWire.java index 7d4ec7d1..a977d246 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneWire.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneWire.java @@ -803,14 +803,6 @@ public class BlockRedstoneWire extends Block return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(POWER, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {NORTH, EAST, SOUTH, WEST, POWER}; diff --git a/common/src/main/java/common/block/tech/BlockTNT.java b/common/src/main/java/common/block/tech/BlockTNT.java index be3bff6a..b7d5cc51 100755 --- a/common/src/main/java/common/block/tech/BlockTNT.java +++ b/common/src/main/java/common/block/tech/BlockTNT.java @@ -158,14 +158,6 @@ public class BlockTNT extends Block return false; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(EXPLODE, Boolean.valueOf((meta & 1) > 0)); - } - protected Property[] getProperties() { return new Property[] {EXPLODE}; diff --git a/common/src/main/java/common/block/tech/BlockTorch.java b/common/src/main/java/common/block/tech/BlockTorch.java index 0af989df..6ae65af8 100755 --- a/common/src/main/java/common/block/tech/BlockTorch.java +++ b/common/src/main/java/common/block/tech/BlockTorch.java @@ -244,39 +244,6 @@ public class BlockTorch extends Block implements DirectionalUp return BlockLayer.CUTOUT; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - State iblockstate = this.getState(); - - switch (meta) - { - case 1: - iblockstate = iblockstate.withProperty(FACING, Facing.EAST); - break; - - case 2: - iblockstate = iblockstate.withProperty(FACING, Facing.WEST); - break; - - case 3: - iblockstate = iblockstate.withProperty(FACING, Facing.SOUTH); - break; - - case 4: - iblockstate = iblockstate.withProperty(FACING, Facing.NORTH); - break; - - case 5: - default: - iblockstate = iblockstate.withProperty(FACING, Facing.UP); - } - - return iblockstate; - } - protected Property[] getProperties() { return new Property[] {FACING}; diff --git a/common/src/main/java/common/block/tech/BlockTripWire.java b/common/src/main/java/common/block/tech/BlockTripWire.java index 398a134d..293bdacc 100755 --- a/common/src/main/java/common/block/tech/BlockTripWire.java +++ b/common/src/main/java/common/block/tech/BlockTripWire.java @@ -264,14 +264,6 @@ public class BlockTripWire extends Block } } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(POWERED, Boolean.valueOf((meta & 1) > 0)).withProperty(SUSPENDED, Boolean.valueOf((meta & 2) > 0)).withProperty(ATTACHED, Boolean.valueOf((meta & 4) > 0)).withProperty(DISARMED, Boolean.valueOf((meta & 8) > 0)); - } - protected Property[] getProperties() { return new Property[] {POWERED, SUSPENDED, ATTACHED, DISARMED, NORTH, EAST, WEST, SOUTH}; diff --git a/common/src/main/java/common/block/tech/BlockTripWireHook.java b/common/src/main/java/common/block/tech/BlockTripWireHook.java index 77024a15..9f6d184b 100755 --- a/common/src/main/java/common/block/tech/BlockTripWireHook.java +++ b/common/src/main/java/common/block/tech/BlockTripWireHook.java @@ -342,14 +342,6 @@ public class BlockTripWireHook extends Block implements Rotatable return BlockLayer.CUTOUT_MIPPED; } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(FACING, Facing.getHorizontal(meta & 3)).withProperty(POWERED, Boolean.valueOf((meta & 8) > 0)).withProperty(ATTACHED, Boolean.valueOf((meta & 4) > 0)); - } - protected Property[] getProperties() { return new Property[] {FACING, POWERED, ATTACHED, SUSPENDED}; diff --git a/common/src/main/java/common/block/tech/BlockWarpChest.java b/common/src/main/java/common/block/tech/BlockWarpChest.java index 4d6c5191..e89180af 100755 --- a/common/src/main/java/common/block/tech/BlockWarpChest.java +++ b/common/src/main/java/common/block/tech/BlockWarpChest.java @@ -131,21 +131,6 @@ public class BlockWarpChest extends Block implements Rotatable } } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - Facing enumfacing = Facing.getFront(meta); - - if (enumfacing.getAxis() == Facing.Axis.Y) - { - enumfacing = Facing.NORTH; - } - - return this.getState().withProperty(FACING, enumfacing); - } - protected Property[] getProperties() { return new Property[] {FACING}; diff --git a/common/src/main/java/common/block/tile/BlockBannerHanging.java b/common/src/main/java/common/block/tile/BlockBannerHanging.java index 00256303..5e109966 100644 --- a/common/src/main/java/common/block/tile/BlockBannerHanging.java +++ b/common/src/main/java/common/block/tile/BlockBannerHanging.java @@ -59,18 +59,6 @@ public class BlockBannerHanging extends BlockBanner super.onNeighborBlockChange(worldIn, pos, state, neighborBlock); } - public State getStateFromMeta(int meta) - { - Facing enumfacing = Facing.getFront(meta); - - if (enumfacing.getAxis() == Facing.Axis.Y) - { - enumfacing = Facing.NORTH; - } - - return this.getState().withProperty(FACING, enumfacing); - } - protected Property[] getProperties() { return new Property[] {FACING}; diff --git a/common/src/main/java/common/block/tile/BlockBannerStanding.java b/common/src/main/java/common/block/tile/BlockBannerStanding.java index 7a50c147..b1002805 100644 --- a/common/src/main/java/common/block/tile/BlockBannerStanding.java +++ b/common/src/main/java/common/block/tile/BlockBannerStanding.java @@ -29,11 +29,6 @@ public class BlockBannerStanding extends BlockBanner super.onNeighborBlockChange(worldIn, pos, state, neighborBlock); } - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(ROTATION, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {ROTATION}; diff --git a/common/src/main/java/common/block/tile/BlockStandingSign.java b/common/src/main/java/common/block/tile/BlockStandingSign.java index bbc45dfe..51e364e5 100755 --- a/common/src/main/java/common/block/tile/BlockStandingSign.java +++ b/common/src/main/java/common/block/tile/BlockStandingSign.java @@ -32,14 +32,6 @@ public class BlockStandingSign extends BlockSign super.onNeighborBlockChange(worldIn, pos, state, neighborBlock); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - return this.getState().withProperty(ROTATION, Integer.valueOf(meta)); - } - protected Property[] getProperties() { return new Property[] {ROTATION}; diff --git a/common/src/main/java/common/block/tile/BlockWallSign.java b/common/src/main/java/common/block/tile/BlockWallSign.java index 3922feaf..62590513 100755 --- a/common/src/main/java/common/block/tile/BlockWallSign.java +++ b/common/src/main/java/common/block/tile/BlockWallSign.java @@ -63,21 +63,6 @@ public class BlockWallSign extends BlockSign implements Rotatable super.onNeighborBlockChange(worldIn, pos, state, neighborBlock); } - /** - * Convert the given metadata into a BlockState for this Block - */ - public State getStateFromMeta(int meta) - { - Facing enumfacing = Facing.getFront(meta); - - if (enumfacing.getAxis() == Facing.Axis.Y) - { - enumfacing = Facing.NORTH; - } - - return this.getState().withProperty(FACING, enumfacing); - } - protected Property[] getProperties() { return new Property[] {FACING};