From 9ad4177bfa519e382e82a9bd6c1f6c52b387bd3e Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Fri, 1 Jun 2012 00:27:46 -0400 Subject: [PATCH] Bukkitside fixup --- build.xml | 7 +- .../cpw/mods/fml/server/FMLBukkitHandler.java | 61 ++++- bukkit/net/minecraft/server/BaseMod.java | 116 ++++++-- .../net/minecraft/server/BukkitRegistry.java | 3 +- bukkit/net/minecraft/server/ModLoader.java | 256 ++++++++++++++---- 5 files changed, 360 insertions(+), 83 deletions(-) diff --git a/build.xml b/build.xml index b89975c601..d20d3ca1b1 100644 --- a/build.xml +++ b/build.xml @@ -23,7 +23,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -61,6 +61,9 @@ + + + diff --git a/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java b/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java index 84faa54786..9f06e331de 100644 --- a/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java +++ b/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java @@ -22,6 +22,10 @@ import java.util.Properties; import java.util.Random; import java.util.logging.Logger; +import net.minecraft.server.Block; +import net.minecraft.server.Item; +import net.minecraft.server.LocaleLanguage; +import net.minecraft.server.MLProp; import net.minecraft.server.MinecraftServer; import net.minecraft.server.BaseMod; import net.minecraft.server.BiomeBase; @@ -37,6 +41,7 @@ import net.minecraft.server.Packet250CustomPayload; import net.minecraft.server.Packet3Chat; import net.minecraft.server.BukkitRegistry; import net.minecraft.server.World; +import net.minecraft.server.WorldType; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFMLSidedHandler; import cpw.mods.fml.common.Loader; @@ -145,6 +150,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Get the server instance + * * @return */ public MinecraftServer getServer() @@ -227,6 +233,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Called to notify that an item was picked up from the world + * * @param entityItem * @param entityPlayer */ @@ -243,6 +250,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Raise an exception + * * @param exception * @param message * @param stopGame @@ -288,6 +296,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Build a list of default overworld biomes + * * @return */ public BiomeBase[] getDefaultOverworldBiomes() @@ -315,6 +324,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Called when an item is crafted + * * @param player * @param craftedItem * @param craftingGrid @@ -369,6 +379,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Called when a packet 250 packet is received from the player + * * @param packet * @param player */ @@ -390,6 +401,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Handle register requests for packet 250 channels + * * @param packet */ private void handleClientRegistration(Packet250CustomPayload packet, EntityHuman player) @@ -425,6 +437,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Handle a login + * * @param loginPacket * @param networkManager */ @@ -448,6 +461,7 @@ public class FMLBukkitHandler implements IFMLSidedHandler } } } + /** * Are we a server? */ @@ -518,28 +532,46 @@ public class FMLBukkitHandler implements IFMLSidedHandler } } + /** + * @param biome + */ + public void addBiomeToDefaultWorldGenerator(BiomeBase biome) + { + WorldType.NORMAL.addNewBiome(biome); + } + @Override public Object getMinecraftInstance() { - // TODO Auto-generated method stub - return null; + return server; } @Override - public String getCurrentLanguage() { - // TODO Auto-generated method stub - return null; + public String getCurrentLanguage() + { + return LocaleLanguage.a().getCurrentLanguage(); } @Override - public Properties getCurrentLanguageTable() { - // TODO Auto-generated method stub - return null; + public Properties getCurrentLanguageTable() + { + return LocaleLanguage.a().getCurrentLanguageTable(); } @Override - public String getObjectName(Object minecraftObject) { - // TODO Auto-generated method stub - return null; + public String getObjectName(Object instance) + { + String objectName; + if (instance instanceof Item) { + objectName=((Item)instance).getName(); + } else if (instance instanceof Block) { + objectName=((Block)instance).getName(); + } else if (instance instanceof ItemStack) { + objectName=Item.byId[((ItemStack)instance).id].a((ItemStack)instance); + } else { + throw new IllegalArgumentException(String.format("Illegal object for naming %s",instance)); + } + objectName+=".name"; + return objectName; } @Override @@ -562,7 +594,10 @@ public class FMLBukkitHandler implements IFMLSidedHandler @Override public ModProperty getModLoaderPropertyFor(Field f) { - // TODO Auto-generated method stub - return null; + if (f.isAnnotationPresent(MLProp.class)) { + MLProp prop = f.getAnnotation(MLProp.class); + return new ModProperty(prop.info(), prop.min(), prop.max(), prop.name()); + } + return null; } } diff --git a/bukkit/net/minecraft/server/BaseMod.java b/bukkit/net/minecraft/server/BaseMod.java index 121818131b..c9fe2aeffb 100644 --- a/bukkit/net/minecraft/server/BaseMod.java +++ b/bukkit/net/minecraft/server/BaseMod.java @@ -12,22 +12,31 @@ */ package net.minecraft.server; +import java.util.Map; import java.util.Random; import org.bukkit.craftbukkit.generator.NetherChunkGenerator; import org.bukkit.craftbukkit.generator.NormalChunkGenerator; -import cpw.mods.fml.common.IConsoleHandler; -import cpw.mods.fml.common.ICraftingHandler; -import cpw.mods.fml.common.IDispenseHandler; -import cpw.mods.fml.common.INetworkHandler; -import cpw.mods.fml.common.IPickupNotifier; -import cpw.mods.fml.common.IPlayerTracker; -import cpw.mods.fml.common.IWorldGenerator; +import cpw.mods.fml.common.ModContainer.TickType; public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod { // CALLBACK MECHANISMS + + /** + * @param minecraftInstance + * @return + */ + public final boolean doTickInGame(TickType tick, boolean tickEnd, Object minecraftInstance, Object... data) + { + if (tick==TickType.WORLD && tickEnd) { + return onTickInGame((MinecraftServer)minecraftInstance); + } else { + return false; + } + } + @Override public final void onCrafting(Object... craftingParameters) { @@ -39,6 +48,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod { takenFromFurnace((EntityHuman)smeltingParameters[0], (ItemStack)smeltingParameters[1]); } + @Override public final boolean dispense(double x, double y, double z, byte xVelocity, byte zVelocity, Object... data) { @@ -50,6 +60,15 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod { return onChatMessageReceived((EntityHuman)data[1], (Packet3Chat)data[0]); } + + @Override + public final void onServerLogin(Object handler) { + // NOOP + } + + public final void onServerLogout() { + // NOOP + } @Override public final void onPlayerLogin(Object player) { @@ -57,13 +76,13 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod } @Override - public void onPlayerLogout(Object player) + public final void onPlayerLogout(Object player) { onClientLogout((EntityHuman)player); } @Override - public void onPlayerChangedDimension(Object player) + public final void onPlayerChangedDimension(Object player) { onClientDimensionChanged((EntityHuman)player); } @@ -98,14 +117,28 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod } } + /** + * NO-OP on client side + */ @Override public final boolean handleCommand(String command, Object... data) { return onServerCommand(command, (String)data[0], (ICommandListener)data[1]); } + @Override + public void onRegisterAnimations() { + // NOOP on servers + } + + @Override + public void onRenderHarvest(Map renderers) { + // NOOP on servers + } + // BASEMOD API /** * Override if you wish to provide a fuel item for the furnace and return the fuel value of the item + * * @param id * @param metadata * @return @@ -115,8 +148,14 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod return 0; } + public void addRenderer(Map, Object> renderers) + { + + } + /** * Override if you wish to perform some action other than just dispensing the item from the dispenser + * * @param world * @param x * @param y @@ -133,6 +172,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod /** * Override if you wish to generate Nether (Hell biome) blocks + * * @param world * @param random * @param chunkX @@ -144,6 +184,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod /** * Override if you wish to generate Overworld (not hell or the end) blocks + * * @param world * @param random * @param chunkX @@ -155,6 +196,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod /** * Return the name of your mod. Defaults to the class name + * * @return */ public String getName() @@ -164,19 +206,26 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod /** * Get your mod priorities + * * @return */ public String getPriorities() { - return null; + return ""; } /** * Return the version of your mod + * * @return */ public abstract String getVersion(); + public void keyboardEvent(Object event) + { + + } + /** * Load your mod */ @@ -191,6 +240,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod /** * Handle item pickup + * * @param player * @param item */ @@ -200,6 +250,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod /** * Ticked every game tick if you have subscribed to tick events through {@link ModLoader#setInGameHook(BaseMod, boolean, boolean)} + * * @param minecraftServer the server * @return true to continue receiving ticks */ @@ -208,28 +259,52 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod return false; } - /** - * Not implemented because on the server you don't know who it's from - * {@link #onChatMessageReceived(EntityHuman, Packet3Chat)} - * @param text - */ - @Deprecated - public void receiveChatPacket(String text) + public boolean onTickInGUI(float tick, Object game, Object gui) { + return false; } /** - * Not implemented because on the server you don't know who it's from - * {@link #onPacket250Received(EntityHuman, Packet250CustomPayload)} + * Only implemented on the client side + * {@link #onChatMessageReceived(EntityPlayer, Packet3Chat)} + * + * @param text + */ + public void receiveChatPacket(String text) + { + + } + + /** + * Only called on the client side + * {@link #onPacket250Received(EntityPlayer, Packet250CustomPayload)} + * * @param packet */ - @Deprecated public void receiveCustomPacket(Packet250CustomPayload packet) { + + } + + public void registerAnimation(Object game) + { + + } + + public void renderInvBlock(Object renderer, Block block, int metadata, int modelID) + { + + } + + public boolean renderWorldBlock(Object renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID) + { + return false; + } /** * Called when someone crafts an item from a crafting table + * * @param player * @param item * @param matrix @@ -269,6 +344,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod /** * Called when a chat message is received. Return true to stop further processing + * * @param source * @param chat * @return true if you want to consume the message so it is not available for further processing diff --git a/bukkit/net/minecraft/server/BukkitRegistry.java b/bukkit/net/minecraft/server/BukkitRegistry.java index bc113cac84..13b7a4581b 100644 --- a/bukkit/net/minecraft/server/BukkitRegistry.java +++ b/bukkit/net/minecraft/server/BukkitRegistry.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.src.BiomeGenBase; import cpw.mods.fml.common.registry.IMinecraftRegistry; +import cpw.mods.fml.server.FMLBukkitHandler; public class BukkitRegistry implements IMinecraftRegistry { @@ -71,7 +72,7 @@ public class BukkitRegistry implements IMinecraftRegistry @Override public void addBiome(BiomeGenBase biome) { - //TODO + FMLBukkitHandler.instance().addBiomeToDefaultWorldGenerator((BiomeBase) biome); } @Override diff --git a/bukkit/net/minecraft/server/ModLoader.java b/bukkit/net/minecraft/server/ModLoader.java index 69fd90af55..49b059c5cd 100644 --- a/bukkit/net/minecraft/server/ModLoader.java +++ b/bukkit/net/minecraft/server/ModLoader.java @@ -13,6 +13,7 @@ package net.minecraft.server; import java.util.List; +import java.util.Map; import java.util.logging.Logger; import cpw.mods.fml.common.FMLCommonHandler; @@ -34,12 +35,16 @@ public class ModLoader */ public static void addAchievementDesc(Achievement achievement, String name, String description) { + String achName=achievement.getName(); + addLocalization(achName, name); + addLocalization(achName+".desc", description); } /** * This method is a call in hook from modified external code. Implemented elsewhere. * - * {@link FMLBukkitHandler#fuelLookup(int, int)} + * {@link FMLCommonHandler#fuelLookup(int, int)} + * * @param id * @param metadata * @return @@ -50,77 +55,88 @@ public class ModLoader return 0; } + public static void addAllRenderers(Map, Object> renderers) + { + } + + public static void addAnimation(Object anim) + { + } + /** * This method is unimplemented in server versions to date. * * @param armor * @return */ - @Deprecated public static int addArmor(String armor) { return 0; } /** - * This method does not work. Creation of a BiomeGenBase is sufficient to populate this array. Using this method will likely corrupt worlds. + * This method adds the supplied biome to the set of candidate biomes for the default world generator type. * * @param biome */ - @Deprecated public static void addBiome(BiomeBase biome) { + FMLRegistry.addBiome(biome); } /** - * Unimplemented on the server as it does not generate names + * Add localization for the specified string + * * @param key * @param value */ - @Deprecated public static void addLocalization(String key, String value) { + addLocalization(key, "en_US", value); } /** - * Unimplemented on the server as it does not generate names + * Add localization for the specified string + * * @param key * @param lang * @param value */ - @Deprecated public static void addLocalization(String key, String lang, String value) { + FMLCommonHandler.instance().addStringLocalization(key, lang, value); } /** - * Unimplemented on the server as it does not generate names + * Name the specified minecraft object with the supplied name + * * @param instance * @param name */ - @Deprecated public static void addName(Object instance, String name) { + addName(instance,"en_US",name); } /** * Unimplemented on the server as it does not generate names + * * @param instance * @param lang * @param name */ - @Deprecated public static void addName(Object instance, String lang, String name) { + FMLCommonHandler.instance().addNameForObject(instance, lang, name); } /** * Unimplemented on the server as it does not render textures + * * @param fileToOverride * @param fileToAdd * @return */ - @Deprecated public static int addOverride(String fileToOverride, String fileToAdd) { return 0; @@ -128,17 +144,19 @@ public class ModLoader /** * Unimplemented on the server as it does not render textures + * * @param path * @param overlayPath * @param index */ - @Deprecated public static void addOverride(String path, String overlayPath, int index) { + // NOOP } /** * Add a Shaped Recipe + * * @param output * @param params */ @@ -149,6 +167,7 @@ public class ModLoader /** * Add a shapeless recipe + * * @param output * @param params */ @@ -159,6 +178,7 @@ public class ModLoader /** * Add a new product to be smelted + * * @param input * @param output */ @@ -169,6 +189,7 @@ public class ModLoader /** * Add a mob to the spawn list + * * @param entityClass * @param weightedProb * @param min @@ -196,6 +217,7 @@ public class ModLoader /** * Add a mob to the spawn list + * * @param entityName * @param weightedProb * @param min @@ -224,6 +246,7 @@ public class ModLoader /** * This method is a call in hook from modified external code. Implemented elsewhere. * {@link FMLBukkitHandler#tryDispensingEntity(World, double, double, double, byte, byte, ItemStack)} + * * @param world * @param x * @param y @@ -241,6 +264,7 @@ public class ModLoader /** * Remove a container and drop all the items in it on the ground around + * * @param world * @param x * @param y @@ -299,6 +323,7 @@ public class ModLoader /** * Get a list of all BaseMod loaded into the system * {@link ModLoaderModContainer#findAll} + * * @return */ public static List getLoadedMods() @@ -307,8 +332,8 @@ public class ModLoader } /** - * Get a logger instance - * {@link FMLBukkitHandler#getFMLLogger()} + * Get a logger instance {@link FMLCommonHandler#getFMLLogger()} + * * @return */ public static Logger getLogger() @@ -316,9 +341,24 @@ public class ModLoader return FMLCommonHandler.instance().getFMLLogger(); } + public static Object getMinecraftInstance() + { + return getMinecraftServerInstance(); + } + + /** + * Get the minecraft server instance + * {@link FMLServerHandler#getServer()} + * @return + */ + public static MinecraftServer getMinecraftServerInstance() + { + return FMLBukkitHandler.instance().getServer(); + } /** * Get a value from a field using reflection * {@link ReflectionHelper#getPrivateValue(Class, Object, int)} + * * @param instanceclass * @param instance * @param fieldindex @@ -332,6 +372,7 @@ public class ModLoader /** * Get a value from a field using reflection * {@link ReflectionHelper#getPrivateValue(Class, Object, String)} + * * @param instanceclass * @param instance * @param field @@ -342,19 +383,53 @@ public class ModLoader return ReflectionHelper.getPrivateValue(instanceclass, instance, field); } + /** + * Stubbed method on the server to return a unique model id + * + */ + public static int getUniqueBlockModelID(BaseMod mod, boolean inventoryRenderer) + { + return -1; + } + /** * Get a new unique entity id * {@link Entity#getNextId()} + * * @return */ public static int getUniqueEntityId() { - return Entity.getNextId(); + return FMLCommonHandler.instance().nextUniqueEntityListId(); + } + + public static int getUniqueSpriteIndex(String path) + { + return -1; + } + + /** + * To properly implement packet 250 protocol you should always check your + * channel is active prior to sending the packet + * + * @param player + * @param channel + * @return + */ + public static boolean isChannelActive(EntityPlayer player, String channel) + { + return FMLCommonHandler.instance().isChannelActive(channel, player); + } + + public static boolean isGUIOpen(Class gui) + { + return false; } /** * Is the named mod loaded? * {@link Loader#isModLoaded(String)} + * * @param modname * @return */ @@ -363,9 +438,50 @@ public class ModLoader return Loader.isModLoaded(modname); } + /** + * Implemented elsewhere + */ + @Deprecated + public static void loadConfig() + { + } + + public static Object loadImage(Object renderEngine, String path) throws Exception + { + return null; + } + + /** + * Call in from elsewhere. Unimplemented here. + * @param player + * @param item + */ + @Deprecated + public static void onItemPickup(EntityPlayer player, ItemStack item) + { + } + /** + * Call in from elsewhere. Unimplemented here. + */ + @Deprecated + public static void onTick(float tick, Object game) + { + } + + public static void openGUI(EntityPlayer player, Object gui) + { + // NOOP + } + + @Deprecated + public static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world) + { + } + /** * This method is a call in hook from modified external code. Implemented elsewhere. * {@link FMLBukkitHandler#handlePacket250(Packet250CustomPayload, EntityHuman)} + * * @param packet */ @Deprecated @@ -373,8 +489,20 @@ public class ModLoader { } + @Deprecated + public static Object[] registerAllKeys(Object[] keys) + { + return keys; + } + + @Deprecated + public static void registerAllTextureOverrides(Object cache) + { + } + /** * Register a new block + * * @param block */ public static void registerBlock(Block block) @@ -384,6 +512,7 @@ public class ModLoader /** * Register a new block + * * @param block * @param itemclass */ @@ -394,6 +523,7 @@ public class ModLoader /** * Register a new entity ID + * * @param entityClass * @param entityName * @param id @@ -405,6 +535,7 @@ public class ModLoader /** * Register a new entity ID + * * @param entityClass * @param entityName * @param id @@ -416,10 +547,17 @@ public class ModLoader FMLRegistry.registerEntityID(entityClass, entityName, id, background, foreground); } + public static void registerKey(BaseMod mod, Object keyHandler, boolean allowRepeat) + { + // NOOP + } + /** - * Register the mod for packets on this channel. This only registers the channel with Forge Mod Loader, not - * with clients connecting- use BaseMod.onClientLogin to tell them about your custom channel + * Register the mod for packets on this channel. This only registers the + * channel with Forge Mod Loader, not with clients connecting- use + * BaseMod.onClientLogin to tell them about your custom channel * {@link FMLCommonHandler#registerChannel(cpw.mods.fml.common.ModContainer, String)} + * * @param mod * @param channel */ @@ -430,6 +568,7 @@ public class ModLoader /** * Register a new tile entity class + * * @param tileEntityClass * @param id */ @@ -438,11 +577,16 @@ public class ModLoader FMLRegistry.registerTileEntity(tileEntityClass, id); } + public static void registerTileEntity(Class tileEntityClass, String id, Object renderer) + { + FMLRegistry.instance().registerTileEntity(tileEntityClass, id); + } + /** - * Remove a biome. This code will probably not work correctly and will likely corrupt worlds. + * Remove a biome from the list of generated biomes + * * @param biome */ - @Deprecated public static void removeBiome(BiomeBase biome) { FMLRegistry.removeBiome(biome); @@ -450,6 +594,7 @@ public class ModLoader /** * Remove a spawn + * * @param entityClass * @param spawnList */ @@ -460,6 +605,7 @@ public class ModLoader /** * Remove a spawn + * * @param entityClass * @param spawnList * @param biomes @@ -471,6 +617,7 @@ public class ModLoader /** * Remove a spawn + * * @param entityName * @param spawnList */ @@ -481,6 +628,7 @@ public class ModLoader /** * Remove a spawn + * * @param entityName * @param spawnList * @param biomes @@ -490,6 +638,24 @@ public class ModLoader FMLRegistry.removeSpawn(entityName, spawnList, biomes); } + @Deprecated + public static boolean renderBlockIsItemFull3D(int modelID) + { + return false; + } + + @Deprecated + public static void renderInvBlock(Object renderer, Block block, int metadata, int modelID) + { + // NOOP + } + + @Deprecated + public static boolean renderWorldBlock(Object renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID) + { + return false; + } + /** * Configuration is handled elsewhere * {@link ModLoaderModContainer} @@ -500,33 +666,45 @@ public class ModLoader } /** - * This method is unimplemented on the server: it is meant for clients to send chat to the server - * {@link FMLBukkitHandler#handleChatPacket(Packet3Chat, EntityHuman)} + * Send a chat message to the server + * {@link FMLServerHandler#handleChatPacket(Packet3Chat, EntityPlayer)} + * * @param text */ @Deprecated public static void serverChat(String text) { + //TODO + } + + @Deprecated + public static void serverLogin(Object handler, Packet1Login loginPacket) + { + //TODO } /** * Indicate that you want to receive ticks * - * @param mod - * receiving the events - * @param enable - * indicates whether you want to recieve them or not - * @param useClock - * Not used in server side: all ticks are sent on the server side (no render subticks) + * @param mod receiving the events + * @param enable indicates whether you want to recieve them or not + * @param useClock Not used in server side: all ticks are sent on the server side (no render subticks) */ public static void setInGameHook(BaseMod mod, boolean enable, boolean useClock) { ModLoaderHelper.updateStandardTicks(mod, enable, useClock); } + + public static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock) + { + ModLoaderHelper.updateGUITicks(mod, enable, useClock); + } + /** * Set a private field to a value using reflection * {@link ReflectionHelper#setPrivateValue(Class, Object, int, Object)} + * * @param instanceclass * @param instance * @param fieldindex @@ -540,6 +718,7 @@ public class ModLoader /** * Set a private field to a value using reflection * {@link ReflectionHelper#setPrivateValue(Class, Object, String, Object)} + * * @param instanceclass * @param instance * @param field @@ -553,6 +732,7 @@ public class ModLoader /** * This method is a call in hook from modified external code. Implemented elsewhere. * {@link FMLBukkitHandler#onItemCrafted(EntityHuman, ItemStack, IInventory)} + * * @param player * @param item * @param matrix @@ -565,6 +745,7 @@ public class ModLoader /** * This method is a call in hook from modified external code. Implemented elsewhere. * {@link FMLBukkitHandler#onItemSmelted(EntityHuman, ItemStack)} + * * @param player * @param item */ @@ -584,16 +765,6 @@ public class ModLoader FMLBukkitHandler.instance().raiseException(e, message, true); } - /** - * Get the minecraft server instance - * {@link FMLBukkitHandler#getServer()} - * @return - */ - public static MinecraftServer getMinecraftServerInstance() - { - return FMLBukkitHandler.instance().getServer(); - } - /** * To properly implement packet 250 protocol you should always check your channel * is active prior to sending the packet @@ -606,13 +777,4 @@ public class ModLoader { return FMLCommonHandler.instance().isChannelActive(channel, player); } - - /** - * Stubbed method on the server to return a unique model id - * - */ - @Deprecated - public static int getUniqueBlockModelID(BaseMod mod, boolean flag) { - return 0; - } } \ No newline at end of file