From 6eb4bceee35141849efba8c33305106e379327d0 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 9 Aug 2012 09:21:16 -0400 Subject: [PATCH] Add in missing patch - also, launch FML properly from the server --- .../cpw/mods/fml/client/FMLClientHandler.java | 13 ++++++++++ .../cpw/mods/fml/common/FMLCommonHandler.java | 23 +++++++++++++++++ .../cpw/mods/fml/common/IFMLSidedHandler.java | 6 +++++ .../minecraft/src/DedicatedServer.java.patch | 25 +++++++++++++++++++ .../src/EntityTrackerEntry.java.patch | 16 +++++++++++- .../cpw/mods/fml/server/FMLServerHandler.java | 4 +++ 6 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 fml/patches/common/net/minecraft/src/DedicatedServer.java.patch diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index 9fda5eeb9c..19185d1445 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -47,6 +47,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; +import net.minecraft.server.MinecraftServer; import net.minecraft.src.BaseMod; import net.minecraft.src.BiomeGenBase; import net.minecraft.src.Block; @@ -409,4 +410,16 @@ public class FMLClientHandler implements IFMLSidedHandler ent.field_70117_cu = packet.serverY; ent.field_70116_cv = packet.serverZ; } + + @Override + public void beginServerLoading(MinecraftServer server) + { + // NOOP + } + + @Override + public void finishServerLoading() + { + // NOOP + } } diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java index 82ac129f0e..0bd56fa471 100644 --- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Random; +import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -35,10 +36,12 @@ import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; import net.minecraft.server.MinecraftServer; +import net.minecraft.src.DedicatedServer; import net.minecraft.src.Entity; import net.minecraft.src.World; import com.google.common.base.Strings; +import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Lists; @@ -356,4 +359,24 @@ public class FMLCommonHandler { sidedDelegate.adjustEntityLocationOnClient(entitySpawnAdjustmentPacket); } + + public void onServerStart(DedicatedServer dedicatedServer) + { + try + { + // Done this way so that the client doesn't depend on server side handler + Class cls = Class.forName("cpw.mods.fml.server.FMLServerHandler", true, getClass().getClassLoader()); + } + catch (ClassNotFoundException e) + { + FMLLog.log(Level.SEVERE, e, "Unable to load the FML server handler"); + throw Throwables.propagate(e); + } + sidedDelegate.beginServerLoading(dedicatedServer); + } + + public void onServerStarted() + { + sidedDelegate.finishServerLoading(); + } } diff --git a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java index a856d5ebc8..a22dc39e2c 100644 --- a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java +++ b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java @@ -7,6 +7,8 @@ import java.util.List; import java.util.Properties; import java.util.logging.Logger; +import net.minecraft.server.MinecraftServer; +import net.minecraft.src.DedicatedServer; import net.minecraft.src.Entity; import net.minecraft.src.World; @@ -31,4 +33,8 @@ public interface IFMLSidedHandler Entity spawnEntityIntoClientWorld(Class entityClass, EntitySpawnPacket packet); void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket entitySpawnAdjustmentPacket); + + void beginServerLoading(MinecraftServer server); + + void finishServerLoading(); } diff --git a/fml/patches/common/net/minecraft/src/DedicatedServer.java.patch b/fml/patches/common/net/minecraft/src/DedicatedServer.java.patch new file mode 100644 index 0000000000..7e4aae7981 --- /dev/null +++ b/fml/patches/common/net/minecraft/src/DedicatedServer.java.patch @@ -0,0 +1,25 @@ +--- ../src-base/common/net/minecraft/src/DedicatedServer.java ++++ ../src-work/common/net/minecraft/src/DedicatedServer.java +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import cpw.mods.fml.common.FMLCommonHandler; + import cpw.mods.fml.common.Side; + import cpw.mods.fml.common.asm.SideOnly; + import java.io.File; +@@ -36,6 +37,7 @@ + var1.start(); + ConsoleLogManager.func_73699_a(); + field_71306_a.info("Starting minecraft server version 1.3.1"); ++ FMLCommonHandler.instance().onServerStart(this); + + if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) + { +@@ -101,6 +103,7 @@ + field_71306_a.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file."); + } + ++ FMLCommonHandler.instance().onServerStarted(); + this.func_71210_a(new DedicatedPlayerList(this)); + long var4 = System.nanoTime(); + diff --git a/fml/patches/common/net/minecraft/src/EntityTrackerEntry.java.patch b/fml/patches/common/net/minecraft/src/EntityTrackerEntry.java.patch index 2b8b2c5ada..76875aed81 100644 --- a/fml/patches/common/net/minecraft/src/EntityTrackerEntry.java.patch +++ b/fml/patches/common/net/minecraft/src/EntityTrackerEntry.java.patch @@ -9,7 +9,21 @@ public class EntityTrackerEntry { -@@ -306,6 +308,13 @@ +@@ -232,6 +234,13 @@ + this.field_73138_k = this.field_73132_a.field_70181_x; + this.field_73135_l = this.field_73132_a.field_70179_y; + ++ int posX = MathHelper.func_76128_c(this.field_73137_j * 32.0D); ++ int posY = MathHelper.func_76128_c(this.field_73138_k * 32.0D); ++ int posZ = MathHelper.func_76128_c(this.field_73135_l * 32.0D); ++ if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f) ++ { ++ FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a.field_70157_k, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f); ++ } + if (this.field_73143_t && !(var6 instanceof Packet24MobSpawn)) + { + p_73117_1_.field_71135_a.func_72567_b(new Packet28EntityVelocity(this.field_73132_a.field_70157_k, this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y)); +@@ -306,6 +315,13 @@ System.out.println("Fetching addPacket for removed entity"); } diff --git a/fml/server/cpw/mods/fml/server/FMLServerHandler.java b/fml/server/cpw/mods/fml/server/FMLServerHandler.java index 3a2c7485fc..893bc7d3e2 100644 --- a/fml/server/cpw/mods/fml/server/FMLServerHandler.java +++ b/fml/server/cpw/mods/fml/server/FMLServerHandler.java @@ -89,6 +89,10 @@ public class FMLServerHandler implements IFMLSidedHandler */ private MinecraftServer server; + private FMLServerHandler() + { + FMLCommonHandler.instance().beginLoading(this); + } /** * Called to start the whole game off from * {@link MinecraftServer#startServer}