keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Update the patches and fix the shell script

This commit is contained in:
Christian Weeks 2012-04-05 11:42:33 -04:00
parent 3b19792a12
commit ae927a3cf8
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
View File

@ -5,7 +5,7 @@
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; 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.AnvilSaveConverter;
import net.minecraft.src.AnvilSaveHandler; import net.minecraft.src.AnvilSaveHandler;
import net.minecraft.src.AxisAlignedBB; import net.minecraft.src.AxisAlignedBB;
@ -13,7 +13,7 @@
var1.start(); var1.start();
ConsoleLogManager.func_641_a(); ConsoleLogManager.func_641_a();
field_6038_a.info("Starting minecraft server version 1.2.5"); 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) 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."); 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_6033_f = new ServerConfigurationManager(this);
this.field_6028_k[0] = new EntityTracker(this, 0); this.field_6028_k[0] = new EntityTracker(this, 0);
this.field_6028_k[1] = new EntityTracker(this, -1); this.field_6028_k[1] = new EntityTracker(this, -1);
@ -29,7 +29,7 @@
var7 = 0L; var7 = 0L;
} }
+ FMLHandler.instance().onPreTick(); + FMLServerHandler.instance().onPreTick();
var3 += var7; var3 += var7;
var1 = var5; var1 = var5;
@ -37,7 +37,7 @@
this.func_6018_h(); this.func_6018_h();
} }
} }
+ FMLHandler.instance().onPostTick(); + FMLServerHandler.instance().onPostTick();
} }
} }
else else

4
fml/patches/minecraft_server/net/minecraft/src/BlockDispenser.java.patch
View File

@ -4,7 +4,7 @@
import java.util.Random; import java.util.Random;
+import cpw.mods.fml.server.FMLHandler; +import cpw.mods.fml.server.FMLServerHandler;
+ +
public class BlockDispenser extends BlockContainer public class BlockDispenser extends BlockContainer
{ {
@ -14,7 +14,7 @@
else else
{ {
- if (var12.field_855_c == Item.field_4148_j.field_234_aS) - 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) + else if (var12.field_855_c == Item.field_4148_j.field_234_aS)

4
fml/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch
View File

@ -4,7 +4,7 @@
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
+import cpw.mods.fml.server.FMLHandler; +import cpw.mods.fml.server.FMLServerHandler;
+ +
public class ChunkProviderServer implements IChunkProvider public class ChunkProviderServer implements IChunkProvider
{ {
@ -13,7 +13,7 @@
if (this.field_730_c != null) if (this.field_730_c != null)
{ {
this.field_730_c.func_4055_a(p_4055_1_, p_4055_2_, p_4055_3_); 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(); var4.func_336_e();
} }
} }

4
fml/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch
View File

@ -3,7 +3,7 @@
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
package net.minecraft.src; package net.minecraft.src;
+import cpw.mods.fml.server.FMLHandler; +import cpw.mods.fml.server.FMLServerHandler;
+ +
public class EntityItem extends Entity 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)) 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) 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); p_6093_1_.func_27017_a(AchievementList.field_25131_c);

6
fml/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
View File

@ -5,7 +5,7 @@
import java.util.Random; import java.util.Random;
import java.util.logging.Logger; import java.util.logging.Logger;
+ +
+import cpw.mods.fml.server.FMLHandler; +import cpw.mods.fml.server.FMLServerHandler;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
public class NetServerHandler extends NetHandler implements ICommandListener public class NetServerHandler extends NetHandler implements ICommandListener
@ -14,7 +14,7 @@
} }
- if (var2.startsWith("/")) - 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 + // We handled it
+ } + }
+ else if (var2.startsWith("/")) + else if (var2.startsWith("/"))
@ -28,6 +28,6 @@
+ +
+ @Override + @Override
+ public void func_44001_a(Packet250CustomPayload p_44001_1_) { + 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);
+ } + }
} }

4
fml/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch
View File

@ -3,7 +3,7 @@
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
package net.minecraft.src; package net.minecraft.src;
+import cpw.mods.fml.server.FMLHandler; +import cpw.mods.fml.server.FMLServerHandler;
+ +
public class TileEntityFurnace extends TileEntity implements IInventory public class TileEntityFurnace extends TileEntity implements IInventory
{ {
@ -13,7 +13,7 @@
{ {
int var1 = p_194_1_.func_569_a().field_234_aS; 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 : 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()))))));
} }
} }

2
fml/update_patches.sh
View File

@ -1 +1 @@
python update_patches.py patches .. patches python update_patches.py .. patches