diff --git a/client/src/main/resources/textures/blocks/arcane_portal.png b/client/src/main/resources/textures/blocks/arcane_portal.png index ba59c15f..ad9f304b 100755 Binary files a/client/src/main/resources/textures/blocks/arcane_portal.png and b/client/src/main/resources/textures/blocks/arcane_portal.png differ diff --git a/client/src/main/resources/textures/blocks/black_glass.png b/client/src/main/resources/textures/blocks/black_glass.png index 06f34279..3f6725a1 100755 Binary files a/client/src/main/resources/textures/blocks/black_glass.png and b/client/src/main/resources/textures/blocks/black_glass.png differ diff --git a/client/src/main/resources/textures/blocks/black_glass_pane.png b/client/src/main/resources/textures/blocks/black_glass_pane.png index 43d60c55..bc413b1f 100755 Binary files a/client/src/main/resources/textures/blocks/black_glass_pane.png and b/client/src/main/resources/textures/blocks/black_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/blue_glass.png b/client/src/main/resources/textures/blocks/blue_glass.png index 38885de7..9991397a 100755 Binary files a/client/src/main/resources/textures/blocks/blue_glass.png and b/client/src/main/resources/textures/blocks/blue_glass.png differ diff --git a/client/src/main/resources/textures/blocks/blue_glass_pane.png b/client/src/main/resources/textures/blocks/blue_glass_pane.png index 55c614f4..74b27caf 100755 Binary files a/client/src/main/resources/textures/blocks/blue_glass_pane.png and b/client/src/main/resources/textures/blocks/blue_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/brown_glass.png b/client/src/main/resources/textures/blocks/brown_glass.png index 259b61c6..aad64bae 100755 Binary files a/client/src/main/resources/textures/blocks/brown_glass.png and b/client/src/main/resources/textures/blocks/brown_glass.png differ diff --git a/client/src/main/resources/textures/blocks/brown_glass_pane.png b/client/src/main/resources/textures/blocks/brown_glass_pane.png index cbd791a4..8fb61795 100755 Binary files a/client/src/main/resources/textures/blocks/brown_glass_pane.png and b/client/src/main/resources/textures/blocks/brown_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/chaos_portal.png b/client/src/main/resources/textures/blocks/chaos_portal.png index 929dec26..205c51e4 100755 Binary files a/client/src/main/resources/textures/blocks/chaos_portal.png and b/client/src/main/resources/textures/blocks/chaos_portal.png differ diff --git a/client/src/main/resources/textures/blocks/crimson_portal.png b/client/src/main/resources/textures/blocks/crimson_portal.png index 6921f6d1..ad45f424 100755 Binary files a/client/src/main/resources/textures/blocks/crimson_portal.png and b/client/src/main/resources/textures/blocks/crimson_portal.png differ diff --git a/client/src/main/resources/textures/blocks/cyan_glass.png b/client/src/main/resources/textures/blocks/cyan_glass.png index d30caa44..c50fd6b8 100755 Binary files a/client/src/main/resources/textures/blocks/cyan_glass.png and b/client/src/main/resources/textures/blocks/cyan_glass.png differ diff --git a/client/src/main/resources/textures/blocks/cyan_glass_pane.png b/client/src/main/resources/textures/blocks/cyan_glass_pane.png index 9a34b844..02b3ac16 100755 Binary files a/client/src/main/resources/textures/blocks/cyan_glass_pane.png and b/client/src/main/resources/textures/blocks/cyan_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/dark_portal.png b/client/src/main/resources/textures/blocks/dark_portal.png index 21f767ee..8c4b61f7 100755 Binary files a/client/src/main/resources/textures/blocks/dark_portal.png and b/client/src/main/resources/textures/blocks/dark_portal.png differ diff --git a/client/src/main/resources/textures/blocks/deep_portal.png b/client/src/main/resources/textures/blocks/deep_portal.png index 632f90a5..cec36215 100755 Binary files a/client/src/main/resources/textures/blocks/deep_portal.png and b/client/src/main/resources/textures/blocks/deep_portal.png differ diff --git a/client/src/main/resources/textures/blocks/gray_glass.png b/client/src/main/resources/textures/blocks/gray_glass.png index 3f07a5d8..9934c0ad 100755 Binary files a/client/src/main/resources/textures/blocks/gray_glass.png and b/client/src/main/resources/textures/blocks/gray_glass.png differ diff --git a/client/src/main/resources/textures/blocks/gray_glass_pane.png b/client/src/main/resources/textures/blocks/gray_glass_pane.png index bb061147..c00bf397 100755 Binary files a/client/src/main/resources/textures/blocks/gray_glass_pane.png and b/client/src/main/resources/textures/blocks/gray_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/green_glass.png b/client/src/main/resources/textures/blocks/green_glass.png index 7c1f4e60..cdf7686c 100755 Binary files a/client/src/main/resources/textures/blocks/green_glass.png and b/client/src/main/resources/textures/blocks/green_glass.png differ diff --git a/client/src/main/resources/textures/blocks/green_glass_pane.png b/client/src/main/resources/textures/blocks/green_glass_pane.png index a7d9fc7d..e6a26f1b 100755 Binary files a/client/src/main/resources/textures/blocks/green_glass_pane.png and b/client/src/main/resources/textures/blocks/green_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/ice.png b/client/src/main/resources/textures/blocks/ice.png index ac946e95..0403ebb2 100755 Binary files a/client/src/main/resources/textures/blocks/ice.png and b/client/src/main/resources/textures/blocks/ice.png differ diff --git a/client/src/main/resources/textures/blocks/light_blue_glass.png b/client/src/main/resources/textures/blocks/light_blue_glass.png index b62703d4..20a276f0 100755 Binary files a/client/src/main/resources/textures/blocks/light_blue_glass.png and b/client/src/main/resources/textures/blocks/light_blue_glass.png differ diff --git a/client/src/main/resources/textures/blocks/light_blue_glass_pane.png b/client/src/main/resources/textures/blocks/light_blue_glass_pane.png index 6a0e661d..8784a29f 100755 Binary files a/client/src/main/resources/textures/blocks/light_blue_glass_pane.png and b/client/src/main/resources/textures/blocks/light_blue_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/light_portal.png b/client/src/main/resources/textures/blocks/light_portal.png index a40755f0..3b58f731 100755 Binary files a/client/src/main/resources/textures/blocks/light_portal.png and b/client/src/main/resources/textures/blocks/light_portal.png differ diff --git a/client/src/main/resources/textures/blocks/lime_glass.png b/client/src/main/resources/textures/blocks/lime_glass.png index f1d3c46a..a292ea3e 100755 Binary files a/client/src/main/resources/textures/blocks/lime_glass.png and b/client/src/main/resources/textures/blocks/lime_glass.png differ diff --git a/client/src/main/resources/textures/blocks/lime_glass_pane.png b/client/src/main/resources/textures/blocks/lime_glass_pane.png index 0607d75b..d20e94d1 100755 Binary files a/client/src/main/resources/textures/blocks/lime_glass_pane.png and b/client/src/main/resources/textures/blocks/lime_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/magenta_glass.png b/client/src/main/resources/textures/blocks/magenta_glass.png index 5cd99450..2003358a 100755 Binary files a/client/src/main/resources/textures/blocks/magenta_glass.png and b/client/src/main/resources/textures/blocks/magenta_glass.png differ diff --git a/client/src/main/resources/textures/blocks/magenta_glass_pane.png b/client/src/main/resources/textures/blocks/magenta_glass_pane.png index 5419e521..7411b630 100755 Binary files a/client/src/main/resources/textures/blocks/magenta_glass_pane.png and b/client/src/main/resources/textures/blocks/magenta_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/orange_glass.png b/client/src/main/resources/textures/blocks/orange_glass.png index 3a29e31b..ca963016 100755 Binary files a/client/src/main/resources/textures/blocks/orange_glass.png and b/client/src/main/resources/textures/blocks/orange_glass.png differ diff --git a/client/src/main/resources/textures/blocks/orange_glass_pane.png b/client/src/main/resources/textures/blocks/orange_glass_pane.png index 2866571b..1c4ff5bb 100755 Binary files a/client/src/main/resources/textures/blocks/orange_glass_pane.png and b/client/src/main/resources/textures/blocks/orange_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/pink_glass.png b/client/src/main/resources/textures/blocks/pink_glass.png index 42d8739d..5ebaf65e 100755 Binary files a/client/src/main/resources/textures/blocks/pink_glass.png and b/client/src/main/resources/textures/blocks/pink_glass.png differ diff --git a/client/src/main/resources/textures/blocks/pink_glass_pane.png b/client/src/main/resources/textures/blocks/pink_glass_pane.png index 6b6cd768..259a4898 100755 Binary files a/client/src/main/resources/textures/blocks/pink_glass_pane.png and b/client/src/main/resources/textures/blocks/pink_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/purple_glass.png b/client/src/main/resources/textures/blocks/purple_glass.png index fcae3d26..a82f3e64 100755 Binary files a/client/src/main/resources/textures/blocks/purple_glass.png and b/client/src/main/resources/textures/blocks/purple_glass.png differ diff --git a/client/src/main/resources/textures/blocks/purple_glass_pane.png b/client/src/main/resources/textures/blocks/purple_glass_pane.png index 23e208ed..147fe0ff 100755 Binary files a/client/src/main/resources/textures/blocks/purple_glass_pane.png and b/client/src/main/resources/textures/blocks/purple_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/radiating_portal.png b/client/src/main/resources/textures/blocks/radiating_portal.png index 0d16e803..1b716173 100755 Binary files a/client/src/main/resources/textures/blocks/radiating_portal.png and b/client/src/main/resources/textures/blocks/radiating_portal.png differ diff --git a/client/src/main/resources/textures/blocks/red_glass.png b/client/src/main/resources/textures/blocks/red_glass.png index db4c5eb7..9aac77f2 100755 Binary files a/client/src/main/resources/textures/blocks/red_glass.png and b/client/src/main/resources/textures/blocks/red_glass.png differ diff --git a/client/src/main/resources/textures/blocks/red_glass_pane.png b/client/src/main/resources/textures/blocks/red_glass_pane.png index 22b69dba..ac74d9c8 100755 Binary files a/client/src/main/resources/textures/blocks/red_glass_pane.png and b/client/src/main/resources/textures/blocks/red_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/shining_portal.png b/client/src/main/resources/textures/blocks/shining_portal.png index 27544d80..93d39c91 100755 Binary files a/client/src/main/resources/textures/blocks/shining_portal.png and b/client/src/main/resources/textures/blocks/shining_portal.png differ diff --git a/client/src/main/resources/textures/blocks/silver_glass.png b/client/src/main/resources/textures/blocks/silver_glass.png index 84616646..40cf2622 100755 Binary files a/client/src/main/resources/textures/blocks/silver_glass.png and b/client/src/main/resources/textures/blocks/silver_glass.png differ diff --git a/client/src/main/resources/textures/blocks/silver_glass_pane.png b/client/src/main/resources/textures/blocks/silver_glass_pane.png index f226ecc9..60c63b22 100755 Binary files a/client/src/main/resources/textures/blocks/silver_glass_pane.png and b/client/src/main/resources/textures/blocks/silver_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/slime.png b/client/src/main/resources/textures/blocks/slime.png deleted file mode 100755 index 6dbe5cb6..00000000 Binary files a/client/src/main/resources/textures/blocks/slime.png and /dev/null differ diff --git a/client/src/main/resources/textures/blocks/slime_block.png b/client/src/main/resources/textures/blocks/slime_block.png new file mode 100755 index 00000000..5d02b480 Binary files /dev/null and b/client/src/main/resources/textures/blocks/slime_block.png differ diff --git a/client/src/main/resources/textures/blocks/white_glass.png b/client/src/main/resources/textures/blocks/white_glass.png index 696c5aab..3709ef70 100755 Binary files a/client/src/main/resources/textures/blocks/white_glass.png and b/client/src/main/resources/textures/blocks/white_glass.png differ diff --git a/client/src/main/resources/textures/blocks/white_glass_pane.png b/client/src/main/resources/textures/blocks/white_glass_pane.png index 9a273c36..0569f854 100755 Binary files a/client/src/main/resources/textures/blocks/white_glass_pane.png and b/client/src/main/resources/textures/blocks/white_glass_pane.png differ diff --git a/client/src/main/resources/textures/blocks/yellow_glass.png b/client/src/main/resources/textures/blocks/yellow_glass.png index 8e48e120..6def59a0 100755 Binary files a/client/src/main/resources/textures/blocks/yellow_glass.png and b/client/src/main/resources/textures/blocks/yellow_glass.png differ diff --git a/client/src/main/resources/textures/blocks/yellow_glass_pane.png b/client/src/main/resources/textures/blocks/yellow_glass_pane.png index 1c8580f3..5f26e16d 100755 Binary files a/client/src/main/resources/textures/blocks/yellow_glass_pane.png and b/client/src/main/resources/textures/blocks/yellow_glass_pane.png differ diff --git a/common/src/main/java/common/block/BlockTranslucent.java b/common/src/main/java/common/block/BlockTranslucent.java deleted file mode 100755 index 8c316399..00000000 --- a/common/src/main/java/common/block/BlockTranslucent.java +++ /dev/null @@ -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); - } -} diff --git a/common/src/main/java/common/block/artificial/BlockPortal.java b/common/src/main/java/common/block/artificial/BlockPortal.java index 83905e3b..aeecda1d 100755 --- a/common/src/main/java/common/block/artificial/BlockPortal.java +++ b/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); diff --git a/common/src/main/java/common/block/artificial/BlockStainedGlass.java b/common/src/main/java/common/block/artificial/BlockStainedGlass.java index a15f3c49..399ab0db 100755 --- a/common/src/main/java/common/block/artificial/BlockStainedGlass.java +++ b/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(); - } } diff --git a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java index daada4af..9654e9e2 100755 --- a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java +++ b/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}; diff --git a/common/src/main/java/common/block/natural/BlockIce.java b/common/src/main/java/common/block/natural/BlockIce.java index 3fdaa8a2..e52584c4 100755 --- a/common/src/main/java/common/block/natural/BlockIce.java +++ b/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); diff --git a/common/src/main/java/common/block/natural/BlockSlime.java b/common/src/main/java/common/block/natural/BlockSlime.java index 17a3b39c..4a8bb267 100755 --- a/common/src/main/java/common/block/natural/BlockSlime.java +++ b/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 { - 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 class BlockSlime extends Block { 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; - } }