From f334260f421070aa044c962dfd23d75ec0b647ab Mon Sep 17 00:00:00 2001 From: EoD Date: Tue, 7 Oct 2014 12:09:58 +0200 Subject: [PATCH] drop "chisel." from all item and block names this is the first step towards a more vanilla like naming scheme --- .../info/jbcs/minecraft/chisel/Chisel.java | 18 +++--------------- .../jbcs/minecraft/chisel/ChiselBlocks.java | 13 ++++++------- .../chisel/carving/CarvableHelper.java | 2 +- .../minecraft/chisel/item/ItemCarvable.java | 7 ------- 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index c6255b95..ca5f7e69 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -88,13 +88,7 @@ public class Chisel else if(m.type == Type.BLOCK) { Block block = null; - - if(General.cleanTags(m.name).equals("sandSnakestone")) - block = GameRegistry.findBlock(Chisel.MOD_ID, "tile.snakestoneSand"); - else if(General.cleanTags(m.name).equals("snakestone")) - block = GameRegistry.findBlock(Chisel.MOD_ID, "tile.snakestoneStone"); - else - block = GameRegistry.findBlock(Chisel.MOD_ID, General.cleanTags(m.name)); + block = GameRegistry.findBlock(Chisel.MOD_ID, General.cleanTags(m.name)); if(block != null) { @@ -105,13 +99,7 @@ public class Chisel } else if(m.type == Type.ITEM) { Item item = null; - - if(General.cleanTags(m.name).equals("sandSnakestone")) - item = GameRegistry.findItem(Chisel.MOD_ID, "tile.snakestoneSand"); - else if(General.cleanTags(m.name).equals("snakestone")) - item = GameRegistry.findItem(Chisel.MOD_ID, "tile.snakestoneStone"); - else - item = GameRegistry.findItem(Chisel.MOD_ID, General.cleanTags(m.name)); + item = GameRegistry.findItem(Chisel.MOD_ID, General.cleanTags(m.name)); if(item != null) { @@ -149,7 +137,7 @@ public class Chisel { itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle").setCreativeTab(CreativeTabs.tabTools); EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, this, 40, 1, true); - GameRegistry.registerItem(itemCloudInABottle, "chisel.cloudinabottle"); + GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle"); } if(Configurations.featureEnabled("ballOfMoss")) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index bef9f3c3..97998c82 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -372,7 +372,7 @@ public class ChiselBlocks if(Configurations.featureEnabled("snakeSandstone")) { blockSandSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setBlockName("snakestoneSand"); - GameRegistry.registerBlock(blockSandSnakestone, ItemCarvable.class, blockSandSnakestone.getUnlocalizedName()); + GameRegistry.registerBlock(blockSandSnakestone, ItemCarvable.class, "snakestoneSand"); //TODO- eat me! //LanguageRegistry.addName(new ItemStack(blockSandSnakestone, 1, 1), "Sandstone snake block head"); //LanguageRegistry.addName(new ItemStack(blockSandSnakestone, 1, 13), "Sandstone snake block body"); @@ -653,7 +653,7 @@ public class ChiselBlocks if(Configurations.featureEnabled("snakestone")) { blockSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone"); - GameRegistry.registerBlock(blockSnakestone, ItemCarvable.class, blockSnakestone.getUnlocalizedName()); + GameRegistry.registerBlock(blockSnakestone, ItemCarvable.class, "snakestoneStone"); //LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 1), "Stone snake block head"); //LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 13), "Stone snake block body"); Carving.chisel.addVariation("stoneBrick", blockSnakestone, 1, 16); @@ -758,7 +758,7 @@ public class ChiselBlocks { return new BlockMarbleIceStairs(block, meta, helper); } - }, "chisel.iceStairs"); + }, "iceStairs"); } } @@ -826,7 +826,7 @@ public class ChiselBlocks if(Configurations.featureEnabled("snakestoneObsidian")) { blockObsidianSnakestone = (BlockSnakestoneObsidian) new BlockSnakestoneObsidian("Chisel:snakestone/obsidian/").setBlockName("obsidianSnakestone").setHardness(50.0F).setResistance(2000.0F); - GameRegistry.registerBlock(blockObsidianSnakestone, ItemCarvable.class, blockObsidianSnakestone.getUnlocalizedName()); + GameRegistry.registerBlock(blockObsidianSnakestone, ItemCarvable.class, "obsidianSnakestone"); //LanguageRegistry.addName(new ItemStack(blockObsidianSnakestone, 1, 1), "Obsidian snakestone head"); //LanguageRegistry.addName(new ItemStack(blockObsidianSnakestone, 1, 13), "Obsidian snakestone body"); Carving.chisel.addVariation("obsidian", blockObsidianSnakestone, 1, 16); @@ -1140,7 +1140,7 @@ public class ChiselBlocks if(Configurations.featureEnabled("glassStained")) for(int i = 0; i < 16; i++) { - String blockName = "chisel.stainedGlass" + sGNames[i].replaceAll(" ", ""); + final String blockName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); String texName = "glassdyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; int glassPrefix = (i & 3) << 2; @@ -1168,7 +1168,7 @@ public class ChiselBlocks if(Configurations.featureEnabled("glassStainedPane")) for(int i = 0; i < 16; i++) { - String blockName = "chisel.stainedGlassPane" + sGNames[i].replaceAll(" ", ""); + final String blockName = "stainedGlassPane" + sGNames[i].replaceAll(" ", ""); String oreName = "stainedGlassPane" + sGNames[i].replaceAll(" ", ""); String texName = "glasspanedyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; Carving.chisel.addVariation(blockName, Blocks.stained_glass_pane, i, 0); @@ -1251,5 +1251,4 @@ public class ChiselBlocks Blocks.stone.setHarvestLevel("chisel", 0, 0); } - } diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index cfd20bb9..f03a1085 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -290,7 +290,7 @@ public class CarvableHelper void registerBlock(Block block, String name, Class cl) { block.setBlockName(name); - GameRegistry.registerBlock(block, cl, "chisel." + name); + GameRegistry.registerBlock(block, cl, name); chiselBlocks.add(block); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java index 0feedf23..f516e86a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java @@ -29,13 +29,6 @@ public class ItemCarvable extends ItemBlock return i; } - //TODO- to fix some, one must break some - @Override - public String getUnlocalizedName(ItemStack itemstack) - { - return "chisel." + Block.getBlockFromItem(this).getUnlocalizedName(); - } - @Override public IIcon getIconFromDamage(int damage) {