From 617413b0bcc3dfa9b0a753d833d0fa68a00822b2 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 16 Nov 2013 23:39:01 -0500 Subject: [PATCH] Made Ambrosia crafting recipe use pixie dust instead of dandelions --- .../BiomeGenPromisedLandForest.java | 2 +- .../configuration/BOPCrafting.java | 2 +- .../configuration/BOPEntities.java | 2 +- .../biomesoplenty/textures/items/ambrosia.png | Bin 380 -> 380 bytes .../biomesoplenty/textures/items/pixiedust.png | Bin 515 -> 499 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java index 7f8d171ee..f914368e2 100644 --- a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java @@ -30,7 +30,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase implements IWCFog fillerBlock = (byte)Blocks.holyDirt.get().blockID; customBiomeDecorator.treesPerChunk = 10; customBiomeDecorator.grassPerChunk = -999; - customBiomeDecorator.holyTallGrassPerChunk = 50; + customBiomeDecorator.holyTallGrassPerChunk = 100; customBiomeDecorator.promisedWillowPerChunk = 40; customBiomeDecorator.pinkFlowersPerChunk = 12; customBiomeDecorator.rainbowflowersPerChunk = 10; diff --git a/common/biomesoplenty/configuration/BOPCrafting.java b/common/biomesoplenty/configuration/BOPCrafting.java index ac09e3e3f..b2c53302f 100644 --- a/common/biomesoplenty/configuration/BOPCrafting.java +++ b/common/biomesoplenty/configuration/BOPCrafting.java @@ -265,7 +265,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Blocks.planks.get(), 1, 10), new Object[] {"##", "##", '#', Blocks.bamboo.get()}); GameRegistry.addRecipe(new ItemStack(Items.jarEmpty.get(), 3, 0), new Object[] {"# #", "# #", "###", '#', Block.glass}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.food.get(), 1, 10), new Object[] {Block.plantYellow, new ItemStack(Item.potion, 1, 0), new ItemStack(Blocks.flowers2.get(), 1, 6), new ItemStack(Blocks.coral.get(), 1, 3), new ItemStack(Blocks.plants.get(), 1, 15), new ItemStack(Items.miscItems.get(), 1, 4), new ItemStack(Items.jarFilled.get(), 1, 0), new ItemStack(Items.food.get(), 1, 0), Item.sugar}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.food.get(), 1, 10), new Object[] {new ItemStack(Items.miscItems.get(), 1, 11), new ItemStack(Item.potion, 1, 0), new ItemStack(Blocks.flowers2.get(), 1, 6), new ItemStack(Blocks.coral.get(), 1, 3), new ItemStack(Blocks.plants.get(), 1, 15), new ItemStack(Items.miscItems.get(), 1, 4), new ItemStack(Items.jarFilled.get(), 1, 0), new ItemStack(Items.food.get(), 1, 0), Item.sugar}); GameRegistry.addRecipe(new ItemStack(Blocks.flesh.get(), 1, 0), new Object[] {"##", "##", '#', new ItemStack(Items.miscItems.get(), 1, 3)}); GameRegistry.addRecipe(new ItemStack(Item.rottenFlesh, 1, 0), new Object[] {"FFF", "FPF", "FFF", 'F', new ItemStack(Items.miscItems.get(), 1, 3), 'P', new ItemStack(Items.jarFilled.get(), 1, 1)}); diff --git a/common/biomesoplenty/configuration/BOPEntities.java b/common/biomesoplenty/configuration/BOPEntities.java index e5eda79c3..79e7a893f 100644 --- a/common/biomesoplenty/configuration/BOPEntities.java +++ b/common/biomesoplenty/configuration/BOPEntities.java @@ -117,7 +117,7 @@ public class BOPEntities { { EntityRegistry.registerModEntity(EntityPixie.class, "Pixie", BOPConfigurationIDs.pixieID, BiomesOPlenty.instance, 80, 3, true); - registerEntityEgg(EntityPixie.class, 16560347, 16645116); + registerEntityEgg(EntityPixie.class, 16742365, 16645116); if (Biomes.promisedLandForest.isPresent() && Biomes.promisedLandSwamp.isPresent() && Biomes.promisedLandPlains.isPresent() && Biomes.promisedLandShrub.isPresent()) { diff --git a/resources/assets/biomesoplenty/textures/items/ambrosia.png b/resources/assets/biomesoplenty/textures/items/ambrosia.png index 9e6b3709aebc27bbe91cdf11d5ef864a77421245..058b5177b6dceec9e6a73a43205e3460ad10bfc0 100644 GIT binary patch delta 72 zcmV-O0Js1A0{jAyJPN=701m(bYSxJfkw)bjj+EZ`|F-4M|MiWx{~xTr`Tuk41F*)8 e^*5760V5P)aosDB0s_wf0000&Y4#EKyC`y2lQz?IMNkl91)Gobx@trkM~XCsXW6DP9*L=!bFZ2?i-%Vp0Mj zc(A5%OvqfgWcqvHZ~?BQCq}Af!GpGmxJXPuWHiG{_YHn?j;Q4sZy01pnuO~PkL8rR zv0L>)3WH^9lCTY;lFU#rrwn$x3lgSV);fRh@i&IB8o|?aEa$(47wzUE#8+y|hZ(3p!ryd; z&m5!Du#2tQtyEE?h(F^yDNF=ctOBj16mwEF`6*O~_&exy?;#-=;k7Q^+yDRo07(Z$ JPDHLkV1k9jyCeVr delta 429 zcmV;e0aE_+1A_#RBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wDSvWFL_t(IPqmRt zOF~f;h5a!N8%4iBdSMuZ1W{l_THcCY5Lu8CAwn}FkR}=!LKa00dJTeV(4?R!YSJK# z6750Q!wRooo{LvZ?}dn3aNw}c+Uu;nx8YwfT{BDW`nTw)^y(XH{VKSIa<{^ZV#)K2 zW;#Kp+xhk=?(;#JEq_ZoZ=zYOqA;EiW>$gC6nj5P~OLk{*}Ll~bm_7v2}(MtWhSd=h-ReS?0OeO8}C`{e19ZV8^K|Y>2E@;>DK!} z!k%Ec6&xFIHVA>HL)O|(iA!%ZIQR2gDS