From a79ef8c4d145fdb34814566cbddf7b6b071d04a1 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 1 Jul 2013 17:32:48 -0400 Subject: [PATCH] Grave texture and config stuff that doesn't work yet --- .../configuration/BOPConfiguration.java | 4 +++ .../configuration/BOPCrafting.java | 29 +++++++++++------- .../BiomesOPlenty/textures/models/grave.png | Bin 357 -> 563 bytes 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 7fdc01753..9098bd17f 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -18,6 +18,8 @@ public class BOPConfiguration { public static boolean addToDefault; public static boolean achievements; public static boolean dungeonLoot; + public static boolean mudCrafting; + public static boolean amethystCrafting; public static boolean vanillaEnhanced; public static boolean netherOverride; public static boolean springWaterPickup; @@ -506,6 +508,8 @@ public class BOPConfiguration { achievements = config.get("Miscellanious Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false); dungeonLoot = config.get("Miscellanious Settings", "Add Custom Dungeon Loot", true).getBoolean(false); springWaterPickup = config.get("Miscellanious Settings", "Enable Spring Water Pickup", true).getBoolean(true); + mudCrafting = config.get("Miscellanious Settings", "Enable Mud Tool/Armor Crafting", true).getBoolean(true); + amethystCrafting = config.get("Miscellanious Settings", "Enable Amethyst Tool/Armor Crafting", true).getBoolean(true); vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false); promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt(); netherOverride = config.get("Dimension Settings", "Enable Nether Override", true).getBoolean(true); diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index 8833c3c5f..2fe32062c 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -163,20 +163,25 @@ public class BOPCrafting GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheGold.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.ingotGold, Character.valueOf('S'), "stickWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheDiamond.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.diamond, Character.valueOf('S'), "stickWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheMud.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Items.mudball.get(), Character.valueOf('S'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('S'), "stickWood" })); //Mud Tools and Armor - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.pickaxeMud.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.shovelMud.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.swordMud.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.axeMud.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.hoeMud.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe(new ItemStack(Items.helmetMud.get(), 1), new Object [] {"###", "# #", Character.valueOf('#'), Items.mudball.get()}); - GameRegistry.addRecipe(new ItemStack(Items.chestplateMud.get(), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), Items.mudball.get()}); - GameRegistry.addRecipe(new ItemStack(Items.leggingsMud.get(), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), Items.mudball.get()}); - GameRegistry.addRecipe(new ItemStack(Items.bootsMud.get(), 1), new Object [] {"# #", "# #", Character.valueOf('#'), Items.mudball.get()}); + if (BOPConfiguration.mudCrafting = true) + { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.pickaxeMud.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.shovelMud.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.swordMud.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.axeMud.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.hoeMud.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + GameRegistry.addRecipe(new ItemStack(Items.helmetMud.get(), 1), new Object [] {"###", "# #", Character.valueOf('#'), Items.mudball.get()}); + GameRegistry.addRecipe(new ItemStack(Items.chestplateMud.get(), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), Items.mudball.get()}); + GameRegistry.addRecipe(new ItemStack(Items.leggingsMud.get(), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), Items.mudball.get()}); + GameRegistry.addRecipe(new ItemStack(Items.bootsMud.get(), 1), new Object [] {"# #", "# #", Character.valueOf('#'), Items.mudball.get()}); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheMud.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Items.mudball.get(), Character.valueOf('S'), "stickWood" })); + } //Amethyst Tools and Armor + if (BOPConfiguration.amethystCrafting = true) + { GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); GameRegistry.addRecipe(new ItemStack(Items.swordAmethyst.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); @@ -186,7 +191,9 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Items.chestplateAmethyst.get(), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); GameRegistry.addRecipe(new ItemStack(Items.leggingsAmethyst.get(), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); GameRegistry.addRecipe(new ItemStack(Items.bootsAmethyst.get(), 1), new Object [] {"# #", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); - + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('S'), Item.ingotIron})); + } + //Flower Bands GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 0), new Object [] {"CCC", "C C", "CCC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0)}); GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 1), new Object [] {"CDC", "D D", "CDC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0), Character.valueOf('D'), new ItemStack(Blocks.flowers.get(), 1, 5)}); diff --git a/src/minecraft/mods/BiomesOPlenty/textures/models/grave.png b/src/minecraft/mods/BiomesOPlenty/textures/models/grave.png index 5403e3d9d3d6de987dafcd3dbf7454e6bb517b9a..5b8790a009fb8803ed334d0e8aec5086419eb74c 100755 GIT binary patch delta 516 zcmV+f0{i{t0<#2=B#|)~f5HF&4#EKyC`y0;000_vMObuGZ)S9NVRB^vP+@6qbS_Rs zR3LUUE;TMOFfjCTp#T5@uSrBfRA@u(ma)#lFbstIh+P;u@fKYeI`z4W?w7ynFsTZ| zPaDWdCm?lP`(itE4Gj$q4Gr&M7=~q){~IDStRG`xx2F0ouMwq`&)eggJ;cGX~O2E^kP*k~4Lk8Csx*b`>; zK#6dgdBAbHKJ4^-OROpdAQ4Z@6M|v>aAk^!1jDRh4-yZte^NNAE?3y$P#Zvkgj&n3 zA!-eVn_Zmt50!$-e|_$Ql3w>A36)H^*+rf=v3xwd0-RJq>C~O!<_RvS`*dF}W^DUB z6qpA~;<;oI!h_xu0AC{h*^57X#fRpAZ;fjhUZJ(6*Tn^icjQrY_-rZ77nJaLi` zStC&r5laHd7SSXE$s=5toe!LL7Jzk5KMTNmxT&-Py6z4K3~Ju&mXmM*0000D0QyNpK~!i%?U+#x zgCGos%g(Xm?Fzp8zC*iKs8%LnGn-oZzX%xA#Fq9iN&o-=z?VE|pq|?W2xBh>S?+06 z`g9-jBpN#I2kLlI9t+bomxw{!FB*4pWG$li%cPwLPT3y5nl_p)CQUpszqHi>s{ti{ z!&-Gf)Bs`$6y!p1E>F$PE(SjS`|^S98EEjm>i0YMn$w5CLhNv0}J}705L{ zT}ed1IoK@%w0bCc6;bxCCWwI2%9JRtSc&ESK|urna0=>GAXoi^>h-_)y#|N_rO7`- z2mcLG2GcmRF$J{DdHYPR?gQ#|e_7`qy*Z%y6lmN5L@)XXX?++rWrY9$002ovPDHLk FV1k)#gckq+