diff --git a/build.properties b/build.properties index e819ccbc..288ffdda 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.7.2 forge_version=10.12.0.1027 -mantle_version=106.1bb545c +mantle_version=109.be29b7d FMP_version=1.0.0.211 CCLIB_version=1.0.0.44 NEI_version=1.6.1.8 diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index fd1b8f56..f4bf5dec 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -49,6 +49,12 @@ public class CraftingSlab extends InventorySlab return textureNames; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index 9fe5d4b4..d6c31d4a 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -42,6 +42,12 @@ public class CraftingStationBlock extends InventoryBlock return textureNames; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index a774b6c5..a80aef6d 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -226,6 +226,12 @@ public class DryingRack extends InventoryBlock return textureNames; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index cb565975..3a140b2f 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -42,6 +42,12 @@ public class EquipBlock extends InventoryBlock return new String[] { "toolstation_top" }; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index d3f079a1..62a49ac6 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -101,6 +101,12 @@ public class FurnaceSlab extends InventorySlab return 2; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + @Override public void registerBlockIcons (IIconRegister iconRegister) { diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index 6f171ff7..b13e5a96 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -211,6 +211,12 @@ public class SearedBlock extends InventoryBlock return textureNames; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + // TODO getIcon @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 7e544de7..7a9a23ee 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -73,6 +73,12 @@ public class SmelteryBlock extends InventoryBlock return textureNames; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java index 172d7709..c9102144 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java @@ -46,6 +46,12 @@ public class ToolForgeBlock extends InventoryBlock return textureNames; } + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } + IIcon textureTop; @Override diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index 1b2d280a..a156e60e 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -215,4 +215,10 @@ public class ToolStationBlock extends InventoryBlock } super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack); } + + @Override + public String getTextureDomain (int textureNameIndex) + { + return "tinker"; + } } \ No newline at end of file diff --git a/src/main/java/tconstruct/library/util/TabTools.java b/src/main/java/tconstruct/library/util/TabTools.java deleted file mode 100644 index f3903391..00000000 --- a/src/main/java/tconstruct/library/util/TabTools.java +++ /dev/null @@ -1,32 +0,0 @@ -package tconstruct.library.util; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class TabTools extends CreativeTabs -{ - ItemStack display; - - public TabTools(String label) - { - super(label); - } - - public void init (ItemStack stack) - { - display = stack; - } - - @Override - public ItemStack getIconItemStack () - { - return display; - } - - @Override - public Item getTabIconItem () - { - return display.getItem(); - } -} \ No newline at end of file