diff --git a/client/net/minecraft/src/BaseMod.java b/client/net/minecraft/src/BaseMod.java index 7f9725276e..287822b52a 100644 --- a/client/net/minecraft/src/BaseMod.java +++ b/client/net/minecraft/src/BaseMod.java @@ -169,23 +169,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr { } - /** - * Override if you wish to perform some action other than just dispensing the item from the dispenser - * - * @param world - * @param x - * @param y - * @param z - * @param xVel - * @param zVel - * @param item - */ - @Override - public int dispenseEntity(World world, ItemStack item, Random rnd, int x, int y, int z, int xVel, int zVel, double entX, double entY, double entZ) - { - return -1; - } - /** * Override if you wish to generate Nether (Hell biome) blocks * diff --git a/client/net/minecraft/src/ModLoader.java b/client/net/minecraft/src/ModLoader.java index c2847a0258..db4c63f5a1 100644 --- a/client/net/minecraft/src/ModLoader.java +++ b/client/net/minecraft/src/ModLoader.java @@ -126,6 +126,17 @@ public class ModLoader { ModLoaderHelper.addCommand(command); } + + /** + * Add a behaviour to the dispenser + * + * @param item + * @param behavior + */ + public static void addDispenserBehavior(Item item, IBehaviorDispenseItem behavior) + { + BlockDispenser.field_82527_a.func_82595_a(item, behavior); + } /** * Add localization for the specified string * diff --git a/common/cpw/mods/fml/common/modloader/BaseModProxy.java b/common/cpw/mods/fml/common/modloader/BaseModProxy.java index 6e1a1dc991..5a68386b74 100644 --- a/common/cpw/mods/fml/common/modloader/BaseModProxy.java +++ b/common/cpw/mods/fml/common/modloader/BaseModProxy.java @@ -73,9 +73,6 @@ public interface BaseModProxy public abstract void onItemPickup(EntityPlayer player, ItemStack item); - public abstract int dispenseEntity(World world, ItemStack item, Random rnd, int x, int y, int z, int xVel, int zVel, double entX, - double entY, double entZ); - public abstract void serverCustomPayload(NetServerHandler handler, Packet250CustomPayload packet); public abstract void serverChat(NetServerHandler source, String message); diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java index 1cc2a72bcb..27bcb82c2b 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java @@ -21,8 +21,7 @@ public class ModLoaderDispenseHelper implements IDispenserHandler public int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ) { - int ret = mod.dispenseEntity(world, item, random, x, y, z, xVelocity, zVelocity, entX, entY, entZ); - return ret == 0 ? -1 : ret; + return -1; } }