From 8ca1179e04a04dd3332f567b69c731509495686d Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 23 Dec 2013 20:34:39 -0800 Subject: [PATCH] Move Grass {Flower} registry to BiomeGenBase as 1.7 made flowers Biome specifc, this means modders who wish to add global base flowers need to add them to all the biomes indavidually. --- .../net/minecraft/block/BlockGrass.java.patch | 16 ++--- .../inventory/GuiContainerCreative.java.patch | 2 +- .../world/biome/BiomeGenBase.java.patch | 68 +++++++++++++++++-- .../world/biome/BiomeGenForest.java.patch | 26 +++++++ .../world/biome/BiomeGenPlains.java.patch | 26 +++++++ .../world/biome/BiomeGenSwamp.java.patch | 11 +++ .../net/minecraftforge/common/ForgeHooks.java | 22 +----- .../minecraftforge/common/MinecraftForge.java | 12 ---- 8 files changed, 133 insertions(+), 50 deletions(-) create mode 100644 patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch create mode 100644 patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.java.patch create mode 100644 patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java.patch diff --git a/patches/minecraft/net/minecraft/block/BlockGrass.java.patch b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch index 74b705ed77..d0883a8eac 100644 --- a/patches/minecraft/net/minecraft/block/BlockGrass.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch @@ -1,14 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockGrass.java +++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java -@@ -12,6 +12,7 @@ - import net.minecraft.world.ColorizerGrass; - import net.minecraft.world.IBlockAccess; - import net.minecraft.world.World; -+import net.minecraftforge.common.ForgeHooks; - import org.apache.logging.log4j.LogManager; - import org.apache.logging.log4j.Logger; - -@@ -43,7 +44,7 @@ +@@ -43,7 +43,7 @@ { if (!p_149674_1_.isRemote) { @@ -17,7 +9,7 @@ { p_149674_1_.func_147449_b(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.dirt); } -@@ -56,7 +57,7 @@ +@@ -56,7 +56,7 @@ int k1 = p_149674_4_ + p_149674_5_.nextInt(3) - 1; Block block = p_149674_1_.func_147439_a(i1, j1 + 1, k1); @@ -26,7 +18,7 @@ { p_149674_1_.func_147449_b(i1, j1, k1, Blocks.grass); } -@@ -184,15 +185,7 @@ +@@ -184,15 +184,7 @@ } else { @@ -39,7 +31,7 @@ - int i2 = BlockFlower.func_149856_f(s); - p_149853_1_.func_147465_d(i1, j1, k1, blockflower, i2, 3); - } -+ ForgeHooks.plantGrass(p_149853_1_, p_149853_2_, i1, j1, k1); ++ p_149853_1_.getBiomeGenForCoords(i1, k1).plantFlower(p_149853_1_, p_149853_2_, i1, j1, k1); } } diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch index 98cf1ad17a..1200314f8d 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch @@ -64,7 +64,7 @@ + updateFilteredItems(containercreative); + } -+ //split from above for sutom search tabs ++ //split from above for custom search tabs + private void updateFilteredItems(GuiContainerCreative.ContainerCreative containercreative) + { + Iterator iterator; diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch index 0f11581217..1c13b47e14 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch @@ -29,7 +29,13 @@ biomeList[par1] = this; this.theBiomeDecorator = this.createBiomeDecorator(); this.spawnableCreatureList.add(new BiomeGenBase.SpawnListEntry(EntitySheep.class, 12, 4, 4)); -@@ -193,7 +201,7 @@ +@@ -188,12 +196,13 @@ + this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityWitch.class, 5, 1, 1)); + this.spawnableWaterCreatureList.add(new BiomeGenBase.SpawnListEntry(EntitySquid.class, 10, 4, 4)); + this.spawnableCaveCreatureList.add(new BiomeGenBase.SpawnListEntry(EntityBat.class, 10, 8, 8)); ++ this.addDefaultFlowers(); + } + // JAVADOC METHOD $$ func_76729_a public BiomeDecorator createBiomeDecorator() { @@ -38,7 +44,7 @@ } // JAVADOC METHOD $$ func_76732_a -@@ -373,7 +381,7 @@ +@@ -373,7 +382,7 @@ { double d0 = (double)MathHelper.clamp_float(this.func_150564_a(p_150558_1_, p_150558_2_, p_150558_3_), 0.0F, 1.0F); double d1 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); @@ -47,7 +53,7 @@ } @SideOnly(Side.CLIENT) -@@ -381,7 +389,7 @@ +@@ -381,7 +390,7 @@ { double d0 = (double)MathHelper.clamp_float(this.func_150564_a(p_150571_1_, p_150571_2_, p_150571_3_), 0.0F, 1.0F); double d1 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); @@ -56,11 +62,13 @@ } public boolean func_150559_j() -@@ -529,6 +537,34 @@ +@@ -529,6 +538,88 @@ } } + /* ========================================= FORGE START ======================================*/ ++ protected List flowers = new ArrayList(); ++ + public BiomeDecorator getModdedBiomeDecorator(BiomeDecorator original) + { + return new DeferredBiomeDecorator(original); @@ -86,6 +94,58 @@ + MinecraftForge.EVENT_BUS.post(event); + return event.newColor; + } ++ ++ /** ++ * Weighted random holder class used to hold possible flowers ++ * that can spawn in this biome when bonemeal is used on grass. ++ */ ++ public static class FlowerEntry extends WeightedRandom.Item ++ { ++ public final Block block; ++ public final int metadata; ++ public FlowerEntry(Block block, int meta, int weight) ++ { ++ super(weight); ++ this.block = block; ++ this.metadata = meta; ++ } ++ } ++ ++ /** ++ * Adds the default flowers, as of 1.7, it is 2 yellow, and 1 red. I chose 10 to allow some wiggle room in the numbers. ++ */ ++ public void addDefaultFlowers() ++ { ++ this.flowers.add(new FlowerEntry(Blocks.yellow_flower, 0, 20)); ++ this.flowers.add(new FlowerEntry(Blocks.red_flower, 0, 10)); ++ } ++ ++ /** Register a new plant to be planted when bonemeal is used on grass. ++ * @param block The block to place. ++ * @param metadata The metadata to set for the block when being placed. ++ * @param weight The weight of the plant, where red flowers are ++ * 10 and yellow flowers are 20. ++ */ ++ public void addFlower(Block block, int metadata, int weight) ++ { ++ this.flowers.add(new FlowerEntry(block, metadata, weight)); ++ } ++ ++ public void plantFlower(World world, Random rand, int x, int y, int z) ++ { ++ BiomeGenBase biome = world.getBiomeGenForCoords(x, z); ++ String flowername = biome.func_150572_a(rand, x, y, z); ++ ++ FlowerEntry flower = (FlowerEntry)WeightedRandom.getRandomItem(rand, flowers); ++ if (flower == null || flower.block == null || !flower.block.func_149718_j(world, x, y, z)) ++ { ++ return; ++ } ++ ++ world.func_147465_d(x, y, z, flower.block, flower.metadata, 3); ++ } ++ ++ + /* ========================================= FORGE END ======================================*/ + static diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch new file mode 100644 index 0000000000..e2ee118170 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.java.patch @@ -0,0 +1,26 @@ +--- ../src-base/minecraft/net/minecraft/world/biome/BiomeGenForest.java ++++ ../src-work/minecraft/net/minecraft/world/biome/BiomeGenForest.java +@@ -5,6 +5,7 @@ + import java.util.Random; + import net.minecraft.block.BlockFlower; + import net.minecraft.entity.passive.EntityWolf; ++import net.minecraft.init.Blocks; + import net.minecraft.util.MathHelper; + import net.minecraft.world.World; + import net.minecraft.world.gen.feature.WorldGenAbstractTree; +@@ -53,6 +54,15 @@ + { + this.theBiomeDecorator.treesPerChunk = -999; + } ++ ++ if (this.field_150632_aF == 1) ++ { ++ this.flowers.clear(); ++ for (int x = 0; x < BlockFlower.field_149859_a.length; x++) ++ { ++ this.addFlower(Blocks.red_flower, x, 10); ++ } ++ } + } + + public BiomeGenBase func_150557_a(int p_150557_1_, boolean p_150557_2_) diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.java.patch new file mode 100644 index 0000000000..ba97b493c7 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.java.patch @@ -0,0 +1,26 @@ +--- ../src-base/minecraft/net/minecraft/world/biome/BiomeGenPlains.java ++++ ../src-work/minecraft/net/minecraft/world/biome/BiomeGenPlains.java +@@ -3,6 +3,7 @@ + import java.util.Random; + import net.minecraft.block.BlockFlower; + import net.minecraft.entity.passive.EntityHorse; ++import net.minecraft.init.Blocks; + import net.minecraft.world.World; + + public class BiomeGenPlains extends BiomeGenBase +@@ -19,6 +20,15 @@ + this.theBiomeDecorator.treesPerChunk = -999; + this.theBiomeDecorator.flowersPerChunk = 4; + this.theBiomeDecorator.grassPerChunk = 10; ++ this.flowers.clear(); ++ this.addFlower(Blocks.red_flower, 4, 3); ++ this.addFlower(Blocks.red_flower, 5, 3); ++ this.addFlower(Blocks.red_flower, 6, 3); ++ this.addFlower(Blocks.red_flower, 7, 3); ++ this.addFlower(Blocks.red_flower, 0, 20); ++ this.addFlower(Blocks.red_flower, 3, 20); ++ this.addFlower(Blocks.red_flower, 8, 20); ++ this.addFlower(Blocks.yellow_flower, 0, 30); + } + + public String func_150572_a(Random p_150572_1_, int p_150572_2_, int p_150572_3_, int p_150572_4_) diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java.patch new file mode 100644 index 0000000000..508ffe182c --- /dev/null +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java.patch @@ -0,0 +1,11 @@ +--- ../src-base/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java ++++ ../src-work/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java +@@ -30,6 +30,8 @@ + this.theBiomeDecorator.grassPerChunk = 5; + this.waterColorMultiplier = 14745518; + this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntitySlime.class, 1, 1, 1)); ++ this.flowers.clear(); ++ this.addFlower(Blocks.red_mushroom_block, 0, 10); + } + + public WorldGenAbstractTree func_150567_a(Random p_150567_1_) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 2faf4da372..145a3c5c77 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -81,26 +81,8 @@ public class ForgeHooks this.seed = seed; } } - static final List grassList = new ArrayList(); static final List seedList = new ArrayList(); - public static void plantGrass(World world, Random rand, int x, int y, int z) - { - BiomeGenBase biome = world.getBiomeGenForCoords(x, z); - String flowername = biome.func_150572_a(rand, x, y, z); - - /* - field_149992_a.debug("Flower in " + p_149853_1_.getBiomeGenForCoords(i1, k1).biomeName + ": " + s); - BlockFlower blockflower = BlockFlower.func_149857_e(s); - */ - GrassEntry grass = (GrassEntry)WeightedRandom.getRandomItem(world.rand, grassList); - if (grass == null || grass.block == null || !grass.block.func_149718_j(world, x, y, z)) - { - return; - } - world.func_147465_d(x, y, z, grass.block, grass.metadata, 3); - } - public static ItemStack getGrassSeed(World world) { SeedEntry entry = (SeedEntry)WeightedRandom.getRandomItem(world.rand, seedList); @@ -112,7 +94,7 @@ public class ForgeHooks } private static boolean toolInit = false; - static HashSet toolEffectiveness = new HashSet(); + //static HashSet toolEffectiveness = new HashSet(); public static boolean canHarvestBlock(Block block, EntityPlayer player, int metadata) { @@ -233,8 +215,6 @@ public class ForgeHooks static { - grassList.add(new GrassEntry(Blocks.yellow_flower, 0, 20)); - grassList.add(new GrassEntry(Blocks.red_flower, 0, 10)); seedList.add(new SeedEntry(new ItemStack(Items.wheat_seeds), 10)); initTools(); } diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java index cba8adaea3..bb4a94e5c7 100644 --- a/src/main/java/net/minecraftforge/common/MinecraftForge.java +++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java @@ -38,18 +38,6 @@ public class MinecraftForge private static final ForgeInternalHandler INTERNAL_HANDLER = new ForgeInternalHandler(); - - /** Register a new plant to be planted when bonemeal is used on grass. - * @param block The block to place. - * @param metadata The metadata to set for the block when being placed. - * @param weight The weight of the plant, where red flowers are - * 10 and yellow flowers are 20. - */ - public static void addGrassPlant(Block block, int metadata, int weight) - { - ForgeHooks.grassList.add(new GrassEntry(block, metadata, weight)); - } - /** * Register a new seed to be dropped when breaking tall grass. *