From bb47c6450168a5dfb5c510b729e328ddacf15552 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 2 Feb 2014 14:32:34 -0500 Subject: [PATCH] Made pixies spawn in the Mystic Grove. Added ichor (Soon to be dropped by imps) --- .../common/biomes/BiomeGenThicket.java | 18 ++++++- .../biomesoplenty/common/core/BOPBiomes.java | 2 +- .../common/core/BOPCrafting.java | 44 +++++++++--------- .../common/core/BOPEntities.java | 5 +- .../common/items/ItemBOPMisc.java | 2 +- .../assets/biomesoplenty/lang/en_US.lang | 1 + .../biomesoplenty/textures/items/ichor.png | Bin 0 -> 306 bytes 7 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 src/main/resources/assets/biomesoplenty/textures/items/ichor.png diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java index f6e828639..43fe218b8 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java @@ -29,8 +29,8 @@ public class BiomeGenThicket extends BOPBiome this.theBiomeDecorator.grassPerChunk = 1; this.bopWorldFeatures.bopFlowersPerChunk = 5; - this.bopWorldFeatures.thornsPerChunk = 25; - this.bopWorldFeatures.shrubsPerChunk = 15; + this.bopWorldFeatures.thornsPerChunk = 55; + this.bopWorldFeatures.shrubsPerChunk = 5; } @Override @@ -55,4 +55,18 @@ public class BiomeGenThicket extends BOPBiome { return random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.tallgrass, 1) : new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 10); } + + @Override + //TODO: getBiomeGrassColor() + public int func_150558_b(int p_150558_1_, int p_150558_2_, int p_150558_3_) + { + return 11049591; + } + + @Override + //TODO: getBiomeFoliageColor() + public int func_150571_c(int x, int y, int z) + { + return 10854765; + } } diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index 2dec64dfb..44a611baa 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -166,7 +166,7 @@ public class BOPBiomes registerBiome(new BOPBiomeEntry(new BiomeGenSludgepit(BOPConfigurationIDs.sludgepitID).setBiomeName("Sludgepit"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenSpruceWoods(BOPConfigurationIDs.spruceWoodsID).setBiomeName("Spruce Woods"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenTemperateRainforest(BOPConfigurationIDs.temperateRainforestID).setBiomeName("Temperate Rainforest"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenThicket(BOPConfigurationIDs.thicketID).setBiomeName("Thicket"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenThicket(BOPConfigurationIDs.thicketID).setBiomeName("Thicket"), TemperatureType.COOL, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenTimber(BOPConfigurationIDs.timberID).setBiomeName("Timber"), TemperatureType.COOL, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenTropicalRainforest(BOPConfigurationIDs.tropicalRainforestID).setBiomeName("Tropical Rainforest"), TemperatureType.HOT, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenTropics(BOPConfigurationIDs.tropicsID).setBiomeName("Tropics"), TemperatureType.HOT, 25)); diff --git a/src/main/java/biomesoplenty/common/core/BOPCrafting.java b/src/main/java/biomesoplenty/common/core/BOPCrafting.java index 5f0f99e03..78f1534d4 100644 --- a/src/main/java/biomesoplenty/common/core/BOPCrafting.java +++ b/src/main/java/biomesoplenty/common/core/BOPCrafting.java @@ -37,30 +37,30 @@ public class BOPCrafting private static void addCraftingRecipes() { //Plants - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 6), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,1)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 13), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,7)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 14), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,5)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,6)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 7), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,15)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 12), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,4)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,8)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 10), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,3)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 8), new Object[] {new ItemStack(BOPItemHelper.get("misc"), 1, 1)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 12), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,7)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 6), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,4)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 6), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,1)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 13), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,7)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 14), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,5)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,6)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 7), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,15)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 12), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,4)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,8)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 10), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,3)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 8), new Object[] {new ItemStack(BOPItemHelper.get("misc"), 1, 1)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 12), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,7)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 6), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,4)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,0)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,1)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 14), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,2)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,3)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 2, 11), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,4)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,5)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,0)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,1)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 14), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,2)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,3)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 11), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,4)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,5)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 5), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,2)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 6), new Object[] {new ItemStack(BOPBlockHelper.get("plants"),1,7)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 7), new Object[] {new ItemStack(BOPBlockHelper.get("moss"),1,0)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,9)}); - GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 2, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,2)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,2)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 6), new Object[] {new ItemStack(BOPBlockHelper.get("plants"),1,7)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 7), new Object[] {new ItemStack(BOPBlockHelper.get("moss"),1,0)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,9)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,2)}); GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("food"), 4, 3), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,13)}); //Brick stairs and slabs diff --git a/src/main/java/biomesoplenty/common/core/BOPEntities.java b/src/main/java/biomesoplenty/common/core/BOPEntities.java index a0e2375d6..364bea7d3 100644 --- a/src/main/java/biomesoplenty/common/core/BOPEntities.java +++ b/src/main/java/biomesoplenty/common/core/BOPEntities.java @@ -100,10 +100,7 @@ public class BOPEntities registerEntityEgg(EntityPixie.class, 16742365, 16645116); - /*TODO: FEATURE if (Biomes.promisedLandForest.isPresent() && Biomes.promisedLandSwamp.isPresent() && Biomes.promisedLandPlains.isPresent() && Biomes.promisedLandShrub.isPresent()) - { - EntityRegistry.addSpawn(EntityPixie.class, 4, 1, 3, EnumCreatureType.monster, Biomes.promisedLandForest.get(), Biomes.promisedLandSwamp.get(), Biomes.promisedLandPlains.get(), Biomes.promisedLandShrub.get()); - }*/ + EntityRegistry.addSpawn(EntityPixie.class, 8, 1, 3, EnumCreatureType.ambient, BOPBiomeHelper.get("mysticGrove")); } } diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java b/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java index 988730ace..e4cce98a8 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPMisc.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBOPMisc extends Item { - private static String[] items = {"mudbrick", "ash", "emptyhoneycomb", "fleshchunk", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ghastlysoul", "pixiedust"}; + private static String[] items = {"mudbrick", "ash", "emptyhoneycomb", "fleshchunk", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ghastlysoul", "pixiedust", "ichor"}; @SideOnly(Side.CLIENT) private IIcon[] textures; diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index d57dd28cd..adeef0c0b 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -323,6 +323,7 @@ item.misc.whitedye.name=White Dye item.misc.blackdye.name=Black Dye item.misc.ghastlysoul.name=Ghastly Soul item.misc.pixiedust.name=Pixie Dust +item.misc.ichor.name=Ichor item.jarEmpty.name=Empty Jar item.jarFilled.jarhoney.name=Honey Jar diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ichor.png b/src/main/resources/assets/biomesoplenty/textures/items/ichor.png new file mode 100644 index 0000000000000000000000000000000000000000..f058895b3a182ec5075e19e10f6d13956a5f8fe6 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA`?3 zi(`m|fAWvwv+a#a4#CV}qS=4kj|C)#G@NFb&}Q#1r1)dj`TytLZ8u6con@HuZ2$UM z2PJM!=&L9Van49*2w;v-p7iXx^xY0)29^hH4u+1*_vUV3zO2xzz?0l;a>(TVytf_q z878o8nBQo2NTlgVK^7Zh3A4kjiF3JxoUi@)_}JZojd=#6fz%R#NMj>;76+;S|NrwJ wOJKO%!FR#*5QC4gBXb8^h+#v`o5KtY?Ocjler>zDfi7q8boFyt=akR{0Q=Ht9smFU literal 0 HcmV?d00001