upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-11 15:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop "chisel." from all item and block names

Browse Source 
this is the first step towards a more vanilla like naming scheme
This commit is contained in:
EoD committed 2014-10-07 22:33:29 +02:00
1 parent a335c92be7
commit f334260f42
4 files changed
+10 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/info/jbcs/minecraft/chisel/Chisel.java
+3 -15
View File
@@ -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"))
src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java
+6 -7
View File
@@ -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);
}
}
src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
+1 -1
View File
@@ -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);
}
src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java
-7
View File
@@ -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)
{