diff --git a/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java b/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java index 2edf7c7d74..d39e3473ee 100644 --- a/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java +++ b/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java @@ -18,6 +18,7 @@ import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.EnumSet; import java.util.List; import java.util.Properties; import java.util.Random; @@ -53,6 +54,7 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.ProxyInjector; import cpw.mods.fml.common.Side; +import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.modloader.ModLoaderModContainer; import cpw.mods.fml.common.modloader.ModProperty; import cpw.mods.fml.common.registry.FMLRegistry; @@ -146,17 +148,17 @@ public class FMLBukkitHandler implements IFMLSidedHandler /** * Every tick just before world and other ticks occur */ - public void onPreTick() + public void onPreWorldTick(World world) { - FMLCommonHandler.instance().worldTickStart(); + FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLD),world); } /** * Every tick just after world and other ticks occur */ - public void onPostTick() + public void onPostWorldTick(World world) { - FMLCommonHandler.instance().worldTickEnd(); + FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.WORLD), world); } /** @@ -614,4 +616,12 @@ public class FMLBukkitHandler implements IFMLSidedHandler } return null; } + + public void onServerPostTick() { + FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.GAME)); + } + + public void onServerPreTick() { + FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.GAME)); + } } diff --git a/bukkit/net/minecraft/server/BaseMod.java b/bukkit/net/minecraft/server/BaseMod.java index 19100cd935..ec07d13022 100644 --- a/bukkit/net/minecraft/server/BaseMod.java +++ b/bukkit/net/minecraft/server/BaseMod.java @@ -18,7 +18,7 @@ import java.util.Random; import org.bukkit.craftbukkit.generator.NetherChunkGenerator; import org.bukkit.craftbukkit.generator.NormalChunkGenerator; -import cpw.mods.fml.common.ModContainer.TickType; +import cpw.mods.fml.common.TickType; public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod { @@ -30,7 +30,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod */ public final boolean doTickInGame(TickType tick, boolean tickEnd, Object minecraftInstance, Object... data) { - if (tick==TickType.WORLD && tickEnd) { + if (tick==TickType.GAME && tickEnd) { return onTickInGame((MinecraftServer)minecraftInstance); } else { return true; @@ -401,4 +401,9 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod // boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID); // boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui); // void keyboardEvent(KeyBinding event); + + @Override + public void keyBindingEvent(Object keybinding) { + // NOOP on server + } }