diff --git a/01vbub31.wol.txt b/01vbub31.wol.txt new file mode 100644 index 00000000..f3d6922f --- /dev/null +++ b/01vbub31.wol.txt @@ -0,0 +1,34 @@ +Merge remote-tracking branch 'origin/master' + +Conflicts: + src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +# +# It looks like you may be committing a merge. +# If this is not correct, please remove the file +# .git/MERGE_HEAD +# and try again. + + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# Your branch and 'origin/master' have diverged, +# and have 1 and 7 different commits each, respectively. +# (use "git pull" to merge the remote branch into yours) +# +# All conflicts fixed but you are still merging. +# (use "git commit" to conclude merge) +# +# Changes to be committed: +# +# modified: README.md +# modified: build.gradle +# modified: src/main/java/info/jbcs/minecraft/chisel/Chisel.java +# modified: src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +# modified: src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +# modified: src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +# new file: src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java +# new file: src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java +# modified: src/main/resources/assets/chisel/lang/en_US.lang +# + diff --git a/README.md b/README.md index 9afed916..14a079b1 100644 --- a/README.md +++ b/README.md @@ -1 +1,30 @@ -Chisel is a mod for Minecraft, originaly created by AUTOMATIC_MAIDEN, and ported to 1.7.2 by asie. \ No newline at end of file +Chisel +======= +Chisel is a mod for Minecraft which adds aesthetic blocks to the game through the use of a chisel. Originally created by +AUTOMATIC_MAIDEN, it was ported to Minecraft 1.7.2 by asie, and maintained by Pokefenn. + +Issue Reporting +---------------- +If you wish to report an issue with the mod, please submit one to the issue tracker in this repository. When creating an +issue, please be sure to include... + +-the version of Chisel you are using
+-the version of Forge you are using
+-the crash report (preferrably via Pastebin) generated by the error
+-depending on the error, an image of the problem
+ +Contributing +------------- +Chisel is open-source under the GPL v2 license. As a result, you may contribute to the development of the mod via pull requests. +To set up the mod as to allow you to make changes, do the following: + +1. Keep in mind these setup instructions are for IntelliJ IDEA ONLY, not Eclipse. +2. Clone the repository onto your local system. +3. Open a command prompt from the repository folder. +4. Run the command 'gradlew setupDecompWorkspace'. +5. Then, run 'gradlew idea'. +6. Open IntelliJ and point to either the project folder or the build.gradle file. +7. After opening the project in IntelliJ, run 'gradlew genIntellijRuns' in the command terminal you opened earlier. +8. You now have a functional local copy of Chisel, ready to develop on. + +MAKE SURE TO UPDATE YOUR FORK BEFORE MAKING A PULL REQUEST. \ No newline at end of file diff --git a/build.gradle b/build.gradle index f081a8de..14776faa 100644 --- a/build.gradle +++ b/build.gradle @@ -19,12 +19,12 @@ buildscript { } apply plugin: 'forge' -version = "1.5.4g" +version = "1.5.5" group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel" minecraft { - version = "1.7.10_pre4-10.12.2.1138-prerelease" + version = "1.7.10-10.13.0.1150" assetDir = "eclipse/assets" } diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 906a1843..2b5cc042 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -1,5 +1,7 @@ package info.jbcs.minecraft.chisel; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -10,6 +12,7 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent.Action; import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; @@ -36,7 +39,7 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; -@Mod(modid = "chisel", name = "Chisel", version = "1.5.4g"/*, dependencies = "after:ForgeMicroblock;"*/) +@Mod(modid = "chisel", name = "Chisel", version = "1.5.5", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory"/*, dependencies = "after:ForgeMicroblock;"*/) public class Chisel { public static ItemChisel chisel; @@ -61,7 +64,7 @@ public class Chisel public static final StepSoundEx soundTempleFootstep = new StepSoundEx("dig.stone", "chisel:temple-footstep", "dig.stone", 1.0f); public static final StepSoundEx soundMetalFootstep = new StepSoundEx("chisel:metal", "chisel:metal", "chisel:metal", 1.0f); - static Configuration config; + public static Configuration config; public static int RenderEldritchId; public static int RenderCTMId; @@ -103,6 +106,7 @@ public class Chisel configExists = configFile.exists(); config = new Configuration(configFile); config.load(); + refreshConfig(); tabChisel = new CreativeTabs("tabChisel") { @@ -136,19 +140,7 @@ public class Chisel EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, this, 40, 1, true); GameRegistry.registerItem(smashingRock, "smashingrock"); } - - concreteVelocity = config.get("general", "concreteVelocity", 0.45, "Traversing concrete roads, players will acceleration to this velocity. For reference, normal running speed is about 0.28. Set to 0 to disable acceleration.").getDouble(0.45); - particlesTickrate = config.get("client", "particleTickrate", 1, "Particle tick rate. Greater value = less particles.").getInt(1); - oldPillars = config.get("client", "pillarOldGraphics", false, "Use old pillar textures").getBoolean(false); - disableCTM = !config.get("client", "connectedTextures", true, "Enable connected textures").getBoolean(true); - blockDescriptions = config.get("cslient", "tooltipsUseBlockDescriptions", true, "Make variations of blocks have the same name, and use the description in tooltip to distinguish them.").getBoolean(true); - chiselStoneToCobbleBricks = config.get("general", "chiselStoneToCobbleBricks", true, "Chisel stone to cobblestone and bricks by left-click.").getBoolean(true); - enableChiseling = config.get("general", "enableChiselingLeftClicking", false, "Change blocks to another block using the Chisel and left-click.").getBoolean(false); - ghostCloud = config.get("general", "doesCloudRenderLikeGhost", true).getBoolean(true); - //iceMelt = config.get("general", "doesIceMeltIntoWater", true).getBoolean(true); - ChiselBlocks.load(); - proxy.preInit(); } @@ -177,10 +169,8 @@ public class Chisel GameRegistry.registerWorldGenerator(new ChiselWorldGenerator(ChiselBlocks.blockLimestone, 32, config.get("worldgen", "limestoneAmount", 4, "Amount of limestone to generate in the world; use 0 for none").getInt(4)), 1000); proxy.init(); - - config.save(); - MinecraftForge.EVENT_BUS.register(this); + FMLCommonHandler.instance().bus().register(instance); } @EventHandler @@ -188,4 +178,28 @@ public class Chisel { new ChiselModCompatibility().postInit(event); } + + public static void refreshConfig(){ + concreteVelocity = config.get("general", "concreteVelocity", 0.45, "Traversing concrete roads, players will acceleration to this velocity. For reference, normal running speed is about 0.28. Set to 0 to disable acceleration.").getDouble(0.45); + particlesTickrate = config.get("client", "particleTickrate", 1, "Particle tick rate. Greater value = less particles.").getInt(1); + oldPillars = config.get("client", "pillarOldGraphics", false, "Use old pillar textures").getBoolean(false); + disableCTM = !config.get("client", "connectedTextures", true, "Enable connected textures").getBoolean(true); + blockDescriptions = config.get("client", "tooltipsUseBlockDescriptions", true, "Make variations of blocks have the same name, and use the description in tooltip to distinguish them.").getBoolean(true); + chiselStoneToCobbleBricks = config.get("general", "chiselStoneToCobbleBricks", true, "Chisel stone to cobblestone and bricks by left-click.").getBoolean(true); + enableChiseling = config.get("general", "enableChiselingLeftClicking", false, "Change blocks to another block using the Chisel and left-click.").getBoolean(false); + ghostCloud = config.get("general", "doesCloudRenderLikeGhost", true).getBoolean(true); + //iceMelt = config.get("general", "doesIceMeltIntoWater", true).getBoolean(true); + + if(config.hasChanged()){ + config.save(); + } + } + + + @SubscribeEvent + public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event){ + if (event.modID.equals("chisel")) { + Chisel.refreshConfig(); + } + } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index e143a70a..47cc064e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -328,21 +328,21 @@ public class ChiselBlocks { blockGlass = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(0.3F).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glass", Blocks.glass, 0, 0); - blockGlass.carverHelper.addVariation("Bubble glass", 1, "glass/terrain-glassbubble"); - blockGlass.carverHelper.addVariation("Chinese glass", 2, "glass/terrain-glass-chinese"); - blockGlass.carverHelper.addVariation("Japanese(?) glass", 3, "glass/japanese"); - blockGlass.carverHelper.addVariation("Dungeon glass", 4, "glass/terrain-glassdungeon"); - blockGlass.carverHelper.addVariation("Light glass", 5, "glass/terrain-glasslight"); - blockGlass.carverHelper.addVariation("Borderless glass", 6, "glass/terrain-glassnoborder"); - blockGlass.carverHelper.addVariation("Ornate steel glass", 7, "glass/terrain-glass-ornatesteel"); - blockGlass.carverHelper.addVariation("Screen", 8, "glass/terrain-glass-screen"); - blockGlass.carverHelper.addVariation("Shale glass", 9, "glass/terrain-glassshale"); - blockGlass.carverHelper.addVariation("Steel frame glass", 10, "glass/terrain-glass-steelframe"); - blockGlass.carverHelper.addVariation("Stone frame glass", 11, "glass/terrain-glassstone"); - blockGlass.carverHelper.addVariation("Streak glass", 12, "glass/terrain-glassstreak"); - blockGlass.carverHelper.addVariation("Thick grid glass", 13, "glass/terrain-glass-thickgrid"); - blockGlass.carverHelper.addVariation("Thin grid glass", 14, "glass/terrain-glass-thingrid"); - blockGlass.carverHelper.addVariation("Modern Iron Fence", 15, "glass/a1-glasswindow-ironfencemodern"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.1.desc"), 1, "glass/terrain-glassbubble"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.2.desc"), 2, "glass/terrain-glass-chinese"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.3.desc"), 3, "glass/japanese"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.4.desc"), 4, "glass/terrain-glassdungeon"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.5.desc"), 5, "glass/terrain-glasslight"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.6.desc"), 6, "glass/terrain-glassnoborder"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.7.desc"), 7, "glass/terrain-glass-ornatesteel"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.8.desc"), 8, "glass/terrain-glass-screen"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.9.desc"), 9, "glass/terrain-glassshale"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.10.desc"), 10, "glass/terrain-glass-steelframe"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.11.desc"), 11, "glass/terrain-glassstone"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.12.desc"), 12, "glass/terrain-glassstreak"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.13.desc"), 13, "glass/terrain-glass-thickgrid"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.14.desc"), 14, "glass/terrain-glass-thingrid"); + blockGlass.carverHelper.addVariation(I18n.format("chisel.tile.glass.15.desc"), 15, "glass/a1-glasswindow-ironfencemodern"); blockGlass.carverHelper.register(blockGlass, "glass"); Carving.chisel.registerOre("glass", "blockGlass"); } @@ -351,27 +351,27 @@ public class ChiselBlocks { blockSandstone = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setHardness(0.8F); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 0, 0); - blockSandstone.carverHelper.addVariation("Chiseled Sandstone", 1, Blocks.sandstone, 1); - blockSandstone.carverHelper.addVariation("Smooth Sandstone", 2, Blocks.sandstone, 2); - blockSandstone.carverHelper.addVariation("Faded sandstone", 3, "sandstone/faded"); - blockSandstone.carverHelper.addVariation("Sandstone pillar", 4, "sandstone/column"); - blockSandstone.carverHelper.addVariation("Sandstone pillar capstone", 5, "sandstone/capstone"); - blockSandstone.carverHelper.addVariation("Small sandstone pillar ", 6, "sandstone/small"); - blockSandstone.carverHelper.addVariation("Sandstone pillar base", 7, "sandstone/base"); - blockSandstone.carverHelper.addVariation("Smooth & flat sandstone", 8, "sandstone/smooth"); - blockSandstone.carverHelper.addVariation("Smooth sandstone pillar capstone", 9, "sandstone/smooth-cap"); - blockSandstone.carverHelper.addVariation("Small smooth sandstone pillar", 10, "sandstone/smooth-small"); - blockSandstone.carverHelper.addVariation("Smooth sandstone pillar base", 11, "sandstone/smooth-base"); - blockSandstone.carverHelper.addVariation("Sandstone block", 12, "sandstone/block"); - blockSandstone.carverHelper.addVariation("Small sandstone blocks", 13, "sandstone/blocks"); - blockSandstone.carverHelper.addVariation("Sandstone mosaic", 14, "sandstone/mosaic"); - blockSandstone.carverHelper.addVariation("Stacked sandstone tiles", 15, "sandstone/horizontal-tiles"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.1.desc"), 1, Blocks.sandstone, 1); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.2.desc"), 2, Blocks.sandstone, 2); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.3.desc"), 3, "sandstone/faded"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.4.desc"), 4, "sandstone/column"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.5.desc"), 5, "sandstone/capstone"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.6.desc"), 6, "sandstone/small"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.7.desc"), 7, "sandstone/base"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.8.desc"), 8, "sandstone/smooth"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.9.desc"), 9, "sandstone/smooth-cap"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.10.desc"), 10, "sandstone/smooth-small"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.11.desc"), 11, "sandstone/smooth-base"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.12.desc"), 12, "sandstone/block"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.13.desc"), 13, "sandstone/blocks"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.14.desc"), 14, "sandstone/mosaic"); + blockSandstone.carverHelper.addVariation(I18n.format("chisel.tile.sandstone.15.desc"), 15, "sandstone/horizontal-tiles"); blockSandstone.carverHelper.register(blockSandstone, "sandstone"); Carving.chisel.registerOre("sandstone", "blockSandstone"); if(Chisel.featureEnabled("snakeSandstone")) { - blockSandSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setBlockName("sandSnakestone"); + blockSandSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setBlockName("snakestoneSand"); GameRegistry.registerBlock(blockSandSnakestone, ItemCarvable.class, blockSandSnakestone.getUnlocalizedName()); //TODO- eat me! //LanguageRegistry.addName(new ItemStack(blockSandSnakestone, 1, 1), "Sandstone snake block head"); @@ -384,39 +384,39 @@ public class ChiselBlocks if(Chisel.featureEnabled("sandstoneScribbles")) { blockSandstoneScribbles = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setHardness(0.8F); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 0, "sandstone-scribbles/scribbles-0"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 1, "sandstone-scribbles/scribbles-1"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 2, "sandstone-scribbles/scribbles-2"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 3, "sandstone-scribbles/scribbles-3"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 4, "sandstone-scribbles/scribbles-4"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 5, "sandstone-scribbles/scribbles-5"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 6, "sandstone-scribbles/scribbles-6"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 7, "sandstone-scribbles/scribbles-7"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 8, "sandstone-scribbles/scribbles-8"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 9, "sandstone-scribbles/scribbles-9"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 10, "sandstone-scribbles/scribbles-10"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 11, "sandstone-scribbles/scribbles-11"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 12, "sandstone-scribbles/scribbles-12"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 13, "sandstone-scribbles/scribbles-13"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 14, "sandstone-scribbles/scribbles-14"); - blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 15, "sandstone-scribbles/scribbles-15"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 0, "sandstone-scribbles/scribbles-0"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 1, "sandstone-scribbles/scribbles-1"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 2, "sandstone-scribbles/scribbles-2"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 3, "sandstone-scribbles/scribbles-3"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 4, "sandstone-scribbles/scribbles-4"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 5, "sandstone-scribbles/scribbles-5"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 6, "sandstone-scribbles/scribbles-6"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 7, "sandstone-scribbles/scribbles-7"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 8, "sandstone-scribbles/scribbles-8"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 9, "sandstone-scribbles/scribbles-9"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 10, "sandstone-scribbles/scribbles-10"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 11, "sandstone-scribbles/scribbles-11"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 12, "sandstone-scribbles/scribbles-12"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 13, "sandstone-scribbles/scribbles-13"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 14, "sandstone-scribbles/scribbles-14"); + blockSandstoneScribbles.carverHelper.addVariation(I18n.format("chisel.tile.sandstoneScribbles.desc"), 15, "sandstone-scribbles/scribbles-15"); blockSandstoneScribbles.carverHelper.register(blockSandstoneScribbles, "sandstoneScribbles"); } if(Chisel.featureEnabled("concrete")) { blockConcrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone).setHardness(0.5F); - blockConcrete.carverHelper.addVariation("Concrete", 0, "concrete/default"); - blockConcrete.carverHelper.addVariation("Concrete block", 1, "concrete/block"); - blockConcrete.carverHelper.addVariation("Concrete double slab", 2, "concrete/doubleslab"); - blockConcrete.carverHelper.addVariation("Small concrete blocks", 3, "concrete/blocks"); - blockConcrete.carverHelper.addVariation("Weathered concrete", 4, "concrete/weathered"); - blockConcrete.carverHelper.addVariation("Weathered concrete block", 5, "concrete/weathered-block"); - blockConcrete.carverHelper.addVariation("Weathered concrete double slab", 6, "concrete/weathered-doubleslab"); - blockConcrete.carverHelper.addVariation("Small weathered blocks", 7, "concrete/weathered-blocks"); - blockConcrete.carverHelper.addVariation("Partly weathered concrete", 8, "concrete/weathered-half"); - blockConcrete.carverHelper.addVariation("Partly weathered concrete block", 9, "concrete/weathered-block-half"); - blockConcrete.carverHelper.addVariation("Asphalt", 10, "concrete/asphalt"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.0.desc"), 0, "concrete/default"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.1.desc"), 1, "concrete/block"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.2.desc"), 2, "concrete/doubleslab"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.3.desc"), 3, "concrete/blocks"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.4.desc"), 4, "concrete/weathered"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.5.desc"), 5, "concrete/weathered-block"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.6.desc"), 6, "concrete/weathered-doubleslab"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.7.desc"), 7, "concrete/weathered-blocks"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.8.desc"), 8, "concrete/weathered-half"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.9.desc"), 9, "concrete/weathered-block-half"); + blockConcrete.carverHelper.addVariation(I18n.format("chisel.tile.blockConcrete.10.desc"), 10, "concrete/asphalt"); blockConcrete.carverHelper.register(blockConcrete, "concrete"); OreDictionary.registerOre("blockConcrete", blockConcrete); Carving.chisel.registerOre("concrete", "blockConcrete"); @@ -435,21 +435,21 @@ public class ChiselBlocks { blockIron = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron", Blocks.iron_block, 0, 0); - blockIron.carverHelper.addVariation("Large iron ingots", 1, "iron/terrain-iron-largeingot"); - blockIron.carverHelper.addVariation("Small iron ingots", 2, "iron/terrain-iron-smallingot"); - blockIron.carverHelper.addVariation("Iron gears", 3, "iron/terrain-iron-gears"); - blockIron.carverHelper.addVariation("Iron bricks", 4, "iron/terrain-iron-brick"); - blockIron.carverHelper.addVariation("Iron plates", 5, "iron/terrain-iron-plates"); - blockIron.carverHelper.addVariation("Iron plates with rivets", 6, "iron/terrain-iron-rivets"); - blockIron.carverHelper.addVariation("Iron coin stack heads up", 7, "iron/terrain-iron-coin-heads"); - blockIron.carverHelper.addVariation("Iron coin stack heads down", 8, "iron/terrain-iron-coin-tails"); - blockIron.carverHelper.addVariation("Dark iron crate", 9, "iron/terrain-iron-crate-dark"); - blockIron.carverHelper.addVariation("Light iron crate", 10, "iron/terrain-iron-crate-light"); - blockIron.carverHelper.addVariation("Iron block with moon decoration", 11, "iron/terrain-iron-moon"); - blockIron.carverHelper.addVariation("Iron moon in purple obsidian", 12, "iron/terrain-iron-space"); - blockIron.carverHelper.addVariation("Iron moon in obsidian", 13, "iron/terrain-iron-spaceblack"); - blockIron.carverHelper.addVariation("Iron vents", 14, "iron/terrain-iron-vents"); - blockIron.carverHelper.addVariation("Iron block simple", 15, "iron/terrain-iron-simple"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.1.desc"), 1, "iron/terrain-iron-largeingot"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.2.desc"), 2, "iron/terrain-iron-smallingot"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.3.desc"), 3, "iron/terrain-iron-gears"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.4.desc"), 4, "iron/terrain-iron-brick"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.5.desc"), 5, "iron/terrain-iron-plates"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.6.desc"), 6, "iron/terrain-iron-rivets"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.7.desc"), 7, "iron/terrain-iron-coin-heads"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.8.desc"), 8, "iron/terrain-iron-coin-tails"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.9.desc"), 9, "iron/terrain-iron-crate-dark"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.10.desc"), 10, "iron/terrain-iron-crate-light"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.11.desc"), 11, "iron/terrain-iron-moon"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.12.desc"), 12, "iron/terrain-iron-space"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.13.desc"), 13, "iron/terrain-iron-spaceblack"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.14.desc"), 14, "iron/terrain-iron-vents"); + blockIron.carverHelper.addVariation(I18n.format("chisel.tile.iron.15.desc"), 15, "iron/terrain-iron-simple"); blockIron.carverHelper.register(blockIron, "iron"); Carving.chisel.registerOre("iron", "blockIron"); } @@ -458,20 +458,20 @@ public class ChiselBlocks { blockGold = (BlockBeaconBase) new BlockBeaconBase().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("gold", Blocks.gold_block, 0, 0); - blockGold.carverHelper.addVariation("Large golden ingots", 1, "gold/terrain-gold-largeingot"); - blockGold.carverHelper.addVariation("Small golden ingots", 2, "gold/terrain-gold-smallingot"); - blockGold.carverHelper.addVariation("Golden bricks", 3, "gold/terrain-gold-brick"); - blockGold.carverHelper.addVariation("Gold cart", 4, "gold/terrain-gold-cart"); - blockGold.carverHelper.addVariation("Golden coin stack heads up", 5, "gold/terrain-gold-coin-heads"); - blockGold.carverHelper.addVariation("Golden coin stack heads down", 6, "gold/terrain-gold-coin-tails"); - blockGold.carverHelper.addVariation("Dark gold crate", 7, "gold/terrain-gold-crate-dark"); - blockGold.carverHelper.addVariation("Light gold crate", 8, "gold/terrain-gold-crate-light"); - blockGold.carverHelper.addVariation("Golden plates", 9, "gold/terrain-gold-plates"); - blockGold.carverHelper.addVariation("Iron plates with rivets", 10, "gold/terrain-gold-rivets"); - blockGold.carverHelper.addVariation("Gold block with star decoration", 11, "gold/terrain-gold-star"); - blockGold.carverHelper.addVariation("Golden star in purple obsidian", 12, "gold/terrain-gold-space"); - blockGold.carverHelper.addVariation("Golden star in obsidian", 13, "gold/terrain-gold-spaceblack"); - blockGold.carverHelper.addVariation("Gold block simple", 14, "gold/terrain-gold-simple"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.1.desc"), 1, "gold/terrain-gold-largeingot"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.2.desc"), 2, "gold/terrain-gold-smallingot"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.3.desc"), 3, "gold/terrain-gold-brick"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.4.desc"), 4, "gold/terrain-gold-cart"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.5.desc"), 5, "gold/terrain-gold-coin-heads"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.6.desc"), 6, "gold/terrain-gold-coin-tails"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.7.desc"), 7, "gold/terrain-gold-crate-dark"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.8.desc"), 8, "gold/terrain-gold-crate-light"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.9.desc"), 9, "gold/terrain-gold-plates"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.10.desc"), 10, "gold/terrain-gold-rivets"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.11.desc"), 11, "gold/terrain-gold-star"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.12.desc"), 12, "gold/terrain-gold-space"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.13.desc"), 13, "gold/terrain-gold-spaceblack"); + blockGold.carverHelper.addVariation(I18n.format("chisel.tile.gold.14.desc"), 14, "gold/terrain-gold-simple"); blockGold.carverHelper.register(blockGold, "gold"); Carving.chisel.registerOre("gold", "blockGold"); } @@ -480,18 +480,18 @@ public class ChiselBlocks { blockDiamond = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("diamond", Blocks.diamond_block, 0, 0); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.0.desc"), 1, "diamond/terrain-diamond-embossed"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.1.desc"), 2, "diamond/terrain-diamond-gem"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.2.desc"), 3, "diamond/terrain-diamond-cells"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.3.desc"), 4, "diamond/terrain-diamond-space"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.4.desc"), 5, "diamond/terrain-diamond-spaceblack"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.5.desc"), 6, "diamond/terrain-diamond-simple"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.6.desc"), 7, "diamond/a1-blockdiamond-bismuth"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.7.desc"), 8, "diamond/a1-blockdiamond-crushed"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.8.desc"), 9, "diamond/a1-blockdiamond-four"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.9.desc"), 10, "diamond/a1-blockdiamond-fourornate"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.10.desc"), 11, "diamond/a1-blockdiamond-zelda"); - blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.11.desc"), 12, "diamond/a1-blockdiamond-ornatelayer"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.1.desc"), 1, "diamond/terrain-diamond-embossed"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.2.desc"), 2, "diamond/terrain-diamond-gem"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.3.desc"), 3, "diamond/terrain-diamond-cells"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.4.desc"), 4, "diamond/terrain-diamond-space"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.5.desc"), 5, "diamond/terrain-diamond-spaceblack"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.6.desc"), 6, "diamond/terrain-diamond-simple"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.7.desc"), 7, "diamond/a1-blockdiamond-bismuth"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.8.desc"), 8, "diamond/a1-blockdiamond-crushed"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.9.desc"), 9, "diamond/a1-blockdiamond-four"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.10.desc"), 10, "diamond/a1-blockdiamond-fourornate"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.11.desc"), 11, "diamond/a1-blockdiamond-zelda"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.12.desc"), 12, "diamond/a1-blockdiamond-ornatelayer"); blockDiamond.carverHelper.register(blockDiamond, "diamond"); Carving.chisel.registerOre("diamond", "blockDiamond"); } @@ -500,21 +500,21 @@ public class ChiselBlocks { blockLightstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setHardness(0.3F).setLightLevel(1.0F).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("lightstone", Blocks.glowstone, 0, 0); - blockLightstone.carverHelper.addVariation("Cobble glowstone block", 1, "lightstone/terrain-sulphur-cobble"); - blockLightstone.carverHelper.addVariation("Corroded glowstone blocks", 2, "lightstone/terrain-sulphur-corroded"); - blockLightstone.carverHelper.addVariation("Glowstone blocks with glass", 3, "lightstone/terrain-sulphur-glass"); - blockLightstone.carverHelper.addVariation("Neon glowstone", 4, "lightstone/terrain-sulphur-neon"); - blockLightstone.carverHelper.addVariation("Ornate glowstone blocks", 5, "lightstone/terrain-sulphur-ornate"); - blockLightstone.carverHelper.addVariation("Rocky glowstone", 6, "lightstone/terrain-sulphur-rocky"); - blockLightstone.carverHelper.addVariation("Shale-shaped glowstone", 7, "lightstone/terrain-sulphur-shale"); - blockLightstone.carverHelper.addVariation("Glowstone tiles", 8, "lightstone/terrain-sulphur-tile"); - blockLightstone.carverHelper.addVariation("Fancy glowstone latern", 9, "lightstone/terrain-sulphur-weavelanternlight"); - blockLightstone.carverHelper.addVariation("Crumbling glowstone block", 10, "lightstone/a1-glowstone-cobble"); - blockLightstone.carverHelper.addVariation("Organic glowstone growth block", 11, "lightstone/a1-glowstone-growth"); - blockLightstone.carverHelper.addVariation("Glowstone layers", 12, "lightstone/a1-glowstone-layers"); - blockLightstone.carverHelper.addVariation("Corroded glowstone tiles", 13, "lightstone/a1-glowstone-tilecorroded"); - blockLightstone.carverHelper.addVariation("Glowstone bismuth", 14, "lightstone/glowstone-bismuth"); - blockLightstone.carverHelper.addVariation("Glowstone bismuth panel", 15, "lightstone/glowstone-bismuth-panel"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.1.desc"), 1, "lightstone/terrain-sulphur-cobble"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.2.desc"), 2, "lightstone/terrain-sulphur-corroded"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.3.desc"), 3, "lightstone/terrain-sulphur-glass"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.4.desc"), 4, "lightstone/terrain-sulphur-neon"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.5.desc"), 5, "lightstone/terrain-sulphur-ornate"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.6.desc"), 6, "lightstone/terrain-sulphur-rocky"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.7.desc"), 7, "lightstone/terrain-sulphur-shale"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.8.desc"), 8, "lightstone/terrain-sulphur-tile"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.9.desc"), 9, "lightstone/terrain-sulphur-weavelanternlight"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.10.desc"), 10, "lightstone/a1-glowstone-cobble"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.11.desc"), 11, "lightstone/a1-glowstone-growth"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.12.desc"), 12, "lightstone/a1-glowstone-layers"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.13.desc"), 13, "lightstone/a1-glowstone-tilecorroded"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.14.desc"), 14, "lightstone/glowstone-bismuth"); + blockLightstone.carverHelper.addVariation(I18n.format("chisel.tile.lightstone.15.desc"), 15, "lightstone/glowstone-bismuth-panel"); blockLightstone.carverHelper.register(blockLightstone, "lightstone"); Carving.chisel.registerOre("lightstone", "blockGlowstone"); } @@ -523,14 +523,14 @@ public class ChiselBlocks { blockLapis = (BlockCarvable) new BlockCarvable().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("lapis", Blocks.lapis_block, 0, 0); - blockLapis.carverHelper.addVariation("Chunky lapis block", 1, "lapis/terrain-lapisblock-chunky"); - blockLapis.carverHelper.addVariation("Dark lapis block", 2, "lapis/terrain-lapisblock-panel"); - blockLapis.carverHelper.addVariation("Zelda lapis block", 3, "lapis/terrain-lapisblock-zelda"); - blockLapis.carverHelper.addVariation("Ornate lapis block", 4, "lapis/terrain-lapisornate"); - blockLapis.carverHelper.addVariation("Lapis tile", 5, "lapis/terrain-lapistile"); - blockLapis.carverHelper.addVariation("Lapis panel", 6, "lapis/a1-blocklapis-panel"); - blockLapis.carverHelper.addVariation("Smooth lapis", 7, "lapis/a1-blocklapis-smooth"); - blockLapis.carverHelper.addVariation("Lapis with ornate layer", 8, "lapis/a1-blocklapis-ornatelayer"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.1.desc"), 1, "lapis/terrain-lapisblock-chunky"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.2.desc"), 2, "lapis/terrain-lapisblock-panel"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.3.desc"), 3, "lapis/terrain-lapisblock-zelda"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.4.desc"), 4, "lapis/terrain-lapisornate"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.5.desc"), 5, "lapis/terrain-lapistile"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.6.desc"), 6, "lapis/a1-blocklapis-panel"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.7.desc"), 7, "lapis/a1-blocklapis-smooth"); + blockLapis.carverHelper.addVariation(I18n.format("chisel.tile.lapis.8.desc"), 8, "lapis/a1-blocklapis-ornatelayer"); blockLapis.carverHelper.register(blockLapis, "lapis"); Carving.chisel.registerOre("lapis", "blockLapis"); } @@ -539,17 +539,17 @@ public class ChiselBlocks { blockEmerald = (BlockBeaconBase) new BlockBeaconBase().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("emerald", Blocks.emerald_block, 0, 0); - blockEmerald.carverHelper.addVariation("Emerald panel", 1, "emerald/a1-blockemerald-emeraldpanel"); - blockEmerald.carverHelper.addVariation("Classic emerald panel", 2, "emerald/a1-blockemerald-emeraldpanelclassic"); - blockEmerald.carverHelper.addVariation("Smooth emerald", 3, "emerald/a1-blockemerald-emeraldsmooth"); - blockEmerald.carverHelper.addVariation("Emerald chunk", 4, "emerald/a1-blockemerald-emeraldchunk"); - blockEmerald.carverHelper.addVariation("Emerald with ornate layer", 5, "emerald/a1-blockemerald-emeraldornatelayer"); - blockEmerald.carverHelper.addVariation("Zelda emerald block", 6, "emerald/a1-blockemerald-emeraldzelda"); - blockEmerald.carverHelper.addVariation("Emerald cell", 7, "emerald/a1-blockquartz-cell"); - blockEmerald.carverHelper.addVariation("Emerald bismuth", 8, "emerald/a1-blockquartz-cellbismuth"); - blockEmerald.carverHelper.addVariation("Small emerald blocks", 9, "emerald/a1-blockquartz-four"); - blockEmerald.carverHelper.addVariation("Small ornate emerald blocks", 10, "emerald/a1-blockquartz-fourornate"); - blockEmerald.carverHelper.addVariation("Ornate emerald block", 11, "emerald/a1-blockquartz-ornate"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 1, "emerald/a1-blockemerald-emeraldpanel"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.2.desc"), 2, "emerald/a1-blockemerald-emeraldpanelclassic"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.3.desc"), 3, "emerald/a1-blockemerald-emeraldsmooth"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.4.desc"), 4, "emerald/a1-blockemerald-emeraldchunk"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.5.desc"), 5, "emerald/a1-blockemerald-emeraldornatelayer"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.6.desc"), 6, "emerald/a1-blockemerald-emeraldzelda"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.7.desc"), 7, "emerald/a1-blockquartz-cell"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.8.desc"), 8, "emerald/a1-blockquartz-cellbismuth"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.9.desc"), 9, "emerald/a1-blockquartz-four"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.10.desc"), 10, "emerald/a1-blockquartz-fourornate"); + blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.11.desc"), 11, "emerald/a1-blockquartz-ornate"); blockEmerald.carverHelper.register(blockEmerald, "emerald"); Carving.chisel.registerOre("emerald", "blockEmerald"); } @@ -559,21 +559,21 @@ public class ChiselBlocks blockNetherBrick = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("netherBrick", Blocks.nether_brick, 0, 0); //blockNetherBrick.carverHelper.addVariation("Nether brick", 0, Blocks.nether_brick); - blockNetherBrick.carverHelper.addVariation("Blue nether brick", 1, "netherbrick/a1-netherbrick-brinstar"); - blockNetherBrick.carverHelper.addVariation("Spattered nether brick", 2, "netherbrick/a1-netherbrick-classicspatter"); - blockNetherBrick.carverHelper.addVariation("Nether brick made of guts", 3, "netherbrick/a1-netherbrick-guts"); - blockNetherBrick.carverHelper.addVariation("Dark nether brick made of guts", 4, "netherbrick/a1-netherbrick-gutsdark"); - blockNetherBrick.carverHelper.addVariation("Small nether brick made of guts", 5, "netherbrick/a1-netherbrick-gutssmall"); - blockNetherBrick.carverHelper.addVariation("Blue nether brick with lava", 6, "netherbrick/a1-netherbrick-lavabrinstar"); - blockNetherBrick.carverHelper.addVariation("Brown nether brick", 7, "netherbrick/a1-netherbrick-lavabrown"); - blockNetherBrick.carverHelper.addVariation("Obsidian nether brick", 8, "netherbrick/a1-netherbrick-lavaobsidian"); - blockNetherBrick.carverHelper.addVariation("Stone nether brick", 9, "netherbrick/a1-netherbrick-lavastonedark"); - blockNetherBrick.carverHelper.addVariation("Nether brick made of meat", 10, "netherbrick/a1-netherbrick-meat"); - blockNetherBrick.carverHelper.addVariation("Red nether brick made of meat", 11, "netherbrick/a1-netherbrick-meatred"); - blockNetherBrick.carverHelper.addVariation("Small nether brick made of meat", 12, "netherbrick/a1-netherbrick-meatredsmall"); - blockNetherBrick.carverHelper.addVariation("Small red nether brick made of meat", 13, "netherbrick/a1-netherbrick-meatsmall"); - blockNetherBrick.carverHelper.addVariation("Red nether brick", 14, "netherbrick/a1-netherbrick-red"); - blockNetherBrick.carverHelper.addVariation("Small red nether brick", 15, "netherbrick/a1-netherbrick-redsmall"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.1.desc"), 1, "netherbrick/a1-netherbrick-brinstar"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.2.desc"), 2, "netherbrick/a1-netherbrick-classicspatter"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.3.desc"), 3, "netherbrick/a1-netherbrick-guts"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.4.desc"), 4, "netherbrick/a1-netherbrick-gutsdark"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.5.desc"), 5, "netherbrick/a1-netherbrick-gutssmall"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.6.desc"), 6, "netherbrick/a1-netherbrick-lavabrinstar"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.7.desc"), 7, "netherbrick/a1-netherbrick-lavabrown"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.8.desc"), 8, "netherbrick/a1-netherbrick-lavaobsidian"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.9.desc"), 9, "netherbrick/a1-netherbrick-lavastonedark"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.10.desc"), 10, "netherbrick/a1-netherbrick-meat"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.11.desc"), 11, "netherbrick/a1-netherbrick-meatred"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.12.desc"), 12, "netherbrick/a1-netherbrick-meatredsmall"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.13.desc"), 13, "netherbrick/a1-netherbrick-meatsmall"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.14.desc"), 14, "netherbrick/a1-netherbrick-red"); + blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.15.desc"), 15, "netherbrick/a1-netherbrick-redsmall"); blockNetherBrick.carverHelper.register(blockNetherBrick, "netherBrick"); Carving.chisel.registerOre("netherBrick", "netherBrick"); } @@ -582,20 +582,20 @@ public class ChiselBlocks { blockNetherrack = (BlockCarvable) new BlockCarvable().setHardness(0.4F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("hellrock", Blocks.netherrack, 0, 0); - blockNetherrack.carverHelper.addVariation("Nethegravel with blood", 1, "netherrack/a1-netherrack-bloodgravel"); - blockNetherrack.carverHelper.addVariation("Netherrack with blood", 2, "netherrack/a1-netherrack-bloodrock"); - blockNetherrack.carverHelper.addVariation("Darker netherrack with blood", 3, "netherrack/a1-netherrack-bloodrockgrey"); - blockNetherrack.carverHelper.addVariation("Blue netherrack", 4, "netherrack/a1-netherrack-brinstar"); - blockNetherrack.carverHelper.addVariation("Shale blue netherrack", 5, "netherrack/a1-netherrack-brinstarshale"); - blockNetherrack.carverHelper.addVariation("Classic netherrack", 6, "netherrack/a1-netherrack-classic"); - blockNetherrack.carverHelper.addVariation("Spattered netherrack", 7, "netherrack/a1-netherrack-classicspatter"); - blockNetherrack.carverHelper.addVariation("Netherrack made of guts", 8, "netherrack/a1-netherrack-guts"); - blockNetherrack.carverHelper.addVariation("Dark netherrack made of guts", 9, "netherrack/a1-netherrack-gutsdark"); - blockNetherrack.carverHelper.addVariation("Netherrack made of meat", 10, "netherrack/a1-netherrack-meat"); - blockNetherrack.carverHelper.addVariation("Red netherrack made of meat", 11, "netherrack/a1-netherrack-meatred"); - blockNetherrack.carverHelper.addVariation("Netherrack made of smaller meat chunks", 12, "netherrack/a1-netherrack-meatrock"); - blockNetherrack.carverHelper.addVariation("Dark red netherrack", 13, "netherrack/a1-netherrack-red"); - blockNetherrack.carverHelper.addVariation("Netherrack with lava flowing", 14, "netherrack/a1-netherrack-wells"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.1.desc"), 1, "netherrack/a1-netherrack-bloodgravel"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.2.desc"), 2, "netherrack/a1-netherrack-bloodrock"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.3.desc"), 3, "netherrack/a1-netherrack-bloodrockgrey"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.4.desc"), 4, "netherrack/a1-netherrack-brinstar"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.5.desc"), 5, "netherrack/a1-netherrack-brinstarshale"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.6.desc"), 6, "netherrack/a1-netherrack-classic"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.7.desc"), 7, "netherrack/a1-netherrack-classicspatter"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.8.desc"), 8, "netherrack/a1-netherrack-guts"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.9.desc"), 9, "netherrack/a1-netherrack-gutsdark"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.10.desc"), 10, "netherrack/a1-netherrack-meat"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.11.desc"), 11, "netherrack/a1-netherrack-meatred"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.12.desc"), 12, "netherrack/a1-netherrack-meatrock"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.13.desc"), 13, "netherrack/a1-netherrack-red"); + blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.14.desc"), 14, "netherrack/a1-netherrack-wells"); blockNetherrack.carverHelper.register(blockNetherrack, "hellrock"); Carving.chisel.registerOre("hellrock", "blockNetherrack"); } @@ -604,21 +604,21 @@ public class ChiselBlocks { blockCobblestoneMossy = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("stoneMoss", Blocks.mossy_cobblestone, 0, 0); - blockCobblestoneMossy.carverHelper.addVariation("Aligned mossy cobblestone bricks", 1, "cobblestonemossy/terrain-cobb-brickaligned"); - blockCobblestoneMossy.carverHelper.addVariation("Detailed mossy cobblestone bricks", 2, "cobblestonemossy/terrain-cob-detailedbrick"); - blockCobblestoneMossy.carverHelper.addVariation("Small mossy cobblestone bricks", 3, "cobblestonemossy/terrain-cob-smallbrick"); - blockCobblestoneMossy.carverHelper.addVariation("Large mossy cobblestone tiles", 4, "cobblestonemossy/terrain-cobblargetiledark"); - blockCobblestoneMossy.carverHelper.addVariation("Small mossy cobblestone tiles", 5, "cobblestonemossy/terrain-cobbsmalltile"); - blockCobblestoneMossy.carverHelper.addVariation("French mossy cobblestone tiles", 6, "cobblestonemossy/terrain-cob-french"); - blockCobblestoneMossy.carverHelper.addVariation("French mossy cobblestone tiles", 7, "cobblestonemossy/terrain-cob-french2"); - blockCobblestoneMossy.carverHelper.addVariation("Creeper mossy cobblestone tiles", 8, "cobblestonemossy/terrain-cobmoss-creepdungeon"); - blockCobblestoneMossy.carverHelper.addVariation("Damaged mossy cobblestone tiles", 9, "cobblestonemossy/terrain-mossysmalltiledark"); - blockCobblestoneMossy.carverHelper.addVariation("Huge mossy cobblestone tiles", 10, "cobblestonemossy/terrain-pistonback-dungeontile"); - blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with creeper panel", 11, "cobblestonemossy/terrain-pistonback-darkcreeper"); - blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with dent", 12, "cobblestonemossy/terrain-pistonback-darkdent"); - blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with panel", 13, "cobblestonemossy/terrain-pistonback-darkemboss"); - blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with light panel", 14, "cobblestonemossy/terrain-pistonback-darkmarker"); - blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with dark panel", 15, "cobblestonemossy/terrain-pistonback-darkpanel"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.1.desc"), 1, "cobblestonemossy/terrain-cobb-brickaligned"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.2.desc"), 2, "cobblestonemossy/terrain-cob-detailedbrick"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.3.desc"), 3, "cobblestonemossy/terrain-cob-smallbrick"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.4.desc"), 4, "cobblestonemossy/terrain-cobblargetiledark"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.5.desc"), 5, "cobblestonemossy/terrain-cobbsmalltile"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.6.desc"), 6, "cobblestonemossy/terrain-cob-french"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.7.desc"), 7, "cobblestonemossy/terrain-cob-french2"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.8.desc"), 8, "cobblestonemossy/terrain-cobmoss-creepdungeon"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.9.desc"), 9, "cobblestonemossy/terrain-mossysmalltiledark"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.10.desc"), 10, "cobblestonemossy/terrain-pistonback-dungeontile"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.11.desc"), 11, "cobblestonemossy/terrain-pistonback-darkcreeper"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.12.desc"), 12, "cobblestonemossy/terrain-pistonback-darkdent"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.13.desc"), 13, "cobblestonemossy/terrain-pistonback-darkemboss"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.14.desc"), 14, "cobblestonemossy/terrain-pistonback-darkmarker"); + blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.15.desc"), 15, "cobblestonemossy/terrain-pistonback-darkpanel"); blockCobblestoneMossy.carverHelper.register(blockCobblestoneMossy, "stoneMoss"); Carving.chisel.registerOre("stoneMoss", "blockCobblestoneMossy"); } @@ -628,25 +628,25 @@ public class ChiselBlocks stoneBrick = (BlockCarvable) new BlockCarvable().setHardness(1.5F).setResistance(10.0F).setStepSound(Block.soundTypeStone); for(int i = 0; i < 4; i++) Carving.chisel.addVariation("stoneBrick", Blocks.stonebrick, i, i); - stoneBrick.carverHelper.addVariation("Small stone bricks", 4, "stonebrick/smallbricks"); - stoneBrick.carverHelper.addVariation("Wide stone bricks", 5, "stonebrick/largebricks"); - stoneBrick.carverHelper.addVariation("Small disordered stone bricks", 6, "stonebrick/smallchaotic"); - stoneBrick.carverHelper.addVariation("Disordered stone bricks", 7, "stonebrick/chaoticbricks"); - stoneBrick.carverHelper.addVariation("Disordered stone panels", 8, "stonebrick/chaotic"); - stoneBrick.carverHelper.addVariation("Stone bricks in a fancy arrangement", 9, "stonebrick/fancy"); - stoneBrick.carverHelper.addVariation("Ornate stone brick tiles", 10, "stonebrick/ornate"); - stoneBrick.carverHelper.addVariation("Large ornate stone brick tiles", 11, "stonebrick/largeornate"); - stoneBrick.carverHelper.addVariation("Stone panel", 12, "stonebrick/panel-hard"); - stoneBrick.carverHelper.addVariation("Sunken stone panel", 13, "stonebrick/sunken"); - stoneBrick.carverHelper.addVariation("Ornate stone panel", 14, "stonebrick/ornatepanel"); - stoneBrick.carverHelper.addVariation("Poison stone brick", 15, "stonebrick/poison"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.4.desc"), 4, "stonebrick/smallbricks"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.5.desc"), 5, "stonebrick/largebricks"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.6.desc"), 6, "stonebrick/smallchaotic"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.7.desc"), 7, "stonebrick/chaoticbricks"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.8.desc"), 8, "stonebrick/chaotic"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.9.desc"), 9, "stonebrick/fancy"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.10.desc"), 10, "stonebrick/ornate"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.11.desc"), 11, "stonebrick/largeornate"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.12.desc"), 12, "stonebrick/panel-hard"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.13.desc"), 13, "stonebrick/sunken"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.14.desc"), 14, "stonebrick/ornatepanel"); + stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.15.desc"), 15, "stonebrick/poison"); stoneBrick.carverHelper.register(stoneBrick, "stoneBrick"); Carving.chisel.registerOre("stoneBrick", "blockStoneBrick"); } if(Chisel.featureEnabled("snakestone")) { - blockSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestone"); + blockSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone"); GameRegistry.registerBlock(blockSnakestone, ItemCarvable.class, blockSnakestone.getUnlocalizedName()); //LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 1), "Stone snake block head"); //LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 13), "Stone snake block body"); @@ -660,19 +660,19 @@ public class ChiselBlocks Carving.chisel.addVariation("blockDirt", Blocks.dirt, 0, 0); blockDirt.carverHelper.setChiselBlockName("Dirt"); //blockDirt.carverHelper.addVariation("Dirt", 0, Blocks.dirt); - blockDirt.carverHelper.addVariation("Dirt bricks in disarray", 0, "dirt/bricks"); - blockDirt.carverHelper.addVariation("Dirt bricks imitating nether brick design", 1, "dirt/netherbricks"); - blockDirt.carverHelper.addVariation("Dirt bricks", 2, "dirt/bricks3"); - blockDirt.carverHelper.addVariation("Cobbledirt", 3, "dirt/cobble"); - blockDirt.carverHelper.addVariation("Reinforced cobbledirt", 4, "dirt/reinforced"); - blockDirt.carverHelper.addVariation("Reinforced dirt", 5, "dirt/dirt-reinforced"); - blockDirt.carverHelper.addVariation("Happy dirt", 6, "dirt/happy"); - blockDirt.carverHelper.addVariation("Large dirt bricks", 7, "dirt/bricks2"); - blockDirt.carverHelper.addVariation("Large dirt bricks on top of dirt", 8, "dirt/bricks+dirt2"); - blockDirt.carverHelper.addVariation("Horizontal dirt", 9, "dirt/hor"); - blockDirt.carverHelper.addVariation("Vertical dirt", 10, "dirt/vert"); - blockDirt.carverHelper.addVariation("Dirt layers", 11, "dirt/layers"); - blockDirt.carverHelper.addVariation("Crumbling dirt", 12, "dirt/vertical"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.0.desc"), 0, "dirt/bricks"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.1.desc"), 1, "dirt/netherbricks"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.2.desc"), 2, "dirt/bricks3"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.3.desc"), 3, "dirt/cobble"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.4.desc"), 4, "dirt/reinforced"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.5.desc"), 5, "dirt/dirt-reinforced"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.6.desc"), 6, "dirt/happy"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.7.desc"), 7, "dirt/bricks2"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.8.desc"), 8, "dirt/bricks+dirt2"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.9.desc"), 9, "dirt/hor"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.10.desc"), 10, "dirt/vert"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.11.desc"), 11, "dirt/layers"); + blockDirt.carverHelper.addVariation(I18n.format("chisel.tile.blockDirt.12.desc"), 12, "dirt/vertical"); blockDirt.carverHelper.register(blockDirt, "blockDirt"); blockDirt.setHarvestLevel("shovel", 0); OreDictionary.registerOre("blockDirt", blockDirt); @@ -683,21 +683,21 @@ public class ChiselBlocks { blockIce = (BlockMarbleIce) new BlockMarbleIce().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("ice", Blocks.ice, 0, 0); - blockIce.carverHelper.addVariation("Rough ice block", 1, "ice/a1-ice-light"); - blockIce.carverHelper.addVariation("Cobbleice", 2, "ice/a1-stonecobble-icecobble"); - blockIce.carverHelper.addVariation("Large rough ice bricks", 3, "ice/a1-netherbrick-ice"); - blockIce.carverHelper.addVariation("Large ice bricks", 4, "ice/a1-stonecobble-icebrick"); - blockIce.carverHelper.addVariation("Small ice bricks", 5, "ice/a1-stonecobble-icebricksmall"); - blockIce.carverHelper.addVariation("Fancy glass wall", 6, "ice/a1-stonecobble-icedungeon"); - blockIce.carverHelper.addVariation("Large ice tiles", 7, "ice/a1-stonecobble-icefour"); - blockIce.carverHelper.addVariation("Fancy ice tiles", 8, "ice/a1-stonecobble-icefrench"); - blockIce.carverHelper.addVariation("Sunken ice tiles", 9, "ice/sunkentiles"); - blockIce.carverHelper.addVariation("Disordered ice tiles", 10, "ice/tiles"); - blockIce.carverHelper.addVariation("Ice panel", 11, "ice/a1-stonecobble-icepanel"); - blockIce.carverHelper.addVariation("Ice double slab", 12, "ice/a1-stoneslab-ice"); - blockIce.carverHelper.addVariation("Ice Zelda block", 13, "ice/zelda"); - blockIce.carverHelper.addVariation("Ice Bismuth block", 14, "ice/bismuth"); - blockIce.carverHelper.addVariation("Ice Poison block", 15, "ice/poison"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.1.desc"), 1, "ice/a1-ice-light"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.2.desc"), 2, "ice/a1-stonecobble-icecobble"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.3.desc"), 3, "ice/a1-netherbrick-ice"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.4.desc"), 4, "ice/a1-stonecobble-icebrick"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.7.desc"), 7, "ice/a1-stonecobble-icefour"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.8.desc"), 8, "ice/a1-stonecobble-icefrench"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.9.desc"), 9, "ice/sunkentiles"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.10.desc"), 10, "ice/tiles"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.11.desc"), 11, "ice/a1-stonecobble-icepanel"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.12.desc"), 12, "ice/a1-stoneslab-ice"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.13.desc"), 13, "ice/zelda"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.14.desc"), 14, "ice/bismuth"); + blockIce.carverHelper.addVariation(I18n.format("chisel.tile.ice.15.desc"), 15, "ice/poison"); blockIce.carverHelper.register(blockIce, "ice"); Carving.chisel.registerOre("ice", "blockIce"); @@ -1104,22 +1104,22 @@ public class ChiselBlocks { blockFactory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); blockFactory.carverHelper.setChiselBlockName("blockFactory"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.0.desc"), 0, "factory/dots"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.1.desc"), 1, "factory/rust2"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.2.desc"), 2, "factory/rust"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.3.desc"), 3, "factory/platex"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.4.desc"), 4, "factory/wireframewhite"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.5.desc"), 5, "factory/wireframe"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.6.desc"), 6, "factory/hazard"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.7.desc"), 7, "factory/hazardorange"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.8.desc"), 8, "factory/circuit"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.9.desc"), 9, "factory/metalbox"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.10.desc"), 10, "factory/goldplate"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.11.desc"), 11, "factory/goldplating"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.12.desc"), 12, "factory/grinder"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.13.desc"), 13, "factory/plating"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.14.desc"), 14, "factory/rustplates"); - blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.15.desc"), 15, "factory/column"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.0.desc"), 0, "factory/dots"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.1.desc"), 1, "factory/rust2"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.2.desc"), 2, "factory/rust"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.3.desc"), 3, "factory/platex"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.4.desc"), 4, "factory/wireframewhite"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.5.desc"), 5, "factory/wireframe"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.6.desc"), 6, "factory/hazard"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.7.desc"), 7, "factory/hazardorange"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.8.desc"), 8, "factory/circuit"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.9.desc"), 9, "factory/metalbox"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.10.desc"), 10, "factory/goldplate"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.11.desc"), 11, "factory/goldplating"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.12.desc"), 12, "factory/grinder"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.13.desc"), 13, "factory/plating"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.14.desc"), 14, "factory/rustplates"); + blockFactory.carverHelper.addVariation(I18n.format("chisel.tile.blockFactory.15.desc"), 15, "factory/column"); blockFactory.carverHelper.register(blockFactory, "blockFactory"); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index 5ee48397..293299f5 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -1,5 +1,6 @@ package info.jbcs.minecraft.chisel; +import cpw.mods.fml.common.Optional; import info.jbcs.minecraft.chisel.carving.Carving; import net.minecraft.block.Block; import cpw.mods.fml.common.event.FMLPostInitializationEvent; 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 28928e0c..d839856c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -419,6 +419,7 @@ public class CarvableHelper { for(CarvableVariation variation : variations) { +<<<<<<< HEAD if(variation.blockName.contains("sandstone")) System.out.println(variation.description); @@ -426,6 +427,8 @@ public class CarvableHelper { // System.out.println(variation.description); } +======= +>>>>>>> origin/master list.add(new ItemStack(block, 1, variation.metadata)); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java new file mode 100644 index 00000000..c0c7da88 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java @@ -0,0 +1,15 @@ +package info.jbcs.minecraft.chisel.client.gui; + +import cpw.mods.fml.client.config.GuiConfig; +import info.jbcs.minecraft.chisel.Chisel; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.common.config.Configuration; + +public class GuiChiselConfig extends GuiConfig{ + + public GuiChiselConfig(GuiScreen parent) { + super(parent, new ConfigElement(Chisel.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), + "chisel", false, false, GuiConfig.getAbridgedConfigPath(Chisel.config.toString())); + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java new file mode 100644 index 00000000..9a5039d9 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java @@ -0,0 +1,29 @@ +package info.jbcs.minecraft.chisel.client.gui; + +import cpw.mods.fml.client.IModGuiFactory; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; + +import java.util.Set; + +public class GuiFactory implements IModGuiFactory { + @Override + public void initialize(Minecraft minecraftInstance) { + + } + + @Override + public Class mainConfigGuiClass() { + return GuiChiselConfig.class; + } + + @Override + public Set runtimeGuiCategories() { + return null; + } + + @Override + public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { + return null; + } +} diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 40034c7b..5a1b7cfb 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -153,6 +153,7 @@ chisel.tile.marbleStairs.5.name=Marble Stairs chisel.tile.marbleStairs.6.name=Marble Stairs chisel.tile.marbleStairs.7.name=Marble Stairs +#These are bugged.... so sad :,( chisel.tile.marbleStairs.0.desc=Raw Marble Stairs chisel.tile.marbleStairs.1.desc=Marble Brick Stairs chisel.tile.marbleStairs.2.desc=Classic Marble Panel Stairs @@ -220,6 +221,7 @@ chisel.tile.limestoneStairs.5.name=Limestone Stairs chisel.tile.limestoneStairs.6.name=Limestone Stairs chisel.tile.limestoneStairs.7.name=Limestone Stairs +#These are bugged.... so sad :,( chisel.tile.limestoneStairs.0.desc=Limestone Stairs chisel.tile.limestoneStairs.1.desc=Small Limestone Tiled Stairs chisel.tile.limestoneStairs.2.desc=French Limestone Tiled Stairs @@ -258,23 +260,260 @@ chisel.tile.blockFactory.15.desc=Weared Metal Column #Diamond blocks chisel.tile.diamond.name=Diamond Block -chisel.tile.diamond.0.desc=Embossed diamond block -chisel.tile.diamond.1.desc=Diamond block with panel -chisel.tile.diamond.2.desc=Diamond cells -chisel.tile.diamond.3.desc=Diamonds in purple obsidian -chisel.tile.diamond.4.desc=Diamonds in obsidian -chisel.tile.diamond.5.desc=Diamond block simple +chisel.tile.diamond.0.desc=Embossed Diamond Block +chisel.tile.diamond.1.desc=Diamond Block with Panel +chisel.tile.diamond.2.desc=Diamond Cells +chisel.tile.diamond.3.desc=Diamonds in Purple Obsidian +chisel.tile.diamond.4.desc=Diamonds in Obsidian +chisel.tile.diamond.5.desc=Simple Diamond Block chisel.tile.diamond.6.desc=Bismuth -chisel.tile.diamond.7.desc=Crushed diamond -chisel.tile.diamond.8.desc=Small diamond blocks -chisel.tile.diamond.9.desc=Small ornate diamond blocks -chisel.tile.diamond.10.desc=Zelda diamond block -chisel.tile.diamond.11.desc=Diamond block with ornate layer +chisel.tile.diamond.7.desc=Crushed Diamond +chisel.tile.diamond.8.desc=Small Diamond Blocks +chisel.tile.diamond.9.desc=Small Ornate Diamond Blocks +chisel.tile.diamond.10.desc=Zelda Diamond Block +chisel.tile.diamond.11.desc=Diamond Block with Ornate Layer +#Snakestone +chisel.tile.snakestoneSand.name=Sand Snakestone +chisel.tile.snakestoneStone.name=Stone Snakestone +chisel.tile.snakestoneObsidian.name=Obsidian Snakestone +#Glass blocks +chisel.tile.glass.name=Glass +chisel.tile.glass.1.desc=Bubble glass +chisel.tile.glass.2.desc=Chinese glass +chisel.tile.glass.3.desc=Japanese(?) glass +chisel.tile.glass.4.desc=Dungeon glass +chisel.tile.glass.5.desc=Light glass +chisel.tile.glass.6.desc=Borderless glass +chisel.tile.glass.7.desc=Ornate steel glass +chisel.tile.glass.8.desc=Screen +chisel.tile.glass.9.desc=Shale glass +chisel.tile.glass.10.desc=Steel frame glass +chisel.tile.glass.11.desc=Stone frame glass +chisel.tile.glass.12.desc=Streak glass +chisel.tile.glass.13.desc=Thick grid glass +chisel.tile.glass.14.desc=Thin grid glass +chisel.tile.glass.15.desc=Modern Iron Fence +#Sandstone +chisel.tile.sandstone.name=Sandstone +chisel.tile.sandstone.1.desc=Chiseled Sandstone +chisel.tile.sandstone.2.desc=Smooth Sandstone +chisel.tile.sandstone.3.desc=Faded sandstone +chisel.tile.sandstone.4.desc=Sandstone pillar +chisel.tile.sandstone.5.desc=Sandstone pillar capstone +chisel.tile.sandstone.6.desc=Small sandstone pillar +chisel.tile.sandstone.7.desc=Sandstone pillar base +chisel.tile.sandstone.8.desc=Smooth & flat sandstone +chisel.tile.sandstone.9.desc=Smooth sandstone pillar capstone +chisel.tile.sandstone.10.desc=Small smooth sandstone pillar +chisel.tile.sandstone.11.desc=Smooth sandstone pillar base +chisel.tile.sandstone.12.desc=Sandstone block +chisel.tile.sandstone.13.desc=Small sandstone blocks +chisel.tile.sandstone.14.desc=Sandstone mosaic +chisel.tile.sandstone.15.desc=Stacked sandstone tiles + +#Sandstone scribbles +chisel.tile.sandstoneScribbles.name=Sandstone Scribbles +chisel.tile.sandstoneScribbles.desc=Sandstone scribbles + +#Concrete +chisel.tile.blockConcrete.name=Concrete +chisel.tile.blockConcrete.0.desc=Concrete +chisel.tile.blockConcrete.1.desc=Concrete block +chisel.tile.blockConcrete.2.desc=Concrete double slab +chisel.tile.blockConcrete.3.desc=Small concrete blocks +chisel.tile.blockConcrete.4.desc=Weathered concrete +chisel.tile.blockConcrete.5.desc=Weathered concrete block +chisel.tile.blockConcrete.6.desc=Weathered concrete double slab +chisel.tile.blockConcrete.7.desc=Small weathered blocks +chisel.tile.blockConcrete.8.desc=Partly weathered concrete +chisel.tile.blockConcrete.9.desc=Partly weathered concrete block +chisel.tile.blockConcrete.10.desc=Asphalt + +#Road Line +chisel.tile.roadLine.name=Road Lines + +#Iron Blocks +chisel.tile.iron.name=Iron Block +chisel.tile.iron.1.desc=Large iron ingots +chisel.tile.iron.2.desc=Small iron ingots +chisel.tile.iron.3.desc=Iron gears +chisel.tile.iron.4.desc=Iron bricks +chisel.tile.iron.5.desc=Iron plates +chisel.tile.iron.6.desc=Iron plates with rivets +chisel.tile.iron.7.desc=Iron coin stack heads up +chisel.tile.iron.8.desc=Iron coin stack heads down +chisel.tile.iron.9.desc=Dark iron crate +chisel.tile.iron.10.desc=Light iron crate +chisel.tile.iron.11.desc=Iron block with moon decoration +chisel.tile.iron.12.desc=Iron moon in purple obsidian +chisel.tile.iron.13.desc=Iron moon in obsidian +chisel.tile.iron.14.desc=Iron vents +chisel.tile.iron.15.desc=Simple Iron Block + +#Gold Blocks +chisel.tile.gold.name=Gold Block +chisel.tile.gold.1.desc=Large golden ingots +chisel.tile.gold.2.desc=Small golden ingots +chisel.tile.gold.3.desc=Golden bricks +chisel.tile.gold.4.desc=Gold cart +chisel.tile.gold.5.desc=Golden coin stack heads up +chisel.tile.gold.6.desc=Golden coin stack heads down +chisel.tile.gold.7.desc=Dark gold crate +chisel.tile.gold.8.desc=Light gold crate +chisel.tile.gold.9.desc=Golden plates +chisel.tile.gold.10.desc=Gold plates with rivets +chisel.tile.gold.11.desc=Gold block with star decoration +chisel.tile.gold.12.desc=Golden star in purple obsidian +chisel.tile.gold.13.desc=Golden star in obsidian +chisel.tile.gold.14.desc=Simple Gold Block + +#Glowstone +chisel.tile.lightstone.name=Glowstone +chisel.tile.lightstone.1.desc=Cobble glowstone block +chisel.tile.lightstone.2.desc=Corroded glowstone blocks +chisel.tile.lightstone.3.desc=Glowstone blocks with glass +chisel.tile.lightstone.4.desc=Neon glowstone +chisel.tile.lightstone.5.desc=Ornate glowstone blocks +chisel.tile.lightstone.6.desc=Rocky glowstone +chisel.tile.lightstone.7.desc=Shale-shaped glowstone +chisel.tile.lightstone.8.desc=Glowstone tiles +chisel.tile.lightstone.9.desc=Fancy glowstone lantern +chisel.tile.lightstone.10.desc=Crumbling glowstone block +chisel.tile.lightstone.11.desc=Organic glowstone growth block +chisel.tile.lightstone.12.desc=Glowstone layers +chisel.tile.lightstone.13.desc=Corroded glowstone tiles +chisel.tile.lightstone.14.desc=Glowstone bismuth +chisel.tile.lightstone.15.desc=Glowstone bismuth panel + +#Lapis blocks +chisel.tile.lapis.name=Lapis Block +chisel.tile.lapis.1.desc=Chunky lapis block +chisel.tile.lapis.2.desc=Dark lapis block +chisel.tile.lapis.3.desc=Zelda lapis block +chisel.tile.lapis.4.desc=Ornate lapis block +chisel.tile.lapis.5.desc=Lapis tile +chisel.tile.lapis.6.desc=Lapis panel +chisel.tile.lapis.7.desc=Smooth lapis +chisel.tile.lapis.8.desc=Lapis with ornate layer + +#Emerald Blocks +chisel.tile.emerald.name=Emerald Block +chisel.tile.emerald.1.desc=Emerald panel +chisel.tile.emerald.2.desc=Classic emerald panel +chisel.tile.emerald.3.desc=Smooth emerald +chisel.tile.emerald.4.desc=Emerald chunk +chisel.tile.emerald.5.desc=Emerald with ornate layer +chisel.tile.emerald.6.desc=Zelda emerald block +chisel.tile.emerald.7.desc=Emerald cell +chisel.tile.emerald.8.desc=Emerald bismuth +chisel.tile.emerald.9.desc=Small emerald blocks +chisel.tile.emerald.10.desc=Small ornate emerald blocks +chisel.tile.emerald.11.desc=Ornate emerald block + +#Nether Brick +chisel.tile.netherBrick.name=Nether Brick +chisel.tile.netherBrick.1.desc=Blue nether brick +chisel.tile.netherBrick.2.desc=Spattered nether brick +chisel.tile.netherBrick.3.desc=Nether brick made of guts +chisel.tile.netherBrick.4.desc=Dark nether brick made of guts +chisel.tile.netherBrick.5.desc=Small nether brick made of guts +chisel.tile.netherBrick.6.desc=Blue nether brick with lava +chisel.tile.netherBrick.7.desc=Brown nether brick +chisel.tile.netherBrick.8.desc=Obsidian nether brick +chisel.tile.netherBrick.9.desc=Stone nether brick +chisel.tile.netherBrick.10.desc=Nether brick made of meat +chisel.tile.netherBrick.11.desc=Red nether brick made of meat +chisel.tile.netherBrick.12.desc=Small nether brick made of meat +chisel.tile.netherBrick.13.desc=Small red nether brick made of meat +chisel.tile.netherBrick.14.desc=Red nether brick +chisel.tile.netherBrick.15.desc=Small red nether brick + +#Netherrack +chisel.tile.hellrock.name=Netherrack +chisel.tile.hellrock.1.desc=Nethegravel with blood +chisel.tile.hellrock.2.desc=Netherrack with blood +chisel.tile.hellrock.3.desc=Darker netherrack with blood +chisel.tile.hellrock.4.desc=Blue netherrack +chisel.tile.hellrock.5.desc=Shale blue netherrack +chisel.tile.hellrock.6.desc=Classic netherrack +chisel.tile.hellrock.7.desc=Spattered netherrack +chisel.tile.hellrock.8.desc=Netherrack made of guts +chisel.tile.hellrock.9.desc=Dark netherrack made of guts +chisel.tile.hellrock.10.desc=Netherrack made of meat +chisel.tile.hellrock.11.desc=Red netherrack made of meat +chisel.tile.hellrock.12.desc=Netherrack made of smaller meat chunks +chisel.tile.hellrock.13.desc=Dark red netherrack +chisel.tile.hellrock.14.desc=Netherrack with lava flowing + +#Mossy Stone +chisel.tile.stoneMoss.name=Mossy Cobblestone +chisel.tile.stoneMoss.1.desc=Aligned mossy cobblestone bricks +chisel.tile.stoneMoss.2.desc=Detailed mossy cobblestone bricks +chisel.tile.stoneMoss.3.desc=Small mossy cobblestone bricks +chisel.tile.stoneMoss.4.desc=Large mossy cobblestone tiles +chisel.tile.stoneMoss.5.desc=Small mossy cobblestone tiles +chisel.tile.stoneMoss.6.desc=French mossy cobblestone tiles +chisel.tile.stoneMoss.7.desc=French mossy cobblestone tiles +chisel.tile.stoneMoss.8.desc=Creeper mossy cobblestone tiles +chisel.tile.stoneMoss.9.desc=Damaged mossy cobblestone tiles +chisel.tile.stoneMoss.10.desc=Huge mossy cobblestone tiles +chisel.tile.stoneMoss.11.desc=Mossy cobblestone with creeper panel +chisel.tile.stoneMoss.12.desc=Mossy cobblestone with dent +chisel.tile.stoneMoss.13.desc=Mossy cobblestone with pane +chisel.tile.stoneMoss.14.desc=Mossy cobblestone with light panel +chisel.tile.stoneMoss.15.desc=Mossy cobblestone with dark panel + +#Stone Bricks +chisel.tile.stoneBrick.name=Stone Bricks +chisel.tile.stoneBrick.4.desc=Small stone bricks +chisel.tile.stoneBrick.5.desc=Wide stone bricks +chisel.tile.stoneBrick.6.desc=Small disordered stone bricks +chisel.tile.stoneBrick.7.desc=Disordered stone bricks +chisel.tile.stoneBrick.8.desc=Disordered stone panels +chisel.tile.stoneBrick.9.desc=Stone bricks in a fancy arrangement +chisel.tile.stoneBrick.10.desc=Ornate stone brick tiles +chisel.tile.stoneBrick.11.desc=Large ornate stone brick tiles +chisel.tile.stoneBrick.12.desc=Stone panel +chisel.tile.stoneBrick.13.desc=Sunken stone panel +chisel.tile.stoneBrick.14.desc=Ornate stone panel +chisel.tile.stoneBrick.15.desc=Poison stone brick + +#Dirt +chisel.tile.blockDirt.name=Dirt +chisel.tile.blockDirt.0.desc=Dirt bricks in disarray +chisel.tile.blockDirt.1.desc=Dirt bricks imitating nether brick design +chisel.tile.blockDirt.2.desc=Dirt bricks +chisel.tile.blockDirt.3.desc=Cobbledirt +chisel.tile.blockDirt.4.desc=Reinforced cobbledirt +chisel.tile.blockDirt.5.desc=Reinforced dirt +chisel.tile.blockDirt.6.desc=Happy dirt +chisel.tile.blockDirt.7.desc=Large dirt bricks +chisel.tile.blockDirt.8.desc=Large dirt bricks on top of dirt +chisel.tile.blockDirt.9.desc=Horizontal dirt +chisel.tile.blockDirt.10.desc=Vertical dirt +chisel.tile.blockDirt.11.desc=Dirt layers +chisel.tile.blockDirt.12.desc=Crumbling dirt + +#Ice +chisel.tile.ice.name=Ice +chisel.tile.ice.1.desc=Rough ice block +chisel.tile.ice.2.desc=Cobbleice +chisel.tile.ice.3.desc=Large rough ice bricks +chisel.tile.ice.4.desc=Large ice bricks +chisel.tile.ice.5.desc=Small ice bricks +chisel.tile.ice.6.desc=Fancy glass wall +chisel.tile.ice.7.desc=Large ice tiles +chisel.tile.ice.8.desc=Fancy ice tiles +chisel.tile.ice.9.desc=Sunken ice tiles +chisel.tile.ice.10.desc=Disordered ice tiles +chisel.tile.ice.11.desc=Ice panel +chisel.tile.ice.12.desc=Ice double slab +chisel.tile.ice.13.desc=Ice Zelda block +chisel.tile.ice.14.desc=Ice Bismuth block +chisel.tile.ice.15.desc=Ice Poison block # Creative Tab localizations itemGroup.tabChisel=Chisel Blocks - -