diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 1ce0b785..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; @@ -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 24e8a44e..dc2f4190 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -540,16 +540,16 @@ 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(I18n.format("chisel.tile.emerald.1.desc"), 1, "emerald/a1-blockemerald-emeraldpanel"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 2, "emerald/a1-blockemerald-emeraldpanelclassic"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 3, "emerald/a1-blockemerald-emeraldsmooth"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 4, "emerald/a1-blockemerald-emeraldchunk"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 5, "emerald/a1-blockemerald-emeraldornatelayer"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 6, "emerald/a1-blockemerald-emeraldzelda"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 7, "emerald/a1-blockquartz-cell"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 8, "emerald/a1-blockquartz-cellbismuth"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 9, "emerald/a1-blockquartz-four"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 10, "emerald/a1-blockquartz-fourornate"); - blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 11, "emerald/a1-blockquartz-ornate"); + 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"); 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 index 922d2c67..c0c7da88 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java @@ -10,6 +10,6 @@ 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())); + "chisel", false, false, GuiConfig.getAbridgedConfigPath(Chisel.config.toString())); } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index a49ad32d..6b573148 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -274,6 +274,7 @@ chisel.tile.diamond.11.desc=Diamond Block with Ornate Layer #Snakestone chisel.tile.snakestoneSand.name=Sand Snakestone +chisel.tile.snakestoneStone.name=Stone Snakestone #Glass blocks chisel.tile.glass.name=Glass @@ -410,7 +411,72 @@ 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 + +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 + # Creative Tab localizations -itemGroup.tabChisel=Chisel Blocks - - +itemGroup.tabChisel=Chisel Blocks \ No newline at end of file