diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/client/cpw/mods/fml/client/FMLClientHandler.java index 93d72ff5e1..ddab2b7519 100644 --- a/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/client/cpw/mods/fml/client/FMLClientHandler.java @@ -103,7 +103,6 @@ import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.modloader.ModLoaderHelper; import cpw.mods.fml.common.modloader.ModLoaderModContainer; import cpw.mods.fml.common.modloader.ModProperty; -import cpw.mods.fml.common.registry.FMLRegistry; /** diff --git a/client/cpw/mods/fml/client/registry/ClientRegistry.java b/client/cpw/mods/fml/client/registry/ClientRegistry.java index ecef00f9a8..66228ab9c4 100644 --- a/client/cpw/mods/fml/client/registry/ClientRegistry.java +++ b/client/cpw/mods/fml/client/registry/ClientRegistry.java @@ -9,9 +9,7 @@ import net.minecraft.src.TileEntitySpecialRenderer; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.registry.FMLRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.IMinecraftRegistry; public class ClientRegistry { diff --git a/client/net/minecraft/src/ModLoader.java b/client/net/minecraft/src/ModLoader.java index a04bf1a016..00320aec5c 100644 --- a/client/net/minecraft/src/ModLoader.java +++ b/client/net/minecraft/src/ModLoader.java @@ -37,7 +37,6 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.modloader.ModLoaderHelper; import cpw.mods.fml.common.modloader.ModLoaderModContainer; import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.FMLRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.ObfuscationReflectionHelper; @@ -664,7 +663,7 @@ public class ModLoader */ public static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) { - FMLRegistry.removeSpawn(entityName, spawnList, biomes); + EntityRegistry.removeSpawn(entityName, spawnList, biomes); } @Deprecated diff --git a/common/cpw/mods/fml/common/FMLModContainer.java b/common/cpw/mods/fml/common/FMLModContainer.java index 5f0037ddf8..bc2e26274b 100644 --- a/common/cpw/mods/fml/common/FMLModContainer.java +++ b/common/cpw/mods/fml/common/FMLModContainer.java @@ -47,7 +47,6 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.event.FMLStateEvent; -import cpw.mods.fml.common.registry.FMLRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; diff --git a/common/cpw/mods/fml/common/registry/FMLRegistry.java b/common/cpw/mods/fml/common/registry/FMLRegistry.java deleted file mode 100644 index 75d1db3e3c..0000000000 --- a/common/cpw/mods/fml/common/registry/FMLRegistry.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * The FML Forge Mod Loader suite. - * Copyright (C) 2012 cpw - * - * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package cpw.mods.fml.common.registry; - - -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.Block; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EnumCreatureType; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.TileEntity; - - -public class FMLRegistry -{ - static IMinecraftRegistry instance; - - public static void registerRegistry(IMinecraftRegistry registry) - { - if (instance != null) - { - throw new RuntimeException("Illegal attempt to replace FML registry"); - } - - instance = registry; - } - - public static void registerTileEntity(Class tileEntityClass, String id) - { - instance.registerTileEntity(tileEntityClass, id); - } - - public static void addBiome(BiomeGenBase biome) - { - instance.addBiome(biome); - } - - public static void addSpawn(Class entityClass, int weightedProb, int min, int max, EnumCreatureType typeOfCreature, BiomeGenBase... biomes) - { - instance.addSpawn(entityClass, weightedProb, min, max, typeOfCreature, biomes); - } - - @SuppressWarnings("unchecked") - public static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) - { - instance.addSpawn(entityName, weightedProb, min, max, spawnList, biomes); - } - - public static void removeBiome(BiomeGenBase biome) - { - instance.removeBiome(biome); - } - - public static void removeSpawn(Class entityClass, EnumCreatureType typeOfCreature, BiomeGenBase... biomes) - { - instance.removeSpawn(entityClass, typeOfCreature, biomes); - } - - @SuppressWarnings("unchecked") - public static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) - { - instance.removeSpawn(entityName, spawnList, biomes); - } - /** - * @return - */ - public static IMinecraftRegistry instance() - { - return instance; - } - -} diff --git a/common/cpw/mods/fml/common/registry/IMinecraftRegistry.java b/common/cpw/mods/fml/common/registry/IMinecraftRegistry.java deleted file mode 100644 index 1fa53b8917..0000000000 --- a/common/cpw/mods/fml/common/registry/IMinecraftRegistry.java +++ /dev/null @@ -1,46 +0,0 @@ -package cpw.mods.fml.common.registry; - -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.Block; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EnumCreatureType; -import net.minecraft.src.IRecipe; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; -import net.minecraft.src.TileEntity; - -public interface IMinecraftRegistry -{ - - public abstract void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes); - - public abstract void removeSpawn(Class entityClass, EnumCreatureType typeOfCreature, BiomeGenBase... biomes); - - public abstract void removeBiome(BiomeGenBase biome); - - public abstract void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes); - - public abstract void addSpawn(Class entityClass, int weightedProb, int min, int max, EnumCreatureType typeOfCreature, BiomeGenBase... biomes); - - public abstract void addBiome(BiomeGenBase biome); - - public abstract void registerTileEntity(Class tileEntityClass, String id); - - public abstract void registerEntityID(Class entityClass, String entityName, int id, int backgroundEggColour, int foregroundEggColour); - - public abstract void registerEntityID(Class entityClass, String entityName, int id); - - public abstract void registerBlock(Block block, Class itemclass); - - public abstract void registerBlock(Block block); - - public abstract void addSmelting(int input, ItemStack output, float xp); - - public abstract void addShapelessRecipe(ItemStack output, Object... params); - - public abstract void addRecipe(ItemStack output, Object... params); - - public abstract void addRecipe(IRecipe recipe); - -} \ No newline at end of file diff --git a/common/fml_at.cfg b/common/fml_at.cfg index 1466965eb3..ab50c5def2 100644 --- a/common/fml_at.cfg +++ b/common/fml_at.cfg @@ -173,4 +173,6 @@ public tc.b(Lri;[Ljava/lang/Object;)V public ir.a # ItemStack - make itemId final #public+f ri.c +# StatBase - Make statName public, no server side getter + public ho.a diff --git a/server/cpw/mods/fml/server/FMLServerHandler.java b/server/cpw/mods/fml/server/FMLServerHandler.java index 3e26480427..ff68311caf 100644 --- a/server/cpw/mods/fml/server/FMLServerHandler.java +++ b/server/cpw/mods/fml/server/FMLServerHandler.java @@ -41,7 +41,6 @@ import net.minecraft.src.Packet1Login; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.Packet3Chat; import net.minecraft.src.Profiler; -import net.minecraft.src.ServerRegistry; import net.minecraft.src.SidedProxy; import net.minecraft.src.StringTranslate; import net.minecraft.src.World; @@ -56,7 +55,6 @@ import cpw.mods.fml.common.ProxyInjector; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.modloader.ModLoaderModContainer; import cpw.mods.fml.common.modloader.ModProperty; -import cpw.mods.fml.common.registry.FMLRegistry; /** * Handles primary communication from hooked code into the system @@ -100,7 +98,6 @@ public class FMLServerHandler implements IFMLSidedHandler server = minecraftServer; ObfuscationReflectionHelper.detectObfuscation(World.class); FMLCommonHandler.instance().beginLoading(this); - FMLRegistry.registerRegistry(new ServerRegistry()); Loader.instance().loadMods(); } diff --git a/server/net/minecraft/src/BaseMod.java b/server/net/minecraft/src/BaseMod.java index 3cc93395dc..47d6f4aed0 100644 --- a/server/net/minecraft/src/BaseMod.java +++ b/server/net/minecraft/src/BaseMod.java @@ -109,7 +109,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod { EntityItem item = (EntityItem) pickupData[0]; EntityPlayer player = (EntityPlayer) pickupData[1]; - onItemPickup(player, item.field_429_a); + onItemPickup(player, item.field_70294_a); } @Override diff --git a/server/net/minecraft/src/ModLoader.java b/server/net/minecraft/src/ModLoader.java index 33f19338ba..feaeab8189 100644 --- a/server/net/minecraft/src/ModLoader.java +++ b/server/net/minecraft/src/ModLoader.java @@ -19,12 +19,14 @@ import java.util.logging.Logger; import net.minecraft.server.MinecraftServer; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.modloader.ModLoaderHelper; import cpw.mods.fml.common.modloader.ModLoaderModContainer; -import cpw.mods.fml.common.registry.FMLRegistry; import cpw.mods.fml.server.FMLServerHandler; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; public class ModLoader { @@ -37,7 +39,7 @@ public class ModLoader */ public static void addAchievementDesc(Achievement achievement, String name, String description) { - String achName=achievement.func_75970_i(); + String achName=achievement.field_75978_a; addLocalization(achName, name); addLocalization(achName+".desc", description); } @@ -243,7 +245,7 @@ public class ModLoader */ public static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) { - FMLRegistry.addSpawn(entityName, weightedProb, min, max, spawnList, biomes); + EntityRegistry.addSpawn(entityName, weightedProb, min, max, spawnList, biomes); } /** @@ -638,7 +640,7 @@ public class ModLoader */ public static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) { - FMLRegistry.removeSpawn(entityName, spawnList, biomes); + EntityRegistry.removeSpawn(entityName, spawnList, biomes); } @Deprecated diff --git a/server/net/minecraft/src/ServerRegistry.java b/server/net/minecraft/src/ServerRegistry.java deleted file mode 100644 index 7f79425306..0000000000 --- a/server/net/minecraft/src/ServerRegistry.java +++ /dev/null @@ -1,156 +0,0 @@ -package net.minecraft.src; - -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import cpw.mods.fml.common.registry.IMinecraftRegistry; -import cpw.mods.fml.server.FMLServerHandler; - -public class ServerRegistry implements IMinecraftRegistry -{ - - @Override - public void addRecipe(ItemStack output, Object... params) - { - CraftingManager.func_20151_a().func_20153_a(output, params); - } - - @Override - public void addShapelessRecipe(ItemStack output, Object... params) - { - CraftingManager.func_20151_a().func_21146_b(output, params); - } - - @Override - public void addRecipe(IRecipe recipe) - { - CraftingManager.func_20151_a().func_25126_b().add(recipe); - } - - @Override - public void addSmelting(int input, ItemStack output) - { - FurnaceRecipes.func_21162_a().func_21160_a(input, output); - } - - @Override - public void registerBlock(Block block) - { - registerBlock(block, ItemBlock.class); - } - - @Override - public void registerBlock(Block block, Class itemclass) - { - try - { - assert block != null : "registerBlock: block cannot be null"; - assert itemclass != null : "registerBlock: itemclass cannot be null"; - int blockItemId = block.field_573_bc - 256; - itemclass.getConstructor(int.class).newInstance(blockItemId); - } - catch (Exception e) - { - //HMMM - } - } - - @Override - public void registerEntityID(Class entityClass, String entityName, int id) - { - EntityList.addNewEntityListMapping(entityClass, entityName, id); - } - - @Override - public void registerEntityID(Class entityClass, String entityName, int id, int backgroundEggColour, int foregroundEggColour) - { - EntityList.addNewEntityListMapping(entityClass, entityName, id, backgroundEggColour, foregroundEggColour); - } - - @Override - public void registerTileEntity(Class tileEntityClass, String id) - { - TileEntity.addNewTileEntityMapping(tileEntityClass, id); - } - - @Override - public void addBiome(BiomeGenBase biome) - { - FMLServerHandler.instance().addBiomeToDefaultWorldGenerator(biome); - } - - @Override - public void addSpawn(Class entityClass, int weightedProb, int min, int max, EnumCreatureType typeOfCreature, BiomeGenBase... biomes) - { - for (BiomeGenBase biome : biomes) - { - @SuppressWarnings("unchecked") - List spawns = biome.func_25055_a(typeOfCreature); - - for (SpawnListEntry entry : spawns) - { - //Adjusting an existing spawn entry - if (entry.field_25145_a == entityClass) - { - entry.field_35483_d = weightedProb; - entry.field_35484_b = min; - entry.field_35485_c = max; - break; - } - } - - spawns.add(new SpawnListEntry(entityClass, weightedProb, min, max)); - } - } - - @Override - @SuppressWarnings("unchecked") - public void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) - { - Class entityClazz = EntityList.getEntityToClassMapping().get(entityName); - - if (EntityLiving.class.isAssignableFrom(entityClazz)) - { - addSpawn((Class ) entityClazz, weightedProb, min, max, spawnList, biomes); - } - } - - @Override - public void removeBiome(BiomeGenBase biome) - { - FMLServerHandler.instance().removeBiomeFromDefaultWorldGenerator(biome); - } - - @Override - public void removeSpawn(Class entityClass, EnumCreatureType typeOfCreature, BiomeGenBase... biomes) - { - for (BiomeGenBase biome : biomes) - { - @SuppressWarnings("unchecked") - Iterator spawns = biome.func_25055_a(typeOfCreature).iterator(); - - while (spawns.hasNext()) - { - SpawnListEntry entry = spawns.next(); - if (entry.field_25145_a == entityClass) - { - spawns.remove(); - } - } - } - } - - @Override - @SuppressWarnings("unchecked") - public void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) - { - Class entityClazz = EntityList.getEntityToClassMapping().get(entityName); - - if (EntityLiving.class.isAssignableFrom(entityClazz)) - { - removeSpawn((Class ) entityClazz, spawnList, biomes); - } - } - -}