From e6cc73ce5529fe3a53b142debc4ce757010e185c Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sun, 31 Jul 2011 12:01:23 +0000 Subject: [PATCH] removed inner classes, remove redundant biome control --- .../minecraft/src/forge/Configuration.java | 30 ++++++------- .../minecraft/src/forge/IBiomePopulator.java | 21 ---------- .../minecraft/src/forge/MinecraftForge.java | 18 -------- .../net/minecraft/src/forge/Property.java | 12 ++++++ forge/minecraft.patch | 42 ------------------- 5 files changed, 24 insertions(+), 99 deletions(-) delete mode 100755 forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java create mode 100755 forge/forge_common/net/minecraft/src/forge/Property.java diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge/forge_common/net/minecraft/src/forge/Configuration.java index 068b4fa8b1..e9f1707e99 100755 --- a/forge/forge_common/net/minecraft/src/forge/Configuration.java +++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java @@ -28,18 +28,12 @@ public class Configuration { private boolean configBlocks[] = null; - public enum PropertyKind { - General, Block, Item - } - + public static final int GENERAL_PROPERTY = 0; + public static final int BLOCK_PROPERTY = 1; + public static final int ITEM_PROPERTY = 2; + File file; - public static class Property { - public String name; - public String value; - public String comment; - } - public TreeMap blockProperties = new TreeMap(); public TreeMap itemProperties = new TreeMap(); public TreeMap generalProperties = new TreeMap(); @@ -67,8 +61,8 @@ public class Configuration { } if (blockProperties.containsKey(key)) { - Property property = getOrCreateIntProperty(key, PropertyKind.Block, - defaultId); + Property property = getOrCreateIntProperty(key, + Configuration.BLOCK_PROPERTY, defaultId); configBlocks[Integer.parseInt(property.value)] = true; return property; } else { @@ -97,7 +91,7 @@ public class Configuration { } } - public Property getOrCreateIntProperty(String key, PropertyKind kind, + public Property getOrCreateIntProperty(String key, int kind, int defaultValue) { Property prop = getOrCreateProperty(key, kind, Integer.toString(defaultValue)); @@ -112,7 +106,7 @@ public class Configuration { } } - public Property getOrCreateBooleanProperty(String key, PropertyKind kind, + public Property getOrCreateBooleanProperty(String key, int kind, boolean defaultValue) { Property prop = getOrCreateProperty(key, kind, Boolean.toString(defaultValue)); @@ -126,18 +120,18 @@ public class Configuration { } } - public Property getOrCreateProperty(String key, PropertyKind kind, + public Property getOrCreateProperty(String key, int kind, String defaultValue) { TreeMap source = null; switch (kind) { - case General: + case GENERAL_PROPERTY: source = generalProperties; break; - case Block: + case BLOCK_PROPERTY: source = blockProperties; break; - case Item: + case ITEM_PROPERTY: source = itemProperties; break; } diff --git a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java b/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java deleted file mode 100755 index bb12dd52ed..0000000000 --- a/forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This software is provided under the terms of the Minecraft Forge Public - * License v1.0. - */ - -package net.minecraft.src.forge; - -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.World; - -public interface IBiomePopulator { - - /** - * This is called for each chunk, after the rest of the generation, and - * allow contributers to add additional blocks in the world. - * - * @see MinecraftForge#registerBiomePopulate(IBiomePopulator) - */ - public void populate(World world, BiomeGenBase biomegenbase, int x, int z); - -} diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 22efad383b..79af311720 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -17,7 +17,6 @@ import net.minecraft.src.World; public class MinecraftForge { private static LinkedList bucketHandlers = new LinkedList(); - private static LinkedList biomePopulators = new LinkedList(); private static LinkedList harvestHandlers = new LinkedList(); /** @@ -26,13 +25,6 @@ public class MinecraftForge { public static void registerCustomBucketHander(IBucketHandler handler) { bucketHandlers.add(handler); } - - /** - * Registers a new biome contributer. - */ - public static void registerBiomePopulate(IBiomePopulator populator) { - biomePopulators.add(populator); - } /** * Registers a new harvest handler. @@ -56,16 +48,6 @@ public class MinecraftForge { return null; } - /** - * This is not supposed to be called outside of Minecraft internals. - */ - public static void populateBiome(World world, BiomeGenBase biomegenbase, - int x, int z) { - for (IBiomePopulator populator : biomePopulators) { - populator.populate(world, biomegenbase, x, z); - } - } - /** * This is not supposed to be called outside of Minecraft internals. */ diff --git a/forge/forge_common/net/minecraft/src/forge/Property.java b/forge/forge_common/net/minecraft/src/forge/Property.java new file mode 100755 index 0000000000..08cc358daf --- /dev/null +++ b/forge/forge_common/net/minecraft/src/forge/Property.java @@ -0,0 +1,12 @@ +/** + * This software is provided under the terms of the Minecraft Forge Public + * License v1.0. + */ + +package net.minecraft.src.forge; + +public class Property { + public String name; + public String value; + public String comment; +} diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 7805677d9c..aca158a8e7 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -59,27 +59,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(j1 != 0) { -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-29 23:21:33.906999000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.684144300 +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/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java --- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-29 23:21:33.988004400 +0200 +++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-07-30 08:15:01.696145000 +0200 @@ -584,27 +563,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff); if(j1 != 0) { -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-29 23:21:50.088925000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-30 08:15:01.786150200 +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/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-29 23:21:50.320938000 +0200 +++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-07-30 21:04:21.430487800 +0200