Reorganize basemod ticking to use ITickHandler. Introduce "GAME" tick vs "WORLD" tick for

mods that want to tick per world and "globally"
This commit is contained in:
Christian Weeks committed 2012-06-07 13:53:16 -04:00
1 parent 11652d597f
commit 9fd6f89fc3
13 files changed
+197 -147

No files matched your search

@@ -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;
@@ -54,6 +55,7 @@ import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.ProxyInjector;
import cpw.mods.fml.common.ReflectionHelper;
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;
@@ -145,12 +147,21 @@ public class FMLServerHandler implements IFMLSidedHandler
Loader.instance().initializeMods();
}
public void onPreServerTick()
{
FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.GAME));
}
public void onPostServerTick()
{
FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.GAME));
}
/**
* Every tick just before world and other ticks occur
*/
public void onPreWorldTick(World world)
{
FMLCommonHandler.instance().worldTickStart(world);
FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLD), world);
}
/**
@@ -158,7 +169,7 @@ public class FMLServerHandler implements IFMLSidedHandler
*/
public void onPostWorldTick(World world)
{
FMLCommonHandler.instance().worldTickEnd(world);
FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.WORLD), world);
}
/**
+1 -1
View File
@@ -37,7 +37,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
@Override
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;