diff --git a/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch index 42ad4d327..b398c901b 100644 --- a/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -5,7 +5,7 @@ import java.util.logging.Level; import java.util.logging.Logger; + -+import cpw.mods.fml.server.FMLHandler; ++import cpw.mods.fml.server.FMLServerHandler; import net.minecraft.src.AnvilSaveConverter; import net.minecraft.src.AnvilSaveHandler; import net.minecraft.src.AxisAlignedBB; @@ -13,7 +13,7 @@ var1.start(); ConsoleLogManager.func_641_a(); field_6038_a.info("Starting minecraft server version 1.2.5"); -+ FMLHandler.instance().onPreLoad(this); ++ FMLServerHandler.instance().onPreLoad(this); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { @@ -21,7 +21,7 @@ field_6038_a.warning("To change this, set \"online-mode\" to \"true\" in the server.settings file."); } -+ FMLHandler.instance().onLoadComplete(); ++ FMLServerHandler.instance().onLoadComplete(); this.field_6033_f = new ServerConfigurationManager(this); this.field_6028_k[0] = new EntityTracker(this, 0); this.field_6028_k[1] = new EntityTracker(this, -1); @@ -29,7 +29,7 @@ var7 = 0L; } -+ FMLHandler.instance().onPreTick(); ++ FMLServerHandler.instance().onPreTick(); var3 += var7; var1 = var5; @@ -37,7 +37,7 @@ this.func_6018_h(); } } -+ FMLHandler.instance().onPostTick(); ++ FMLServerHandler.instance().onPostTick(); } } else diff --git a/fml/patches/minecraft_server/net/minecraft/src/BlockDispenser.java.patch b/fml/patches/minecraft_server/net/minecraft/src/BlockDispenser.java.patch index ef0afcf85..5e398b48d 100644 --- a/fml/patches/minecraft_server/net/minecraft/src/BlockDispenser.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/src/BlockDispenser.java.patch @@ -4,7 +4,7 @@ import java.util.Random; -+import cpw.mods.fml.server.FMLHandler; ++import cpw.mods.fml.server.FMLServerHandler; + public class BlockDispenser extends BlockContainer { @@ -14,7 +14,7 @@ else { - if (var12.field_855_c == Item.field_4148_j.field_234_aS) -+ if (FMLHandler.instance().tryDispensingEntity(p_21036_1_, var13, var15, var17, var9, var10, var12)) { ++ if (FMLServerHandler.instance().tryDispensingEntity(p_21036_1_, var13, var15, var17, var9, var10, var12)) { + ; + } + else if (var12.field_855_c == Item.field_4148_j.field_234_aS) diff --git a/fml/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch b/fml/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch index 289de42d9..60279f63f 100644 --- a/fml/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; -+import cpw.mods.fml.server.FMLHandler; ++import cpw.mods.fml.server.FMLServerHandler; + public class ChunkProviderServer implements IChunkProvider { @@ -13,7 +13,7 @@ if (this.field_730_c != null) { this.field_730_c.func_4055_a(p_4055_1_, p_4055_2_, p_4055_3_); -+ FMLHandler.instance().onChunkPopulate(p_4055_1_, p_4055_2_, p_4055_3_, this.field_726_g, this.field_730_c); ++ FMLServerHandler.instance().onChunkPopulate(p_4055_1_, p_4055_2_, p_4055_3_, this.field_726_g, this.field_730_c); var4.func_336_e(); } } diff --git a/fml/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch b/fml/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch index d1c513737..c79efe0a6 100644 --- a/fml/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch @@ -3,7 +3,7 @@ @@ -1,5 +1,7 @@ package net.minecraft.src; -+import cpw.mods.fml.server.FMLHandler; ++import cpw.mods.fml.server.FMLServerHandler; + public class EntityItem extends Entity { @@ -12,7 +12,7 @@ if (this.field_433_ad == 0 && p_6093_1_.field_416_aj.func_201_a(this.field_429_a)) { -+ FMLHandler.instance().notifyItemPickup(this,p_6093_1_); ++ FMLServerHandler.instance().notifyItemPickup(this,p_6093_1_); if (this.field_429_a.field_855_c == Block.field_582_K.field_573_bc) { p_6093_1_.func_27017_a(AchievementList.field_25131_c); diff --git a/fml/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch b/fml/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch index 8d7271642..5992f0c4f 100644 --- a/fml/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch @@ -5,7 +5,7 @@ import java.util.Random; import java.util.logging.Logger; + -+import cpw.mods.fml.server.FMLHandler; ++import cpw.mods.fml.server.FMLServerHandler; import net.minecraft.server.MinecraftServer; public class NetServerHandler extends NetHandler implements ICommandListener @@ -14,7 +14,7 @@ } - if (var2.startsWith("/")) -+ if (FMLHandler.instance().handleChatPacket(p_23_1_,field_16_e)) { ++ if (FMLServerHandler.instance().handleChatPacket(p_23_1_,field_16_e)) { + // We handled it + } + else if (var2.startsWith("/")) @@ -28,6 +28,6 @@ + + @Override + public void func_44001_a(Packet250CustomPayload p_44001_1_) { -+ FMLHandler.instance().handlePacket250(p_44001_1_, field_16_e); ++ FMLServerHandler.instance().handlePacket250(p_44001_1_, field_16_e); + } } diff --git a/fml/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/fml/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch index 7dfb6c954..5b974ab12 100644 --- a/fml/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -3,7 +3,7 @@ @@ -1,5 +1,7 @@ package net.minecraft.src; -+import cpw.mods.fml.server.FMLHandler; ++import cpw.mods.fml.server.FMLServerHandler; + public class TileEntityFurnace extends TileEntity implements IInventory { @@ -13,7 +13,7 @@ { int var1 = p_194_1_.func_569_a().field_234_aS; - return var1 < 256 && Block.field_542_n[var1].field_553_bn == Material.field_524_c ? 300 : (var1 == Item.field_209_B.field_234_aS ? 100 : (var1 == Item.field_168_k.field_234_aS ? 1600 : (var1 == Item.field_201_aw.field_234_aS ? 20000 : (var1 == Block.field_6047_y.field_573_bc ? 100 : (var1 == Item.field_40239_bm.field_234_aS ? 2400 : 0))))); -+ return var1 < 256 && Block.field_542_n[var1].field_553_bn == Material.field_524_c ? 300 : (var1 == Item.field_209_B.field_234_aS ? 100 : (var1 == Item.field_168_k.field_234_aS ? 1600 : (var1 == Item.field_201_aw.field_234_aS ? 20000 : (var1 == Block.field_6047_y.field_573_bc ? 100 : (var1 == Item.field_40239_bm.field_234_aS ? 2400 : FMLHandler.instance().fuelLookup(var1, p_194_1_.func_21125_h())))))); ++ return var1 < 256 && Block.field_542_n[var1].field_553_bn == Material.field_524_c ? 300 : (var1 == Item.field_209_B.field_234_aS ? 100 : (var1 == Item.field_168_k.field_234_aS ? 1600 : (var1 == Item.field_201_aw.field_234_aS ? 20000 : (var1 == Block.field_6047_y.field_573_bc ? 100 : (var1 == Item.field_40239_bm.field_234_aS ? 2400 : FMLServerHandler.instance().fuelLookup(var1, p_194_1_.func_21125_h())))))); } } diff --git a/fml/update_patches.sh b/fml/update_patches.sh index 1ff0d709d..bec1ddecf 100644 --- a/fml/update_patches.sh +++ b/fml/update_patches.sh @@ -1 +1 @@ -python update_patches.py patches .. patches +python update_patches.py .. patches