diff --git a/build.gradle b/build.gradle index a573c217..14776faa 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guid archivesBaseName = "Chisel" minecraft { - version = "1.7.10_pre4-10.12.2.1149-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..1ce0b785 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -36,7 +36,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 +61,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; diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index a7d8b9b4..24e8a44e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -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.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.register(blockEmerald, "emerald"); Carving.chisel.registerOre("emerald", "blockEmerald"); } 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 b42f4fd1..b14dbc22 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -419,13 +419,6 @@ public class CarvableHelper { for(CarvableVariation variation : variations) { - if(variation.blockName.contains("cobblestone")) - System.out.println(variation.description); - - if(variation.metadata == 1) - { - // System.out.println(variation.description); - } 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..922d2c67 --- /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 51886d74..a49ad32d 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -312,7 +312,7 @@ 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.name=Sandstone Scribbles chisel.tile.sandstoneScribbles.desc=Sandstone scribbles #Concrete @@ -332,8 +332,83 @@ 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 # Creative Tab localizations itemGroup.tabChisel=Chisel Blocks