From 6533df5d82a0bbbeaada48cbc086a181e75b9ac8 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sat, 7 Feb 2015 15:29:26 +0000 Subject: [PATCH 1/2] Add fallback icons for all tabs. Fixes #202 --- .../com/cricketcraft/chisel/init/ChiselTabs.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index abe7eed5..d0c180cf 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -1,6 +1,8 @@ package com.cricketcraft.chisel.init; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -47,11 +49,21 @@ public class ChiselTabs { public static void postInit() { + if(Features.CHISEL.enabled()) tabChisel.setTabIconItemStack(new ItemStack(ChiselItems.chisel)); + else tabChisel.setTabIconItemStack(new ItemStack(Items.stick)); + if(Features.HOLYSTONE.enabled()) tabStoneChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.holystone)); + else tabStoneChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.stonebrick)); + if(Features.WOOD.enabled()) tabWoodChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.planks[0], 1, 1)); + else tabWoodChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.planks)); + if(Features.TECHNICAL.enabled()) tabMetalChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.technical)); + else tabMetalChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.iron_block)); + if(Features.JACKOLANTERN.enabled()) tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.jackolantern[0])); + else tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.lit_pumpkin)); if (atLeastOneModIsLoaded) { if (Features.ARCANE.enabled()) { @@ -59,7 +71,9 @@ public class ChiselTabs { } else if (Features.BLOOD_RUNE.enabled()) { tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.bloodRune)); } else { + if(ChiselBlocks.voidstone != null) tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.voidstone)); + else tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.obsidian)); } } } From 355119b424c4094a204857cb9533f55822fdc78b Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sat, 7 Feb 2015 16:19:43 +0000 Subject: [PATCH 2/2] Fix packed ice pillars being transparent (#189) --- .../chisel/block/BlockCarvablePackedIcePillar.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java index 25a7aea2..f6546a4d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java @@ -8,14 +8,4 @@ public class BlockCarvablePackedIcePillar extends BlockCarvablePillar { super(m); this.slipperiness = 0.98F; } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public int getRenderBlockPass() { - return 1; - } }