diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CableBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/CableBlock.java index 53eadd4ae..81125d96e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CableBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/CableBlock.java @@ -10,7 +10,6 @@ import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; @@ -157,9 +156,4 @@ public class CableBlock extends NetworkNodeBlock { builder.add(NORTH, EAST, SOUTH, WEST, UP, DOWN); } - - @Override - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.CUTOUT; - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java index 10c29a738..dc1dc2315 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java @@ -13,7 +13,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java index ff1404db6..371d64a04 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java @@ -10,7 +10,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java index c8f10c52b..f7b54998b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java @@ -11,7 +11,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java index 70aacf86e..3172d297e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java @@ -13,7 +13,6 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java index 77695ae40..6ad1bc2ce 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java @@ -10,7 +10,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java index 8c925ef3d..a93087824 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java @@ -11,7 +11,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkReceiverBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkReceiverBlock.java index 53c9a962d..9bad66dc7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkReceiverBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkReceiverBlock.java @@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.tile.NetworkReceiverTile; import com.raoulvdberge.refinedstorage.util.BlockUtils; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockReader; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java index e8d6307f6..8d16ed561 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java @@ -10,7 +10,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java index 6715a0212..b123c86dd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java @@ -10,7 +10,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java index b1f04af99..65f3882ac 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java @@ -11,7 +11,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java index 49991846d..c0a4e6139 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java @@ -12,7 +12,6 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; @@ -66,8 +65,6 @@ public class WirelessTransmitterBlock extends NetworkNodeBlock { return facing == Direction.DOWN && !this.isValidPosition(state, world, currentPos) ? Blocks.AIR.getDefaultState() : super.updatePostPlacement(state, facing, facingState, world, currentPos, facingPos); } - - @Override @SuppressWarnings("deprecation") public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java index 64425f473..5b450ca9f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.render.tesr; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.block.StorageMonitorBlock; @@ -86,24 +87,24 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer