make most textures non-translucent

common/src/main/java/common/block/BlockTranslucent.java

@@ -1,27 +0,0 @@
-package common.block;
-
-import common.model.BlockLayer;
-import common.util.BlockPos;
-import common.util.Facing;
-import common.world.IWorldAccess;
-import common.world.State;
-
-public class BlockTranslucent extends Block {
-	public BlockTranslucent(Material material) {
-		super(material);
-	}
-
-	public final boolean isOpaqueCube() {
-		return false;
-	}
-
-	public final BlockLayer getRenderLayer() {
-		return BlockLayer.TRANSLUCENT;
-	}
-
-	public boolean canRender(IWorldAccess world, BlockPos pos, Facing side) {
-		State state = world.getState(pos);
-		Block block = state.getBlock();
-		return block != this && super.canRender(world, pos, side);
-	}
-}

common/src/main/java/common/block/artificial/BlockPortal.java

@@ -7,7 +7,6 @@ import common.block.Material;
 import common.block.natural.BlockFire;
 import common.entity.Entity;
 import common.init.Blocks;
-import common.model.BlockLayer;
 import common.model.Model;
 import common.model.ModelProvider;
 import common.properties.Property;
@@ -111,10 +110,6 @@ public class BlockPortal extends Block
 		return false;
 	}
 
-	public BlockLayer getRenderLayer() {
-		return BlockLayer.TRANSLUCENT;
-	}
-
     public boolean tryIgnitePortal(World worldIn, BlockPos pos)
     {
         BlockPortal.Size size = new BlockPortal.Size(worldIn, pos, Facing.Axis.X, this);

common/src/main/java/common/block/artificial/BlockStainedGlass.java

@@ -1,10 +1,6 @@
 package common.block.artificial;
 
 import common.color.DyeColor;
-import common.model.BlockLayer;
-import common.model.Model;
-import common.model.ModelProvider;
-import common.world.State;
 
 public class BlockStainedGlass extends BlockGlass {
 	public static final BlockStainedGlass[] GLASS = new BlockStainedGlass[DyeColor.values().length];
@@ -23,12 +19,4 @@ public class BlockStainedGlass extends BlockGlass {
 	public DyeColor getColor() {
 		return this.color;
 	}
-
-	public BlockLayer getRenderLayer() {
-		return BlockLayer.TRANSLUCENT;
-	}
-
-	public Model getModel(ModelProvider provider, String name, State state) {
-		return provider.getModel(this.color.getName() + "_glass").add().all();
-	}
 }

common/src/main/java/common/block/artificial/BlockStainedGlassPane.java

@@ -3,7 +3,6 @@ package common.block.artificial;
 import common.block.Material;
 import common.color.DyeColor;
 import common.item.CheatTab;
-import common.model.BlockLayer;
 import common.properties.Property;
 
 public class BlockStainedGlassPane extends BlockPane
@@ -29,11 +28,6 @@ public class BlockStainedGlassPane extends BlockPane
     	return this.color;
     }
 
-    public BlockLayer getRenderLayer()
-    {
-        return BlockLayer.TRANSLUCENT;
-    }
-
     protected Property[] getProperties()
     {
         return new Property[] {NORTH, EAST, WEST, SOUTH};

common/src/main/java/common/block/natural/BlockIce.java

@@ -1,21 +1,24 @@
 package common.block.natural;
 
-import common.block.BlockTranslucent;
+import common.block.Block;
 import common.block.Material;
 import common.enchantment.EnchantmentHelper;
 import common.entity.npc.EntityNPC;
 import common.init.Blocks;
 import common.item.CheatTab;
+import common.model.BlockLayer;
 import common.rng.Random;
 import common.tileentity.TileEntity;
 import common.util.BlockPos;
+import common.util.Facing;
 import common.vars.Vars;
 import common.world.LightType;
 import common.world.State;
 import common.world.World;
 import common.world.AWorldServer;
+import common.world.IWorldAccess;
 
-public class BlockIce extends BlockTranslucent {
+public class BlockIce extends Block {
 	public BlockIce() {
 		super(Material.TRANSLUCENT);
 		this.setSlipperiness(0.98F);
@@ -23,6 +26,20 @@ public class BlockIce extends BlockTranslucent {
 		this.setTab(CheatTab.NATURE);
 	}
 
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	public BlockLayer getRenderLayer() {
+		return BlockLayer.CUTOUT;
+	}
+
+	public boolean canRender(IWorldAccess world, BlockPos pos, Facing side) {
+		State state = world.getState(pos);
+		Block block = state.getBlock();
+		return block != this && super.canRender(world, pos, side);
+	}
+
 	public void postBroken(World world, EntityNPC player, BlockPos pos, State state, TileEntity tile) {
 		if(this.canSilkHarvest() && EnchantmentHelper.getSilkTouchModifier(player)) {
 			super.postBroken(world, player, pos, state, tile);

common/src/main/java/common/block/natural/BlockSlime.java

@@ -1,36 +1,16 @@
 package common.block.natural;
 
-import common.block.BlockTranslucent;
+import common.block.Block;
 import common.block.Material;
 import common.entity.Entity;
 import common.item.CheatTab;
-import common.model.Model;
-import common.model.ModelProvider;
 import common.util.BlockPos;
-import common.world.State;
 import common.world.World;
 
-public class BlockSlime extends BlockTranslucent {
+public class BlockSlime extends Block {
-	private static final Model slime = ModelProvider.getModelProvider().getModel("slime")
-			.add(0, 0, 0, 16, 16, 16)
-				.d().uv(0, 0, 16, 16).noCull()
-				.u().uv(0, 0, 16, 16).noCull()
-				.n().uv(0, 0, 16, 16).noCull()
-				.s().uv(0, 0, 16, 16).noCull()
-				.w().uv(0, 0, 16, 16).noCull()
-				.e().uv(0, 0, 16, 16).noCull()
-			.add(3, 3, 3, 13, 13, 13)
-				.d().uv(3, 3, 13, 13).noCull()
-				.u().uv(3, 3, 13, 13).noCull()
-				.n().uv(3, 3, 13, 13).noCull()
-				.s().uv(3, 3, 13, 13).noCull()
-				.w().uv(3, 3, 13, 13).noCull()
-				.e().uv(3, 3, 13, 13).noCull()
-	;
-
 	public BlockSlime() {
 		super(Material.LOOSE);
-		this.setTab(CheatTab.TECHNOLOGY);
+		this.setTab(CheatTab.NATURE);
 		this.setSlipperiness(0.8F);
 	}
 
@@ -56,8 +36,4 @@ public class BlockSlime extends BlockTranslucent {
 		}
 		super.onCollideMove(world, pos, entity);
 	}
-
-	public Model getModel(ModelProvider provider, String name, State state) {
-		return slime;
-	}
 }