From b1ca21a161ac820f24c4fb5cda19aaba278ae435 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 5 Jul 2012 22:31:46 -0400 Subject: [PATCH] Some patches for the server --- .../cpw/mods/fml/common/FMLCommonHandler.java | 5 ++++ .../minecraft/src/MinecraftServer.java.patch | 20 ++++++++++++++ .../server/MinecraftServer.java.patch | 20 ++++++++++++++ .../minecraft/src/DedicatedServer.java.patch | 27 +++++++++++++++++++ .../net/minecraft/src/EntityPlayer.java.patch | 17 ++++++++++-- .../minecraft/src/NetServerHandler.java.patch | 6 +++-- .../cpw/mods/fml/server/FMLServerHandler.java | 4 +-- server/net/minecraft/src/BaseMod.java | 6 ++--- 8 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 patches/minecraft/net/minecraft/src/MinecraftServer.java.patch create mode 100644 patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch create mode 100644 patches/minecraft_server/net/minecraft/src/DedicatedServer.java.patch diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/common/cpw/mods/fml/common/FMLCommonHandler.java index 8a4d72ea4f..fa283a006b 100644 --- a/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -657,4 +657,9 @@ public class FMLCommonHandler { worldGenerators.add(generator); } + + public void onWorldLoadTick() + { + tickStart(EnumSet.of(TickType.WORLDLOAD)); + } } diff --git a/patches/minecraft/net/minecraft/src/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/src/MinecraftServer.java.patch new file mode 100644 index 0000000000..10448a1d6d --- /dev/null +++ b/patches/minecraft/net/minecraft/src/MinecraftServer.java.patch @@ -0,0 +1,20 @@ +--- ../src-base/minecraft/net/minecraft/src/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src-work/minecraft/net/minecraft/src/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -12,6 +12,8 @@ + import java.util.logging.Level; + import java.util.logging.Logger; + ++import cpw.mods.fml.common.FMLCommonHandler; ++ + public abstract class MinecraftServer implements ICommandSender, IPlayerUsage, Runnable + { + public static Logger field_56394_a = Logger.getLogger("Minecraft"); +@@ -317,6 +319,8 @@ + { + long var1 = System.currentTimeMillis(); + ++ FMLCommonHandler.instance().onWorldLoadTick(); ++ + for (long var50 = 0L; this.field_56406_t; this.field_56383_O = true) + { + long var5 = System.currentTimeMillis(); diff --git a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch new file mode 100644 index 0000000000..57602128fa --- /dev/null +++ b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -0,0 +1,20 @@ +--- ../src-base/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src-work/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -11,6 +11,8 @@ + import java.util.List; + import java.util.logging.Level; + import java.util.logging.Logger; ++ ++import cpw.mods.fml.common.FMLCommonHandler; + import net.minecraft.src.AnvilSaveConverter; + import net.minecraft.src.AxisAlignedBB; + import net.minecraft.src.CallableMCS5; +@@ -350,6 +352,8 @@ + { + long var1 = System.currentTimeMillis(); + ++ FMLCommonHandler.instance().onWorldLoadTick(); ++ + for (long var50 = 0L; this.field_6025_n; this.field_56215_O = true) + { + long var5 = System.currentTimeMillis(); diff --git a/patches/minecraft_server/net/minecraft/src/DedicatedServer.java.patch b/patches/minecraft_server/net/minecraft/src/DedicatedServer.java.patch new file mode 100644 index 0000000000..c4bcd4be64 --- /dev/null +++ b/patches/minecraft_server/net/minecraft/src/DedicatedServer.java.patch @@ -0,0 +1,27 @@ +--- ../src-base/minecraft_server/net/minecraft/src/DedicatedServer.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src-work/minecraft_server/net/minecraft/src/DedicatedServer.java 0000-00-00 00:00:00.000000000 -0000 +@@ -8,6 +8,8 @@ + import java.util.List; + import java.util.Random; + import java.util.logging.Level; ++ ++import cpw.mods.fml.server.FMLServerHandler; + import net.minecraft.server.MinecraftServer; + + public class DedicatedServer extends MinecraftServer implements IServer +@@ -34,6 +36,7 @@ + var1.start(); + ConsoleLogManager.func_641_a(); + field_6038_a.info("Starting minecraft server version 12w26a"); ++ FMLServerHandler.instance().onPreLoad(this); + + if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) + { +@@ -99,6 +102,7 @@ + field_6038_a.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file."); + } + ++ FMLServerHandler.instance().onLoadComplete(); + this.func_56197_a(new DedicatedPlayerList(this)); + long var4 = System.nanoTime(); + diff --git a/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index 09580c7f29..cdabd00d1a 100644 --- a/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -1,6 +1,19 @@ --- ../src-base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src-work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -@@ -105,6 +105,7 @@ +@@ -1,8 +1,12 @@ + package net.minecraft.src; + ++import java.util.EnumSet; + import java.util.Iterator; + import java.util.List; + ++import cpw.mods.fml.common.FMLCommonHandler; ++import cpw.mods.fml.common.TickType; ++ + public abstract class EntityPlayer extends EntityLiving implements ICommandSender + { + public InventoryPlayer field_416_aj = new InventoryPlayer(this); +@@ -105,6 +109,7 @@ public void func_106_b_() { @@ -8,7 +21,7 @@ if (this.field_34908_d != null) { ItemStack var1 = this.field_416_aj.func_213_b(); -@@ -228,6 +229,7 @@ +@@ -228,6 +233,7 @@ { this.field_35217_m.func_35584_a(this); } diff --git a/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch b/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch index ee18da9b19..b76be2bf6c 100644 --- a/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch +++ b/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch @@ -9,13 +9,15 @@ import net.minecraft.server.MinecraftServer; public class NetServerHandler extends NetHandler -@@ -1014,4 +1016,9 @@ +@@ -1014,4 +1016,11 @@ } } } -+ ++//TODO ++ /* + @Override + public void func_44001_a(Packet250CustomPayload p_44001_1_) { + FMLServerHandler.instance().handlePacket250(p_44001_1_, field_16_e); + } ++ */ } diff --git a/server/cpw/mods/fml/server/FMLServerHandler.java b/server/cpw/mods/fml/server/FMLServerHandler.java index 853ca4fd4a..3b14800ef8 100644 --- a/server/cpw/mods/fml/server/FMLServerHandler.java +++ b/server/cpw/mods/fml/server/FMLServerHandler.java @@ -32,7 +32,7 @@ import net.minecraft.src.EntityItem; import net.minecraft.src.EntityPlayer; import net.minecraft.src.EntityPlayerMP; import net.minecraft.src.IChunkProvider; -import net.minecraft.src.ICommandListener; +import net.minecraft.src.ICommandManager; import net.minecraft.src.IInventory; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; @@ -508,7 +508,7 @@ public class FMLServerHandler implements IFMLSidedHandler * @param var2 * @return */ - public boolean handleServerCommand(String command, String player, ICommandListener listener) + public boolean handleServerCommand(String command, String player, ICommandManager listener) { for (ModContainer mod : Loader.getModList()) { diff --git a/server/net/minecraft/src/BaseMod.java b/server/net/minecraft/src/BaseMod.java index 6c3ff8fe08..3cc93395dc 100644 --- a/server/net/minecraft/src/BaseMod.java +++ b/server/net/minecraft/src/BaseMod.java @@ -61,7 +61,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod } @Override - public final boolean dispense(double x, double y, double z, byte xVelocity, byte zVelocity, Object... data) + public final boolean dispense(double x, double y, double z, int xVelocity, int zVelocity, Object... data) { return dispenseEntity((World)data[0], x, y, z, xVelocity, zVelocity, (ItemStack)data[1]); } @@ -134,7 +134,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod @Override public final boolean handleCommand(String command, Object... data) { - return onServerCommand(command, (String)data[0], (ICommandListener)data[1]); + return onServerCommand(command, (String)data[0], (ICommandManager)data[1]); } // BASEMOD API /** @@ -359,7 +359,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod * @param command * @return true if you want to consume the message so it is not available for further processing */ - public boolean onServerCommand(String command, String sender, ICommandListener listener) + public boolean onServerCommand(String command, String sender, ICommandManager listener) { return false; }