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/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index dc2f4190..47cc064e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -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"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6b573148..ce12487f 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -275,6 +275,7 @@ 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 @@ -464,6 +465,7 @@ 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 @@ -478,5 +480,39 @@ 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 \ No newline at end of file