From a7e950e7c2480ffa320c10a2e9c5b4e19a8a93e7 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Fri, 15 Jul 2011 21:17:33 +0000 Subject: [PATCH] fixed style, added biome population support, for #2 --- .../minecraft/src/forge/IBiomePopulator.java | 10 ++++ .../minecraft/src/forge/IBucketHandler.java | 4 +- .../minecraft/src/forge/MinecraftForge.java | 49 +++++++++------ minecraft.patch | 60 ++++++++++++++++--- 4 files changed, 94 insertions(+), 29 deletions(-) create mode 100755 forge_common/net/minecraft/src/forge/IBiomePopulator.java diff --git a/forge_common/net/minecraft/src/forge/IBiomePopulator.java b/forge_common/net/minecraft/src/forge/IBiomePopulator.java new file mode 100755 index 0000000000..48efee9290 --- /dev/null +++ b/forge_common/net/minecraft/src/forge/IBiomePopulator.java @@ -0,0 +1,10 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.BiomeGenBase; +import net.minecraft.src.World; + +public interface IBiomePopulator { + + public void populate(World world, BiomeGenBase biomegenbase, int x, int z); + +} diff --git a/forge_common/net/minecraft/src/forge/IBucketHandler.java b/forge_common/net/minecraft/src/forge/IBucketHandler.java index 96dd415344..5c812153a7 100755 --- a/forge_common/net/minecraft/src/forge/IBucketHandler.java +++ b/forge_common/net/minecraft/src/forge/IBucketHandler.java @@ -5,6 +5,6 @@ import net.minecraft.src.World; public interface IBucketHandler { - public ItemStack fillCustomBucket (World w, int i, int j, int k); - + public ItemStack fillCustomBucket(World w, int i, int j, int k); + } diff --git a/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge_common/net/minecraft/src/forge/MinecraftForge.java index 2327e2723b..a863330fa6 100755 --- a/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -2,27 +2,40 @@ package net.minecraft.src.forge; import java.util.LinkedList; +import net.minecraft.src.BiomeGenBase; import net.minecraft.src.ItemStack; import net.minecraft.src.World; public class MinecraftForge { - private static LinkedList bucketHandlers = new LinkedList(); - - public static ItemStack fillCustomBucket (World w, int i, int j, int k) { - for (IBucketHandler handler : bucketHandlers) { - ItemStack stack = handler.fillCustomBucket(w, i, j, k); - - if (stack != null) { - return stack; - } - } - - return null; - } - - public static void registerCustomBucketHander (IBucketHandler handler) { - bucketHandlers.add(handler); - } - + private static LinkedList bucketHandlers = new LinkedList(); + private static LinkedList biomePopulators = new LinkedList(); + + public static void registerCustomBucketHander(IBucketHandler handler) { + bucketHandlers.add(handler); + } + + public static void registerBiomePopulate(IBiomePopulator populator) { + biomePopulators.add(populator); + } + + public static ItemStack fillCustomBucket(World w, int i, int j, int k) { + for (IBucketHandler handler : bucketHandlers) { + ItemStack stack = handler.fillCustomBucket(w, i, j, k); + + if (stack != null) { + return stack; + } + } + + return null; + } + + public static void populateBiome(World world, BiomeGenBase biomegenbase, + int x, int z) { + for (IBiomePopulator populator : biomePopulators) { + populator.populate(world, biomegenbase, x, z); + } + } + } diff --git a/minecraft.patch b/minecraft.patch index 5d1e29efea..c4d9650e75 100644 --- a/minecraft.patch +++ b/minecraft.patch @@ -1,6 +1,27 @@ +diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java +--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-11 21:58:45.029673700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 21:55:40.634969900 +0200 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, + // BiomeGenBase, Chunk, World, WorldChunkManager, +@@ -632,6 +634,8 @@ + int i25 = l + rand.nextInt(16) + 8; + (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25); + } ++ ++ MinecraftForge.populateBiome(worldObj, biomegenbase, k, l); + + generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); + for(int j19 = k + 8; j19 < k + 8 + 16; j19++) diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java --- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-11 21:58:45.174682000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-14 13:03:34.748396700 +0200 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-15 23:13:30.143050500 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -14,12 +35,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke } if(isFull == 0) { -+ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, -+ i, j, k); ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); + -+ if (customBucket != null) { -+ return customBucket; -+ } ++ if (customBucket != null) { ++ return customBucket; ++ } + if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0) { @@ -83,9 +104,30 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server private void doTick() { +diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java +--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-11 21:58:45.652709400 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 23:09:16.449540100 +0200 +@@ -6,6 +6,8 @@ + + import java.util.Random; + ++import net.minecraft.src.forge.MinecraftForge; ++ + // Referenced classes of package net.minecraft.src: + // IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, + // BiomeGenBase, Chunk, World, WorldChunkManager, +@@ -632,6 +634,8 @@ + int i25 = l + rand.nextInt(16) + 8; + (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25); + } ++ ++ MinecraftForge.populateBiome(worldObj, biomegenbase, k, l); + + generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16); + for(int j19 = k + 8; j19 < k + 8 + 16; j19++) diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java --- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-11 21:58:45.765715800 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-14 13:03:49.701251900 +0200 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-15 23:15:07.301607700 +0200 @@ -6,6 +6,8 @@ import java.util.Random; @@ -99,8 +141,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It } if(isFull == 0) { -+ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, -+ i, j, k); ++ ItemStack customBucket = MinecraftForge.fillCustomBucket(world, ++ i, j, k); + + if (customBucket != null) { + return customBucket;