From 32dbd9a4aa17aafc71004e5a017dfe0a96ec9d6c Mon Sep 17 00:00:00 2001 From: Fenn Date: Sat, 12 Jul 2014 11:54:00 +0100 Subject: [PATCH] 1.5.6 and also recipes --- build.gradle | 4 ++-- .../info/jbcs/minecraft/chisel/Chisel.java | 2 +- .../info/jbcs/minecraft/chisel/Crafting.java | 19 +++++++++++++++++++ src/main/resources/mcmod.info | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ef95880f..c9b7a9ad 100644 --- a/build.gradle +++ b/build.gradle @@ -19,12 +19,12 @@ buildscript { } apply plugin: 'forge' -version = "1.5.5a" +version = "1.5.6" group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel" minecraft { - version = "1.7.10-10.13.0.1150" + version = "1.7.10-10.13.0.1180" 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 5f746239..66944f14 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -38,7 +38,7 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; -@Mod(modid = "chisel", name = "Chisel", version = "1.5.5a", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory"/*, dependencies = "after:ForgeMicroblock;"*/) +@Mod(modid = "chisel", name = "Chisel", version = "1.5.6", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory"/*, dependencies = "after:ForgeMicroblock;"*/) public class Chisel { public static ItemChisel chisel; diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index cd285af8..6f68b140 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -6,6 +6,9 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; public class Crafting { @@ -56,6 +59,22 @@ public class Crafting GameRegistry.addRecipe(new ItemStack(Chisel.itemBallOMoss, 1), new Object[]{"XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick}); GameRegistry.addRecipe(new ItemStack(Chisel.itemCloudInABottle, 1), new Object[]{"X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz}); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.blockPaperwall, 8), new Object[]{"ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood"})); + + String[] sGNames = new String[]{ + "White", "Orange", "Magenta", "Light Blue", + "Yellow", "Lime", "Pink", "Gray", + "Light Gray", "Cyan", "Purple", "Blue", + "Brown", "Green", "Red", "Black" + }; + + for(int i = 0; i < 16; i++) + { + OreDictionary.registerOre("stainedClay" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.stained_hardened_clay, 1, i)); + OreDictionary.registerOre("blockWool" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, i)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.blockWoolenClay, 2, i), new Object[] {"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")})); + } + } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index d6441592..2472a090 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "chisel", "name": "Chisel", "description": "A mod that adds in many fancy blocks for decoration, which are crafted utilising the Chisel.", - "version": "1.5.5a", + "version": "1.5.6", "credits": "This mod uses a lot of textures from the Painterly pack: http://painterlypack.net/. Also one stone variation is designed to look like a block from Doku. Oh, and asie for porting the mod to 1.7.2", "logoFile": "", "mcversion": "1.7.2",