diff --git a/client/src/main/java/client/renderer/ItemRenderer.java b/client/src/main/java/client/renderer/ItemRenderer.java index e6b7dbf7..cb63ca7d 100755 --- a/client/src/main/java/client/renderer/ItemRenderer.java +++ b/client/src/main/java/client/renderer/ItemRenderer.java @@ -130,7 +130,7 @@ public class ItemRenderer private boolean isBlockTranslucent(Block blockIn) { - return blockIn != null && blockIn.getBlockLayer() == BlockLayer.TRANSLUCENT; + return blockIn != null && blockIn.getRenderLayer() == BlockLayer.TRANSLUCENT; } private void rotateArroundXAndY(float angle, float angleY) diff --git a/client/src/main/java/client/renderer/chunk/RenderChunk.java b/client/src/main/java/client/renderer/chunk/RenderChunk.java index 5c276083..cdc5a79c 100755 --- a/client/src/main/java/client/renderer/chunk/RenderChunk.java +++ b/client/src/main/java/client/renderer/chunk/RenderChunk.java @@ -170,7 +170,7 @@ public class RenderChunk } } - BlockLayer enumworldblocklayer1 = block.getBlockLayer(); + BlockLayer enumworldblocklayer1 = block.getRenderLayer(); int j = enumworldblocklayer1.ordinal(); if (block.getRenderType() != -1) diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index fabfe0fb..c59f8200 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -1034,7 +1034,7 @@ public class Block { return light; } - public BlockLayer getBlockLayer() { + public BlockLayer getRenderLayer() { return BlockLayer.SOLID; } diff --git a/common/src/main/java/common/block/BlockTranslucent.java b/common/src/main/java/common/block/BlockTranslucent.java index 877c6f71..8c316399 100755 --- a/common/src/main/java/common/block/BlockTranslucent.java +++ b/common/src/main/java/common/block/BlockTranslucent.java @@ -15,7 +15,7 @@ public class BlockTranslucent extends Block { return false; } - public final BlockLayer getBlockLayer() { + public final BlockLayer getRenderLayer() { return BlockLayer.TRANSLUCENT; } diff --git a/common/src/main/java/common/block/artificial/BlockBed.java b/common/src/main/java/common/block/artificial/BlockBed.java index 6edc3c33..fe89b20f 100755 --- a/common/src/main/java/common/block/artificial/BlockBed.java +++ b/common/src/main/java/common/block/artificial/BlockBed.java @@ -167,7 +167,7 @@ public class BlockBed extends Block implements Rotatable { return 1; } - public BlockLayer getBlockLayer() { + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/artificial/BlockCake.java b/common/src/main/java/common/block/artificial/BlockCake.java index 84cef5b0..1c9b5f22 100755 --- a/common/src/main/java/common/block/artificial/BlockCake.java +++ b/common/src/main/java/common/block/artificial/BlockCake.java @@ -201,7 +201,7 @@ public class BlockCake extends Block return null; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/artificial/BlockDoor.java b/common/src/main/java/common/block/artificial/BlockDoor.java index a4a632b4..5f50661e 100755 --- a/common/src/main/java/common/block/artificial/BlockDoor.java +++ b/common/src/main/java/common/block/artificial/BlockDoor.java @@ -248,7 +248,7 @@ public class BlockDoor extends Block implements Rotatable { return 1; } - public BlockLayer getBlockLayer() { + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/artificial/BlockFlowerPot.java b/common/src/main/java/common/block/artificial/BlockFlowerPot.java index 5c5895b0..dcf1f452 100755 --- a/common/src/main/java/common/block/artificial/BlockFlowerPot.java +++ b/common/src/main/java/common/block/artificial/BlockFlowerPot.java @@ -209,7 +209,7 @@ public class BlockFlowerPot extends Block return Items.flowerpot; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/artificial/BlockGlass.java b/common/src/main/java/common/block/artificial/BlockGlass.java index a1e45cfb..7bfe8745 100755 --- a/common/src/main/java/common/block/artificial/BlockGlass.java +++ b/common/src/main/java/common/block/artificial/BlockGlass.java @@ -22,7 +22,7 @@ public class BlockGlass extends Block { return 0; } - public BlockLayer getBlockLayer() { + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/artificial/BlockLadder.java b/common/src/main/java/common/block/artificial/BlockLadder.java index 1d57cc72..627936a2 100755 --- a/common/src/main/java/common/block/artificial/BlockLadder.java +++ b/common/src/main/java/common/block/artificial/BlockLadder.java @@ -131,7 +131,7 @@ public class BlockLadder extends Block implements Rotatable return worldIn.getState(pos.offset(facing.getOpposite())).getBlock().isNormalCube(); } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/artificial/BlockPane.java b/common/src/main/java/common/block/artificial/BlockPane.java index 8617fc69..b2463306 100755 --- a/common/src/main/java/common/block/artificial/BlockPane.java +++ b/common/src/main/java/common/block/artificial/BlockPane.java @@ -187,7 +187,7 @@ public class BlockPane extends Block return true; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT_MIPPED; } diff --git a/common/src/main/java/common/block/artificial/BlockPortal.java b/common/src/main/java/common/block/artificial/BlockPortal.java index 80c082b6..45abcf80 100755 --- a/common/src/main/java/common/block/artificial/BlockPortal.java +++ b/common/src/main/java/common/block/artificial/BlockPortal.java @@ -102,7 +102,7 @@ public class BlockPortal extends Block return false; } - public BlockLayer getBlockLayer() { + public BlockLayer getRenderLayer() { return BlockLayer.TRANSLUCENT; } diff --git a/common/src/main/java/common/block/artificial/BlockStainedGlass.java b/common/src/main/java/common/block/artificial/BlockStainedGlass.java index 0bdd3ac1..a15f3c49 100755 --- a/common/src/main/java/common/block/artificial/BlockStainedGlass.java +++ b/common/src/main/java/common/block/artificial/BlockStainedGlass.java @@ -24,7 +24,7 @@ public class BlockStainedGlass extends BlockGlass { return this.color; } - public BlockLayer getBlockLayer() { + public BlockLayer getRenderLayer() { return BlockLayer.TRANSLUCENT; } diff --git a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java index 109d1fe2..5e622d1f 100755 --- a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java +++ b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java @@ -30,7 +30,7 @@ public class BlockStainedGlassPane extends BlockPane return this.color; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.TRANSLUCENT; } diff --git a/common/src/main/java/common/block/artificial/BlockStairs.java b/common/src/main/java/common/block/artificial/BlockStairs.java index af1a5f13..11cc288a 100755 --- a/common/src/main/java/common/block/artificial/BlockStairs.java +++ b/common/src/main/java/common/block/artificial/BlockStairs.java @@ -592,9 +592,9 @@ public class BlockStairs extends Block implements Rotatable return this.base.getResistance(exploder); } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { - return this.base.getBlockLayer(); + return this.base.getRenderLayer(); } /** diff --git a/common/src/main/java/common/block/artificial/BlockTrapDoor.java b/common/src/main/java/common/block/artificial/BlockTrapDoor.java index cba9c381..437c87cf 100755 --- a/common/src/main/java/common/block/artificial/BlockTrapDoor.java +++ b/common/src/main/java/common/block/artificial/BlockTrapDoor.java @@ -178,7 +178,7 @@ public class BlockTrapDoor extends Block implements Rotatable return iblockstate; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/foliage/BlockBush.java b/common/src/main/java/common/block/foliage/BlockBush.java index 40a3eb96..d09cad53 100755 --- a/common/src/main/java/common/block/foliage/BlockBush.java +++ b/common/src/main/java/common/block/foliage/BlockBush.java @@ -87,7 +87,7 @@ public class BlockBush extends Block return false; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/foliage/BlockCactus.java b/common/src/main/java/common/block/foliage/BlockCactus.java index 962ec682..87fd57cd 100755 --- a/common/src/main/java/common/block/foliage/BlockCactus.java +++ b/common/src/main/java/common/block/foliage/BlockCactus.java @@ -140,7 +140,7 @@ public class BlockCactus extends Block entityIn.attackEntityFrom(DamageSource.cactus, 1); } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/foliage/BlockGrass.java b/common/src/main/java/common/block/foliage/BlockGrass.java index f7d484a8..e5ce50a0 100755 --- a/common/src/main/java/common/block/foliage/BlockGrass.java +++ b/common/src/main/java/common/block/foliage/BlockGrass.java @@ -122,7 +122,7 @@ public class BlockGrass extends Block implements IGrowable IBiome.getBiome(worldIn.getBiomeGenForCoords(pos)).growGrass(worldIn, pos, state, rand); } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT_MIPPED; } diff --git a/common/src/main/java/common/block/foliage/BlockLeavesBase.java b/common/src/main/java/common/block/foliage/BlockLeavesBase.java index 1bf0fd04..22495fc9 100755 --- a/common/src/main/java/common/block/foliage/BlockLeavesBase.java +++ b/common/src/main/java/common/block/foliage/BlockLeavesBase.java @@ -26,7 +26,7 @@ public class BlockLeavesBase extends Block // this.transparent = transparent; // } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return /* this.transparent ? */ BlockLayer.CUTOUT_MIPPED; // : BlockLayer.SOLID; } diff --git a/common/src/main/java/common/block/foliage/BlockReed.java b/common/src/main/java/common/block/foliage/BlockReed.java index 44b50b61..49f31d09 100755 --- a/common/src/main/java/common/block/foliage/BlockReed.java +++ b/common/src/main/java/common/block/foliage/BlockReed.java @@ -146,7 +146,7 @@ public class BlockReed extends Block return worldIn.getBiomeGenForCoords(pos).getGrassColorAtPos(pos); } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/foliage/BlockVine.java b/common/src/main/java/common/block/foliage/BlockVine.java index a7bffc66..d0e5cb89 100755 --- a/common/src/main/java/common/block/foliage/BlockVine.java +++ b/common/src/main/java/common/block/foliage/BlockVine.java @@ -440,7 +440,7 @@ public class BlockVine extends Block } } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/liquid/BlockLiquid.java b/common/src/main/java/common/block/liquid/BlockLiquid.java index 117b6434..b03a5f83 100755 --- a/common/src/main/java/common/block/liquid/BlockLiquid.java +++ b/common/src/main/java/common/block/liquid/BlockLiquid.java @@ -239,7 +239,7 @@ public abstract class BlockLiquid extends Block return (k > l ? k : l) | (i1 > j1 ? i1 : j1) << 16; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return this.opaque ? BlockLayer.SOLID : BlockLayer.TRANSLUCENT; } diff --git a/common/src/main/java/common/block/natural/BlockFire.java b/common/src/main/java/common/block/natural/BlockFire.java index 7c8f6420..974cc08f 100755 --- a/common/src/main/java/common/block/natural/BlockFire.java +++ b/common/src/main/java/common/block/natural/BlockFire.java @@ -428,7 +428,7 @@ public class BlockFire extends Block // return MapColor.tntColor; // } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/natural/BlockWeb.java b/common/src/main/java/common/block/natural/BlockWeb.java index 5da8b30b..d7577406 100755 --- a/common/src/main/java/common/block/natural/BlockWeb.java +++ b/common/src/main/java/common/block/natural/BlockWeb.java @@ -63,7 +63,7 @@ public class BlockWeb extends Block return true; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/tech/BlockBrewingStand.java b/common/src/main/java/common/block/tech/BlockBrewingStand.java index 6256d61b..986c6db3 100755 --- a/common/src/main/java/common/block/tech/BlockBrewingStand.java +++ b/common/src/main/java/common/block/tech/BlockBrewingStand.java @@ -443,7 +443,7 @@ public class BlockBrewingStand extends Block implements ITileEntityProvider super.onRemoved(worldIn, pos, state); } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/tech/BlockEffectGenerator.java b/common/src/main/java/common/block/tech/BlockEffectGenerator.java index 48c75765..83087517 100755 --- a/common/src/main/java/common/block/tech/BlockEffectGenerator.java +++ b/common/src/main/java/common/block/tech/BlockEffectGenerator.java @@ -52,7 +52,7 @@ public class BlockEffectGenerator extends BlockMachine { return false; } - public BlockLayer getBlockLayer() { + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/tech/BlockHopper.java b/common/src/main/java/common/block/tech/BlockHopper.java index a8bf3809..dacdabde 100755 --- a/common/src/main/java/common/block/tech/BlockHopper.java +++ b/common/src/main/java/common/block/tech/BlockHopper.java @@ -180,7 +180,7 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction return true; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT_MIPPED; } diff --git a/common/src/main/java/common/block/tech/BlockRail.java b/common/src/main/java/common/block/tech/BlockRail.java index bda3af92..13de9f1a 100755 --- a/common/src/main/java/common/block/tech/BlockRail.java +++ b/common/src/main/java/common/block/tech/BlockRail.java @@ -158,7 +158,7 @@ public class BlockRail extends Block return 0; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/tech/BlockTorch.java b/common/src/main/java/common/block/tech/BlockTorch.java index b72302bc..9ceb0fc4 100755 --- a/common/src/main/java/common/block/tech/BlockTorch.java +++ b/common/src/main/java/common/block/tech/BlockTorch.java @@ -219,7 +219,7 @@ public abstract class BlockTorch extends Block implements Directional return super.rayTrace(worldIn, pos, start, end); } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/tech/BlockTripWire.java b/common/src/main/java/common/block/tech/BlockTripWire.java index c1bfd1b0..1208c52d 100755 --- a/common/src/main/java/common/block/tech/BlockTripWire.java +++ b/common/src/main/java/common/block/tech/BlockTripWire.java @@ -74,7 +74,7 @@ public class BlockTripWire extends Block return false; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; } diff --git a/common/src/main/java/common/block/tech/BlockTripWireHook.java b/common/src/main/java/common/block/tech/BlockTripWireHook.java index cb0a3bd8..0d04ec28 100755 --- a/common/src/main/java/common/block/tech/BlockTripWireHook.java +++ b/common/src/main/java/common/block/tech/BlockTripWireHook.java @@ -322,7 +322,7 @@ public class BlockTripWireHook extends Block implements Rotatable return true; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT_MIPPED; } diff --git a/common/src/main/java/common/block/tech/BlockWire.java b/common/src/main/java/common/block/tech/BlockWire.java index 014abbe7..b4380ca8 100755 --- a/common/src/main/java/common/block/tech/BlockWire.java +++ b/common/src/main/java/common/block/tech/BlockWire.java @@ -323,7 +323,7 @@ public class BlockWire extends Block return state.getBlock() == this; } - public BlockLayer getBlockLayer() + public BlockLayer getRenderLayer() { return BlockLayer.CUTOUT; }