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

Initial checkin. Some patches are probably missing, but client compiles.

This commit is contained in:
Christian 2012-06-29 20:18:04 -04:00
parent 731dbf5175
commit b51ce21b70
39 changed files with 210 additions and 506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fml/client/cpw/mods/fml/client/FMLClientHandler.java
View File

@ -238,11 +238,11 @@ public class FMLClientHandler implements IFMLSidedHandler
*/
public void onPreWorldTick()
{
if (client.field_6324_e != null) {
// For the client world ticks and game ticks are the same
FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLD), client.field_6324_e, client.field_6313_p, client.field_6324_e);
FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.GAME,TickType.WORLDGUI), 0.0f, client.field_6313_p, client.field_6324_e);
}
// if (client.field_6324_e != null) {
// // For the client world ticks and game ticks are the same
// FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLD), client.field_6324_e, client.field_6313_p, client.field_6324_e);
// FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.GAME,TickType.WORLDGUI), 0.0f, client.field_6313_p, client.field_6324_e);
// }
}
/**
@ -250,11 +250,11 @@ public class FMLClientHandler implements IFMLSidedHandler
*/
public void onPostWorldTick()
{
if (client.field_6324_e != null) {
// For the client world ticks and game ticks are the same
FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.WORLD), client.field_6324_e, client.field_6313_p, client.field_6324_e);
FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.GAME,TickType.WORLDGUI), 0.0f, client.field_6313_p, client.field_6324_e);
}
// if (client.field_6324_e != null) {
// // For the client world ticks and game ticks are the same
// FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.WORLD), client.field_6324_e, client.field_6313_p, client.field_6324_e);
// FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.GAME,TickType.WORLDGUI), 0.0f, client.field_6313_p, client.field_6324_e);
// }
for (IKeyHandler entry : keyHandlers)
{
entry.onEndTick();
@ -263,14 +263,14 @@ public class FMLClientHandler implements IFMLSidedHandler
public void onWorldLoadTick()
{
if (client.field_6324_e != null) {
// if (client.field_6324_e != null) {
if (firstTick)
{
loadTextures(fallbackTexturePack);
firstTick = false;
}
FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLDLOAD,TickType.GUILOAD));
}
// }
}
public void onRenderTickStart(float partialTickTime)
@ -531,14 +531,14 @@ public class FMLClientHandler implements IFMLSidedHandler
continue;
}
if ("REGISTER".equals(packet.field_44012_a))
{
FMLCommonHandler.instance().activateChannel(client.field_6322_g,channel);
}
else
{
FMLCommonHandler.instance().deactivateChannel(client.field_6322_g,channel);
}
// if ("REGISTER".equals(packet.field_44012_a))
// {
// FMLCommonHandler.instance().activateChannel(client.field_6322_g,channel);
// }
// else
// {
// FMLCommonHandler.instance().deactivateChannel(client.field_6322_g,channel);
// }
}
}
catch (UnsupportedEncodingException e)
@ -921,10 +921,10 @@ public class FMLClientHandler implements IFMLSidedHandler
/**
*
*/
public void preGameLoad(String user, String sessionToken)
public void preGameLoad(String[] args)
{
// Currently this does nothing, but it's possible I could relaunch Minecraft in a new classloader if I wished
Minecraft.fmlReentry(user, sessionToken);
Minecraft.fmlReentry(args);
}
public void onTexturePackChange(RenderEngine engine, TexturePackBase texturepack, List<TextureFX> effects)

52
fml/client/net/minecraft/src/BaseMod.java
View File

@ -34,7 +34,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
{
this.keyboardEvent((KeyBinding)keybinding);
}
/**
* @param minecraftInstance
* @return
@ -42,7 +42,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
public final boolean doTickInGame(TickType tick, boolean tickEnd, Object minecraftInstance, Object... data)
{
Minecraft mc = (Minecraft) minecraftInstance;
boolean hasWorld = mc.field_6324_e != null;
boolean hasWorld = true;
// World and render ticks
if (tickEnd && ( tick==TickType.RENDER || tick==TickType.GAME ) && hasWorld) {
return onTickInGame((Float) data[0], mc);
@ -58,11 +58,11 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
public final void onRenderHarvest(Map renderers)
{
addRenderer((Map<Class<? extends Entity>,Render>)renderers);
}
/**
*
*
*/
public final void onRegisterAnimations()
{
@ -99,11 +99,11 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
public final void onServerLogin(Object handler) {
serverConnect((NetClientHandler) handler);
}
public final void onServerLogout() {
serverDisconnect();
}
@Override
public final void onPlayerLogin(Object player)
{
@ -163,7 +163,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
// BASEMOD API
/**
* Override if you wish to provide a fuel item for the furnace and return the fuel value of the item
*
*
* @param id
* @param metadata
* @return
@ -180,7 +180,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Override if you wish to perform some action other than just dispensing the item from the dispenser
*
*
* @param world
* @param x
* @param y
@ -197,7 +197,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Override if you wish to generate Nether (Hell biome) blocks
*
*
* @param world
* @param random
* @param chunkX
@ -209,7 +209,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Override if you wish to generate Overworld (not hell or the end) blocks
*
*
* @param world
* @param random
* @param chunkX
@ -221,7 +221,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Return the name of your mod. Defaults to the class name
*
*
* @return
*/
public String getName()
@ -231,7 +231,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Get your mod priorities
*
*
* @return
*/
public String getPriorities()
@ -241,7 +241,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Return the version of your mod
*
*
* @return
*/
public abstract String getVersion();
@ -265,7 +265,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Handle item pickup
*
*
* @param player
* @param item
*/
@ -275,7 +275,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Ticked every game tick if you have subscribed to tick events through {@link ModLoader#setInGameHook(BaseMod, boolean, boolean)}
*
*
* @param time the rendering subtick time (0.0-1.0)
* @param minecraftInstance the client
* @return true to continue receiving ticks
@ -293,7 +293,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Only implemented on the client side
* {@link #onChatMessageReceived(EntityPlayer, Packet3Chat)}
*
*
* @param text
*/
public void receiveChatPacket(String text)
@ -304,7 +304,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Only called on the client side
* {@link #onPacket250Received(EntityPlayer, Packet250CustomPayload)}
*
*
* @param packet
*/
public void receiveCustomPacket(Packet250CustomPayload packet)
@ -329,15 +329,15 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
}
public void serverConnect(NetClientHandler handler) {
}
public void serverDisconnect() {
}
/**
* Called when someone crafts an item from a crafting table
*
*
* @param player
* @param item
* @param matrix
@ -377,7 +377,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Called when a chat message is received. Return true to stop further processing
*
*
* @param source
* @param chat
* @return true if you want to consume the message so it is not available for further processing
@ -398,7 +398,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Called when a new client logs in.
*
*
* @param player
*/
public void onClientLogin(EntityPlayer player)
@ -407,7 +407,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
/**
* Called when a client logs out of the server.
*
*
* @param player
*/
public void onClientLogout(EntityPlayer player)
@ -416,9 +416,9 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
}
/**
*
*
* Called when a client changes dimensions on the server.
*
*
* @param player
*/
public void onClientDimensionChanged(EntityPlayer player)

2
fml/getversion.py
View File

@ -40,7 +40,7 @@ def main():
f.write("%s=%s\n" %("fmlbuild.minor.number",minor))
f.write("%s=%s\n" %("fmlbuild.revision.number",rev))
f.write("%s=%s\n" %("fmlbuild.githash",githash))
f.write("%s=%s\n" %("fmlbuild.mcversion","1.2.5"))
f.write("%s=%s\n" %("fmlbuild.mcversion","12w24a"))
if __name__ == '__main__':
main()

62
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
View File

@ -1,25 +1,16 @@
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java 0000-00-00 00:00:00.000000000 -0000
@@ -9,6 +9,7 @@
import java.awt.Graphics;
import java.io.File;
import java.text.DecimalFormat;
+import java.util.EnumSet;
import java.util.List;
import net.minecraft.src.AchievementList;
import net.minecraft.src.AnvilSaveConverter;
@@ -117,6 +118,10 @@
@@ -120,6 +120,9 @@
import org.lwjgl.opengl.PixelFormat;
import org.lwjgl.util.glu.GLU;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.TickType;
+
public abstract class Minecraft implements Runnable
public abstract class Minecraft implements IPlayerUsage, Runnable
{
public static byte[] field_28006_b = new byte[10485760];
@@ -288,6 +293,7 @@
@@ -301,6 +304,7 @@
this.field_6315_n = new RenderEngine(this.field_6298_C, this.field_6304_y);
this.func_6257_q();
this.field_6314_o = new FontRenderer(this.field_6304_y, "/font/default.png", this.field_6315_n, false);
@ -27,7 +18,7 @@
this.field_40007_r = new FontRenderer(this.field_6304_y, "/font/alternate.png", this.field_6315_n, false);
if (this.field_6304_y.field_44018_Q != null)
@@ -330,6 +336,9 @@
@@ -332,6 +336,9 @@
GL11.glMatrixMode(GL11.GL_PROJECTION);
GL11.glLoadIdentity();
GL11.glMatrixMode(GL11.GL_MODELVIEW);
@ -35,37 +26,23 @@
+ this.field_9231_Y.setup();
+ this.field_9232_X.setup();
this.func_6250_c("Startup");
this.field_6286_O = new OpenGlCapsChecker();
this.field_6301_A.func_340_a(this.field_6304_y);
@@ -744,9 +753,11 @@
this.field_6327_b.func_6467_a(this.field_9237_P.field_1378_c);
}
this.field_6315_n.func_1066_a(this.field_9231_Y);
@@ -1337,11 +1344,13 @@
+ FMLClientHandler.instance().onRenderTickStart(this.field_9237_P.field_1378_c);
Profiler.func_40661_c("gameRenderer");
this.field_9243_r.func_4136_b(this.field_9237_P.field_1378_c);
Profiler.func_40662_b();
+ FMLClientHandler.instance().onRenderTickEnd(this.field_9237_P.field_1378_c);
}
GL11.glFlush();
@@ -1330,6 +1341,7 @@
public void func_6246_i()
public void func_6246_i() throws IOException
{
+ FMLCommonHandler.instance().rescheduleTicks();
if (this.field_35001_ab > 0)
{
--this.field_35001_ab;
@@ -1340,6 +1352,7 @@
this.func_28001_B();
}
+ FMLClientHandler.instance().onPreWorldTick();
Profiler.func_40663_a("stats");
this.field_25001_G.func_27178_d();
Profiler.func_40661_c("gui");
@@ -1730,6 +1743,7 @@
@@ -1710,6 +1719,7 @@
}
Profiler.func_40662_b();
@ -73,23 +50,22 @@
this.field_6287_N = System.currentTimeMillis();
}
@@ -1985,6 +1999,7 @@
@@ -1854,6 +1864,7 @@
System.gc();
this.field_6287_N = 0L;
+ FMLClientHandler.instance().onWorldLoadTick();
}
private void func_22002_b(String p_22002_1_, String p_22002_2_)
@@ -2250,7 +2265,11 @@
{
var2 = p_main_0_[1];
}
+ FMLClientHandler.instance().preGameLoad(var1, var2);
public void func_6268_a(String p_6268_1_, File p_6268_2_)
@@ -1944,6 +1955,10 @@
public static void main(String[] p_main_0_)
{
+ FMLClientHandler.instance().preGameLoad(p_main_0_);
+ }
+ public static void fmlReentry(String var1, String var2)
+ public static void fmlReentry(String[] p_main_0_)
+ {
func_6269_a(var1, var2);
}
HashMap var1 = new HashMap();
boolean var2 = false;
boolean var3 = true;

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

@ -9,16 +9,3 @@
public class BlockDispenser extends BlockContainer
{
private Random field_28035_a = new Random();
@@ -141,7 +143,11 @@
}
else
{
- if (var12.field_1617_c == Item.field_226_j.field_291_aS)
+ if (FMLClientHandler.instance().tryDispensingEntity(p_21033_1_, var13, var15, var17, var9, var10, var12))
+ {
+ ;
+ }
+ else if (var12.field_1617_c == Item.field_226_j.field_291_aS)
{
EntityArrow var19 = new EntityArrow(p_21033_1_, var13, var15, var17);
var19.func_408_a((double)var9, 0.10000000149011612D, (double)var10, 1.1F, 6.0F);

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

@ -1,14 +1,15 @@
--- ../src-base/minecraft/net/minecraft/src/EntityItem.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/EntityItem.java 0000-00-00 00:00:00.000000000 -0000
@@ -1,5 +1,7 @@
package net.minecraft.src;
@@ -2,6 +2,8 @@
import java.util.Iterator;
+import cpw.mods.fml.client.FMLClientHandler;
+
public class EntityItem extends Entity
{
public ItemStack field_801_a;
@@ -140,6 +142,7 @@
@@ -198,6 +200,7 @@
if (this.field_805_c == 0 && p_6378_1_.field_778_b.func_504_a(this.field_801_a))
{

2
fml/patches/minecraft/net/minecraft/src/EntityList.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/src/EntityList.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/EntityList.java 0000-00-00 00:00:00.000000000 -0000
@@ -166,4 +166,17 @@
@@ -174,4 +174,17 @@
func_46152_a(EntityVillager.class, "Villager", 120, 5651507, 12422002);
func_1080_a(EntityEnderCrystal.class, "EnderCrystal", 200);
}

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

@ -10,10 +10,10 @@
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.TickType;
+
public abstract class EntityPlayer extends EntityLiving
public abstract class EntityPlayer extends EntityLiving implements ICommandSender
{
public InventoryPlayer field_778_b = new InventoryPlayer(this);
@@ -122,6 +126,7 @@
@@ -123,6 +127,7 @@
public void func_370_e_()
{
@ -21,7 +21,7 @@
if (this.field_34907_d != null)
{
ItemStack var1 = this.field_778_b.func_494_a();
@@ -253,6 +258,7 @@
@@ -246,6 +251,7 @@
{
this.field_35217_av.func_35768_a(this);
}

10
fml/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch
View File

@ -1,10 +0,0 @@
--- ../src-base/minecraft/net/minecraft/src/GuiCreateWorld.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/GuiCreateWorld.java 0000-00-00 00:00:00.000000000 -0000
@@ -164,6 +164,7 @@
this.field_945_b.field_6327_b = new PlayerControllerSP(this.field_945_b);
}
+ WorldType.field_48637_a[this.field_46030_z].onGUICreateWorldPress();
this.field_945_b.func_6247_b(this.field_22132_k, this.field_22134_h.func_22071_a(), new WorldSettings(var2, var9, this.field_35365_g, this.field_40232_h, WorldType.field_48637_a[this.field_46030_z]));
this.field_945_b.func_6272_a((GuiScreen)null);
}

43
fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/src/GuiMainMenu.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/GuiMainMenu.java 0000-00-00 00:00:00.000000000 -0000
@@ -11,6 +11,9 @@
@@ -12,6 +12,9 @@
import org.lwjgl.opengl.GL11;
import org.lwjgl.util.glu.GLU;
@ -10,37 +10,46 @@
public class GuiMainMenu extends GuiScreen
{
private static final Random field_6463_h = new Random();
@@ -91,7 +94,8 @@
int var4 = this.field_950_d / 4 + 48;
this.field_949_e.add(new GuiButton(1, this.field_951_c / 2 - 100, var4, var2.func_20163_a("menu.singleplayer")));
this.field_949_e.add(this.field_25096_l = new GuiButton(2, this.field_951_c / 2 - 100, var4 + 24, var2.func_20163_a("menu.multiplayer")));
@@ -117,7 +120,9 @@
this.func_55154_a(var4, 24, var2);
}
- this.field_949_e.add(new GuiButton(3, this.field_951_c / 2 - 100, var4 + 48, var2.func_20163_a("menu.mods")));
+// this.field_949_e.add(new GuiButton(3, this.field_951_c / 2 - 100, var4 + 48, var2.func_20163_a("menu.mods")));
+ this.field_949_e.add(new GuiButton(3, this.field_951_c / 2 - 100, var4 + 48, 98, 20, var2.func_20163_a("menu.mods")));
+ this.field_949_e.add(new GuiButton(6, this.field_951_c / 2 + 2, var4 + 48, 98, 20, "Mods"));
if (this.field_945_b.field_6317_l)
{
@@ -142,6 +146,11 @@
@@ -149,6 +154,7 @@
{
this.field_55155_d.field_937_g = false;
}
+
}
protected void func_572_a(GuiButton p_572_1_)
@@ -183,6 +189,10 @@
this.field_945_b.func_6244_d();
}
+
+ if (p_572_1_.field_938_f == 6)
+ {
+ this.field_945_b.func_6272_a(new GuiModList(this));
+ }
}
if (p_572_1_.field_938_f == 11)
{
this.field_945_b.func_56442_a("Demo_World", DemoWorldServer.field_56874_a);
@@ -399,7 +409,11 @@
var9 = var9 + " Demo";
}
private void func_35355_b(int p_35355_1_, int p_35355_2_, float p_35355_3_)
@@ -324,7 +333,10 @@
GL11.glScalef(var8, var8, var8);
this.func_548_a(this.field_6451_g, this.field_6462_l, 0, -8, 16776960);
GL11.glPopMatrix();
- this.func_547_b(this.field_6451_g, "Minecraft 1.2.5", 2, this.field_950_d - 10, 16777215);
+ String[] brandings=FMLCommonHandler.instance().getBrandingStrings("Minecraft 1.2.5");
- this.func_547_b(this.field_6451_g, var9, 2, this.field_950_d - 10, 16777215);
+ String[] brandings=FMLCommonHandler.instance().getBrandingStrings(var9);
+ for (int i=0; i<brandings.length; i++) {
+ this.func_547_b(this.field_6451_g, brandings[i], 2, this.field_950_d - ( 10 + i * (this.field_6451_g.field_41063_b +1)), 16777215);
+ }
String var9 = "Copyright Mojang AB. Do not distribute!";
this.func_547_b(this.field_6451_g, var9, this.field_951_c - this.field_6451_g.func_871_a(var9) - 2, this.field_950_d - 10, 16777215);
+// this.func_547_b(this.field_6451_g, var9, 2, this.field_950_d - 10, 16777215);
String var10 = "Copyright Mojang AB. Do not distribute!";
this.func_547_b(this.field_6451_g, var10, this.field_951_c - this.field_6451_g.func_871_a(var10) - 2, this.field_950_d - 10, 16777215);
super.func_571_a(p_571_1_, p_571_2_, p_571_3_);

44
fml/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
View File

@ -1,41 +1,25 @@
--- ../src-base/minecraft/net/minecraft/src/NetClientHandler.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/NetClientHandler.java 0000-00-00 00:00:00.000000000 -0000
@@ -14,6 +14,8 @@
import java.util.List;
import java.util.Map;
import java.util.Random;
+
+import cpw.mods.fml.client.FMLClientHandler;
@@ -22,6 +22,8 @@
import net.minecraft.client.Minecraft;
import org.lwjgl.input.Keyboard;
+import cpw.mods.fml.client.FMLClientHandler;
+
public class NetClientHandler extends NetHandler
@@ -59,6 +61,7 @@
this.field_1212_e.field_6322_g.field_620_ab = p_4115_1_.field_519_a;
this.field_35785_d = p_4115_1_.field_35251_h;
((PlayerControllerMP)this.field_1212_e.field_6327_b).func_35648_a(p_4115_1_.field_35249_d == 1);
+ FMLClientHandler.instance().handleServerLogin(p_4115_1_, this, field_1213_d);
}
public void func_832_a(Packet21PickupSpawn p_832_1_)
@@ -510,6 +513,7 @@
public void func_4113_a(Packet3Chat p_4113_1_)
{
private boolean field_55324_f = false;
@@ -1157,4 +1159,13 @@
{
+ FMLClientHandler.instance().handleChatPacket(p_4113_1_);
this.field_1212_e.field_6308_u.func_552_a(p_4113_1_.field_517_a);
return this.field_1213_d;
}
@@ -1026,4 +1030,13 @@
var2.field_35212_aW.field_35759_a = p_50100_1_.field_50072_a;
var2.field_35212_aW.field_35758_c = p_50100_1_.field_50071_c;
}
+
+
+ /* (non-Javadoc)
+ * @see net.minecraft.src.NetHandler#func_44028_a(net.minecraft.src.Packet250CustomPayload)
+ */
+ @Override
+ public void func_44028_a(Packet250CustomPayload p_44028_1_)
+ {
+ FMLClientHandler.instance().handlePacket250(p_44028_1_);
+ }
+// @Override
+// public void func_44028_a(Packet250CustomPayload p_44028_1_)
+// {
+// FMLClientHandler.instance().handlePacket250(p_44028_1_);
+// }
}

22
fml/patches/minecraft/net/minecraft/src/PanelCrashReport.java.patch
View File

@ -1,29 +1,17 @@
--- ../src-base/minecraft/net/minecraft/src/PanelCrashReport.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/PanelCrashReport.java 0000-00-00 00:00:00.000000000 -0000
@@ -9,13 +9,20 @@
import java.io.StringWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.logging.Level;
+
import org.lwjgl.Sys;
@@ -13,6 +13,8 @@
import net.minecraft.client.Minecraft;
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+
public class PanelCrashReport extends Panel
{
public PanelCrashReport(UnexpectedThrowable p_i634_1_)
{
+ FMLCommonHandler.instance().getFMLLogger().log(Level.SEVERE, "A critical error has occurred.", p_i634_1_.field_6514_b);
+ FMLCommonHandler.instance().getFMLLogger().log(Level.SEVERE, Loader.instance().getCrashInformation());
this.setBackground(new Color(3028036));
this.setLayout(new BorderLayout());
StringWriter var2 = new StringWriter();
@@ -43,7 +50,7 @@
public PanelCrashReport(CrashReport p_i1401_1_)
@@ -39,7 +41,7 @@
var5 = var5 + "\n";
var5 = var5 + "\n\n";
var5 = var5 + var3;
- String var6 = "";
+ String var6 = Loader.instance().getCrashInformation();

102
fml/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
View File

@ -187,50 +187,7 @@
public RenderBlocks(IBlockAccess p_i647_1_)
{
@@ -126,10 +129,40 @@
{
int var5 = p_1234_1_.func_210_f();
p_1234_1_.func_238_a(this.field_1772_a, p_1234_2_, p_1234_3_, p_1234_4_);
- return var5 == 0 ? this.func_1228_k(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 4 ? this.func_1222_j(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 13 ? this.func_1233_l(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 1 ? this.func_1226_h(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 19 ? this.func_1232_i(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 23 ? this.func_40726_m(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 6 ? this.func_35930_l(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 2 ? this.func_1241_b(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 3 ? this.func_1235_d(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 5 ? this.func_1242_e(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 8 ? this.func_1221_g(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 7 ? this.func_1218_o(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 9 ? this.func_1216_f((BlockRail)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 10 ? this.func_1214_n(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 27 ? this.func_41088_a((BlockDragonEgg)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 11 ? this.func_35925_a((BlockFence)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 12 ? this.func_1229_c(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 14 ? this.func_22331_p(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 15 ? this.func_22332_q(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 16 ? this.func_31074_b(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_, false) : (var5 == 17 ? this.func_31080_c(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_, true) : (var5 == 18 ? this.func_35922_a((BlockPane)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 20 ? this.func_35929_i(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 21 ? this.func_35923_a((BlockFenceGate)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 24 ? this.func_40728_a((BlockCauldron)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 25 ? this.func_40730_a((BlockBrewingStand)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : (var5 == 26 ? this.func_40729_s(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_) : false))))))))))))))))))))))))));
+ switch (var5)
+ {
+ case 0: return func_1228_k(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 4: return func_1222_j(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 13: return func_1233_l(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 1: return func_1226_h(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 19: return func_1232_i(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 23: return func_40726_m(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 6: return func_35930_l(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 2: return func_1241_b(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 3: return func_1235_d(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 5: return func_1242_e(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 8: return func_1221_g(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 7: return func_1218_o(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 9: return func_1216_f((BlockRail)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 10: return func_1214_n(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 27: return func_41088_a((BlockDragonEgg)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 11: return func_35925_a((BlockFence)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 12: return func_1229_c(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 14: return func_22331_p(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 15: return func_22332_q(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 16: return func_31074_b(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_, false);
+ case 17: return func_31080_c(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_, true);
+ case 18: return func_35922_a((BlockPane)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 20: return func_35929_i(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 21: return func_35923_a((BlockFenceGate)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 24: return func_40728_a((BlockCauldron)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 25: return func_40730_a((BlockBrewingStand)p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ case 26: return func_40729_s(p_1234_1_, p_1234_2_, p_1234_3_, p_1234_4_);
+ default: return FMLClientHandler.instance().renderWorldBlock(this, field_1772_a, p_1234_2_, p_1234_3_, p_1234_4_, p_1234_1_, var5);
+ }
}
- private boolean func_40729_s(Block p_40729_1_, int p_40729_2_, int p_40729_3_, int p_40729_4_)
+ public boolean func_40729_s(Block p_40729_1_, int p_40729_2_, int p_40729_3_, int p_40729_4_)
{
int var5 = this.field_1772_a.func_602_e(p_40729_2_, p_40729_3_, p_40729_4_);
int var6 = var5 & 3;
@@ -169,7 +202,7 @@
@@ -169,7 +172,7 @@
}
}
@ -239,7 +196,7 @@
{
Tessellator var5 = Tessellator.field_1512_a;
int var6 = this.field_1772_a.func_602_e(p_22331_2_, p_22331_3_, p_22331_4_);
@@ -310,7 +343,7 @@
@@ -310,7 +313,7 @@
return true;
}
@ -248,7 +205,7 @@
{
p_40730_1_.func_213_a(0.4375F, 0.0F, 0.4375F, 0.5625F, 0.875F, 0.5625F);
this.func_1228_k(p_40730_1_, p_40730_2_, p_40730_3_, p_40730_4_);
@@ -384,7 +417,7 @@
@@ -384,7 +387,7 @@
return true;
}
@ -257,7 +214,7 @@
{
this.func_1228_k(p_40728_1_, p_40728_2_, p_40728_3_, p_40728_4_);
Tessellator var5 = Tessellator.field_1512_a;
@@ -467,7 +500,7 @@
@@ -467,7 +470,7 @@
return true;
}
@ -266,7 +223,7 @@
{
int var5 = this.field_1772_a.func_602_e(p_22332_2_, p_22332_3_, p_22332_4_);
int var6 = var5 & 3;
@@ -557,7 +590,7 @@
@@ -557,7 +560,7 @@
this.field_1773_d = false;
}
@ -275,7 +232,7 @@
{
int var6 = this.field_1772_a.func_602_e(p_31074_2_, p_31074_3_, p_31074_4_);
boolean var7 = p_31074_5_ || (var6 & 8) != 0;
@@ -660,7 +693,7 @@
@@ -660,7 +663,7 @@
return true;
}
@ -284,7 +241,7 @@
{
int var16 = 108;
@@ -683,7 +716,7 @@
@@ -683,7 +686,7 @@
var19.func_983_a(p_31076_3_, p_31076_7_, p_31076_11_, var24, var26);
}
@ -293,7 +250,7 @@
{
int var16 = 108;
@@ -706,7 +739,7 @@
@@ -706,7 +709,7 @@
var19.func_983_a(p_31081_3_, p_31081_7_, p_31081_11_, var24, var26);
}
@ -302,7 +259,7 @@
{
int var16 = 108;
@@ -736,7 +769,7 @@
@@ -736,7 +739,7 @@
this.field_1773_d = false;
}
@ -311,7 +268,7 @@
{
int var6 = this.field_1772_a.func_602_e(p_31080_2_, p_31080_3_, p_31080_4_);
int var7 = BlockPistonExtension.func_31050_c(var6);
@@ -2707,7 +2740,7 @@
@@ -3244,7 +3247,7 @@
}
}
@ -320,7 +277,7 @@
{
int var5 = 0;
float var6 = 0.0F;
@@ -3239,7 +3272,7 @@
@@ -3776,7 +3779,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 2);
this.func_1220_c(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27);
@ -329,7 +286,7 @@
{
this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_;
@@ -3362,7 +3395,7 @@
@@ -3899,7 +3902,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 3);
this.func_1225_d(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 3));
@ -338,7 +295,7 @@
{
this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_;
@@ -3485,7 +3518,7 @@
@@ -4022,7 +4025,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 4);
this.func_1231_e(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27);
@ -347,7 +304,7 @@
{
this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_;
@@ -3608,7 +3641,7 @@
@@ -4145,7 +4148,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 5);
this.func_1236_f(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27);
@ -356,7 +313,7 @@
{
this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_;
@@ -3632,7 +3665,7 @@
@@ -4169,7 +4172,7 @@
return var8;
}
@ -365,7 +322,7 @@
{
if (p_35924_1_ == 0)
{
@@ -3714,7 +3747,7 @@
@@ -4251,7 +4254,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 2);
this.func_1220_c(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -374,7 +331,7 @@
{
var8.func_987_a(var18 * p_4152_5_, var21 * p_4152_6_, var24 * p_4152_7_);
this.func_1220_c(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -3730,7 +3763,7 @@
@@ -4267,7 +4270,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 3);
this.func_1225_d(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -383,7 +340,7 @@
{
var8.func_987_a(var18 * p_4152_5_, var21 * p_4152_6_, var24 * p_4152_7_);
this.func_1225_d(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -3746,7 +3779,7 @@
@@ -4283,7 +4286,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 4);
this.func_1231_e(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -392,7 +349,7 @@
{
var8.func_987_a(var19 * p_4152_5_, var22 * p_4152_6_, var25 * p_4152_7_);
this.func_1231_e(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -3762,7 +3795,7 @@
@@ -4299,7 +4302,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 5);
this.func_1236_f(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -401,7 +358,7 @@
{
var8.func_987_a(var19 * p_4152_5_, var22 * p_4152_6_, var25 * p_4152_7_);
this.func_1236_f(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -5270,6 +5303,10 @@
@@ -5963,6 +5966,10 @@
p_1227_1_.func_213_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
@ -412,22 +369,3 @@
}
else
{
@@ -5326,6 +5363,17 @@
public static boolean func_1219_a(int p_1219_0_)
{
- return p_1219_0_ == 0 ? true : (p_1219_0_ == 13 ? true : (p_1219_0_ == 10 ? true : (p_1219_0_ == 11 ? true : (p_1219_0_ == 27 ? true : (p_1219_0_ == 22 ? true : (p_1219_0_ == 21 ? true : p_1219_0_ == 16))))));
+ switch (p_1219_0_)
+ {
+ case 0:
+ case 13:
+ case 10:
+ case 11:
+ case 27:
+ case 22:
+ case 21:
+ case 16: return true;
+ default: return FMLClientHandler.instance().renderItemAsFull3DBlock(p_1219_0_);
+ }
}
}

41
fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
View File

@ -27,8 +27,8 @@
+
public class RenderEngine
{
public static boolean field_1609_a = false;
@@ -24,7 +35,7 @@
private HashMap field_6528_b = new HashMap();
@@ -23,13 +34,14 @@
private IntHashMap field_1607_c = new IntHashMap();
private IntBuffer field_1606_d = GLAllocation.func_1125_c(1);
private ByteBuffer field_1605_e = GLAllocation.func_1127_b(16777216);
@ -37,26 +37,25 @@
private Map field_1603_g = new HashMap();
private GameSettings field_1602_h;
public boolean field_4281_i = false;
@@ -32,6 +43,7 @@
public boolean field_4280_j = false;
private TexturePackList field_6527_k;
private BufferedImage field_25189_l = new BufferedImage(64, 64, 2);
private int field_48512_n = 16;
+ public static Logger log = FMLCommonHandler.instance().getFMLLogger();
public RenderEngine(TexturePackList p_i754_1_, GameSettings p_i754_2_)
{
@@ -95,8 +107,9 @@
this.field_28151_c.put(p_28149_1_, var3);
return var3;
@@ -94,8 +106,9 @@
this.field_28151_c.put(p_28149_1_, var7);
return var7;
}
- catch (IOException var5)
+ catch (Exception var5)
- catch (IOException var6)
+ catch (Exception var6)
{
+ log.log(Level.INFO,String.format("An error occured reading texture file %s (getTexture)", p_28149_1_),var5);
var5.printStackTrace();
int[] var4 = this.func_28148_b(this.field_25189_l);
this.field_28151_c.put(p_28149_1_, var4);
@@ -251,6 +264,7 @@
+ log.log(Level.INFO,String.format("An error occured reading texture file %s (getTexture)", p_28149_1_),var6);
var6.printStackTrace();
int[] var5 = this.func_28148_b(this.field_25189_l);
this.field_28151_c.put(p_28149_1_, var5);
@@ -242,6 +255,7 @@
int var3 = p_1068_1_.getWidth();
int var4 = p_1068_1_.getHeight();
@ -64,7 +63,7 @@
int[] var5 = new int[var3 * var4];
byte[] var6 = new byte[var3 * var4 * 4];
p_1068_1_.getRGB(0, 0, var3, var4, var5, 0, var3);
@@ -448,6 +462,7 @@
@@ -397,6 +411,7 @@
public void func_1066_a(TextureFX p_1066_1_)
{
@ -72,9 +71,9 @@
this.field_1604_f.add(p_1066_1_);
p_1066_1_.func_783_a();
}
@@ -460,10 +475,26 @@
@@ -410,10 +425,26 @@
{
TextureFX var3 = (TextureFX)this.field_1604_f.get(var2);
TextureFX var3 = (TextureFX)var2.next();
var3.field_1131_c = this.field_1602_h.field_1578_g;
- var3.func_783_a();
- this.field_1605_e.clear();
@ -89,7 +88,7 @@
+ int tWidth = dim.width / 16;
+ int tHeight = dim.height / 16;
+ int tLen = tWidth * tHeight * 4;
+
+
+ if (var3.field_1127_a.length == tLen)
+ {
+ this.field_1605_e.clear();
@ -103,7 +102,7 @@
if (var3.field_1126_b != var1)
{
@@ -473,9 +504,11 @@
@@ -423,9 +454,11 @@
for (int var4 = 0; var4 < var3.field_1129_e; ++var4)
{
@ -116,7 +115,7 @@
}
}
}
@@ -577,8 +610,9 @@
@@ -490,8 +523,9 @@
this.field_4280_j = false;
this.field_4281_i = false;
}
@ -127,7 +126,7 @@
var7.printStackTrace();
}
}
@@ -614,11 +648,13 @@
@@ -527,11 +561,13 @@
this.field_4280_j = false;
this.field_4281_i = false;
}

2
fml/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch
View File

@ -19,7 +19,7 @@
public RenderPlayer()
{
@@ -407,4 +411,11 @@
@@ -404,4 +408,11 @@
{
this.func_188_a((EntityPlayer)p_147_1_, p_147_2_, p_147_4_, p_147_6_, p_147_8_, p_147_9_);
}

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

@ -8,8 +8,8 @@
public class SlotFurnace extends Slot
{
private EntityPlayer field_27011_d;
@@ -43,6 +45,8 @@
p_48434_1_.func_48507_a(this.field_27011_d.field_615_ag, this.field_27011_d, this.field_48437_f);
@@ -56,6 +58,8 @@
this.field_48437_f = 0;
+ FMLClientHandler.instance().onItemSmelted(field_27011_d, p_48434_1_);

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

@ -9,8 +9,8 @@
+
public class StringTranslate
{
private static StringTranslate field_20165_a = new StringTranslate();
@@ -76,6 +79,7 @@
private static StringTranslate field_20165_a = new StringTranslate("en_US");
@@ -77,6 +80,7 @@
}
}
}
@ -18,7 +18,7 @@
}
public void func_44023_a(String p_44023_1_)
@@ -164,4 +168,8 @@
@@ -165,4 +169,8 @@
{
return "ar_SA".equals(p_46109_0_) || "he_IL".equals(p_46109_0_);
}

17
fml/patches/minecraft/net/minecraft/src/TexturePackList.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/src/TexturePackList.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/TexturePackList.java 0000-00-00 00:00:00.000000000 -0000
@@ -7,6 +7,8 @@
@@ -8,6 +8,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@ -9,11 +9,12 @@
import net.minecraft.client.Minecraft;
public class TexturePackList
@@ -140,6 +142,7 @@
if (this.field_6534_a == null)
{
this.field_6534_a = this.field_6539_c;
+ FMLClientHandler.instance().onEarlyTexturePackLoad(this.field_6539_c);
}
@@ -18,7 +20,7 @@
private final File field_57507_d;
private List field_6533_b = new ArrayList();
private Map field_55280_f = new HashMap();
- private TexturePackBase field_6534_a;
+ public TexturePackBase field_6534_a;
private boolean field_57509_h;
this.field_6533_b.removeAll(var1);
public TexturePackList(File p_i1506_1_, Minecraft p_i1506_2_)

2
fml/patches/minecraft/net/minecraft/src/TileEntity.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000
@@ -158,4 +158,8 @@
@@ -179,4 +179,8 @@
func_476_a(TileEntityEnchantmentTable.class, "EnchantTable");
func_476_a(TileEntityEndPortal.class, "Airportal");
}

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

@ -9,18 +9,3 @@
public class TileEntityFurnace extends TileEntity implements IInventory
{
private ItemStack[] field_833_a = new ItemStack[3];
@@ -251,7 +254,13 @@
else
{
int var1 = p_488_1_.func_1091_a().field_291_aS;
- return var1 < 256 && Block.field_345_n[var1].field_356_bn == Material.field_1335_c ? 300 : (var1 == Item.field_266_B.field_291_aS ? 100 : (var1 == Item.field_225_k.field_291_aS ? 1600 : (var1 == Item.field_258_aw.field_291_aS ? 20000 : (var1 == Block.field_333_z.field_376_bc ? 100 : (var1 == Item.field_40417_bo.field_291_aS ? 2400 : 0)))));
+ if (var1 < 256 && Block.field_345_n[var1].field_356_bn == Material.field_1335_c) return 300;
+ if (var1 == Item.field_266_B.field_291_aS) return 100;
+ if (var1 == Item.field_225_k.field_291_aS) return 1600;
+ if (var1 == Item.field_258_aw.field_291_aS) return 20000;
+ if (var1 == Block.field_333_z.field_376_bc) return 100;
+ if (var1 == Item.field_40417_bo.field_291_aS) return 2400;
+ return FMLCommonHandler.instance().fuelLookup(var1, p_488_1_.func_21179_h());
}
}

2
fml/patches/minecraft/net/minecraft/src/TileEntityRenderer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/src/TileEntityRenderer.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/TileEntityRenderer.java 0000-00-00 00:00:00.000000000 -0000
@@ -124,4 +124,9 @@
@@ -123,4 +123,9 @@
{
return this.field_1541_n;
}

5
fml/patches/minecraft/net/minecraft/src/World.java.patch
View File

@ -1,10 +1,11 @@
--- ../src-base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000
@@ -3880,6 +3880,6 @@
@@ -3320,7 +3320,7 @@
public double func_46068_G()
{
- return this.field_22145_q.func_46133_t() == WorldType.field_48636_c ? 0.0D : 63.0D;
+ return this.field_22145_q.func_46133_t().getHorizon(this);
}
}
public CrashReport func_55266_a(CrashReport p_55266_1_)

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

@ -10,7 +10,7 @@
public class WorldType
{
public static final WorldType[] field_48637_a = new WorldType[16];
@@ -11,17 +15,26 @@
@@ -12,17 +16,26 @@
private boolean field_48633_g;
private boolean field_48638_h;
@ -39,7 +39,7 @@
}
public String func_48628_a()
@@ -78,4 +91,69 @@
@@ -84,4 +97,69 @@
return null;
}

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

@ -1,75 +0,0 @@
--- ../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
@@ -7,12 +7,17 @@
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.TickType;
+import cpw.mods.fml.server.FMLServerHandler;
import net.minecraft.src.AnvilSaveConverter;
import net.minecraft.src.AnvilSaveHandler;
import net.minecraft.src.AxisAlignedBB;
@@ -100,6 +105,7 @@
var1.start();
ConsoleLogManager.func_641_a();
field_6038_a.info("Starting minecraft server version 1.2.5");
+ FMLServerHandler.instance().onPreLoad(this);
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L)
{
@@ -146,6 +152,7 @@
field_6038_a.warning("To change this, set \"online-mode\" to \"true\" in the server.settings file.");
}
+ 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);
@@ -353,6 +360,8 @@
{
long var1 = System.currentTimeMillis();
+ FMLServerHandler.instance().onWorldLoadTick();
+
for (long var3 = 0L; this.field_6025_n; Thread.sleep(1L))
{
long var5 = System.currentTimeMillis();
@@ -444,9 +453,11 @@
private void func_6018_h()
{
+ FMLCommonHandler.instance().rescheduleTicks();
long var1 = System.nanoTime();
ArrayList var3 = new ArrayList();
Iterator var4 = field_6037_b.keySet().iterator();
+ FMLServerHandler.instance().onPreServerTick();
while (var4.hasNext())
{
@@ -487,7 +498,9 @@
this.field_6033_f.func_28169_a(new Packet4UpdateTime(var7.func_22080_k()), var7.field_4272_q.field_6165_g);
}
+ FMLServerHandler.instance().onPreWorldTick(var7);
var7.func_22077_g();
+ FMLServerHandler.instance().onPostWorldTick(var7);
while (true)
{
@@ -533,6 +546,7 @@
this.field_48076_G = Packet.field_48101_l;
this.field_48082_x[this.field_9014_h % 100] = Packet.field_48102_m - this.field_48077_H;
this.field_48077_H = Packet.field_48102_m;
+ FMLServerHandler.instance().onPostServerTick();
}
public void func_6010_a(String p_6010_1_, ICommandListener p_6010_2_)

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

@ -9,15 +9,3 @@
public class BlockDispenser extends BlockContainer
{
private Random field_28032_a = new Random();
@@ -124,7 +126,10 @@
}
else
{
- if (var12.field_855_c == Item.field_4148_j.field_234_aS)
+ 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)
{
EntityArrow var19 = new EntityArrow(p_21036_1_, var13, var15, var17);
var19.func_177_a((double)var9, 0.10000000149011612D, (double)var10, 1.1F, 6.0F);

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

@ -9,7 +9,7 @@
public class ChunkProviderServer implements IChunkProvider
{
private Set field_725_a = new HashSet();
@@ -174,6 +176,7 @@
@@ -173,6 +175,7 @@
if (this.field_730_c != null)
{
this.field_730_c.func_4055_a(p_4055_1_, p_4055_2_, p_4055_3_);

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

@ -1,8 +1,8 @@
--- ../src-base/minecraft_server/net/minecraft/src/Entity.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/Entity.java 0000-00-00 00:00:00.000000000 -0000
@@ -1463,4 +1463,8 @@
@@ -1525,4 +1525,8 @@
{
return true;
return String.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] {this.getClass().getSimpleName(), this.func_35150_Y(), Integer.valueOf(this.field_331_c), this.field_9093_l == null ? "~NULL~" : this.field_9093_l.func_22081_n().func_55310_h(), Double.valueOf(this.field_322_l), Double.valueOf(this.field_321_m), Double.valueOf(this.field_320_n)});
}
+
+ public static int getNextId() {

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

@ -1,14 +1,15 @@
--- ../src-base/minecraft_server/net/minecraft/src/EntityItem.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/EntityItem.java 0000-00-00 00:00:00.000000000 -0000
@@ -1,5 +1,7 @@
package net.minecraft.src;
@@ -2,6 +2,8 @@
import java.util.Iterator;
+import cpw.mods.fml.server.FMLServerHandler;
+
public class EntityItem extends Entity
{
public ItemStack field_429_a;
@@ -145,6 +147,7 @@
@@ -198,6 +200,7 @@
if (this.field_433_ad == 0 && p_6093_1_.field_416_aj.func_201_a(this.field_429_a))
{

2
fml/patches/minecraft_server/net/minecraft/src/EntityList.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft_server/net/minecraft/src/EntityList.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/EntityList.java 0000-00-00 00:00:00.000000000 -0000
@@ -166,4 +166,17 @@
@@ -168,4 +168,17 @@
func_46122_a(EntityVillager.class, "Villager", 120, 5651507, 12422002);
func_563_a(EntityEnderCrystal.class, "EnderCrystal", 200);
}

17
fml/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
View File

@ -1,19 +1,6 @@
--- ../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
@@ -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
{
public InventoryPlayer field_416_aj = new InventoryPlayer(this);
@@ -104,6 +108,7 @@
@@ -105,6 +105,7 @@
public void func_106_b_()
{
@ -21,7 +8,7 @@
if (this.field_34908_d != null)
{
ItemStack var1 = this.field_416_aj.func_213_b();
@@ -235,6 +240,7 @@
@@ -228,6 +229,7 @@
{
this.field_35217_m.func_35584_a(this);
}

21
fml/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
View File

@ -1,21 +0,0 @@
--- ../src-base/minecraft_server/net/minecraft/src/NetLoginHandler.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/NetLoginHandler.java 0000-00-00 00:00:00.000000000 -0000
@@ -5,6 +5,8 @@
import java.util.Iterator;
import java.util.Random;
import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLServerHandler;
import net.minecraft.server.MinecraftServer;
public class NetLoginHandler extends NetHandler
@@ -132,6 +134,9 @@
}
var2.func_20057_k();
+
+ FMLServerHandler.instance().handleLogin(p_6007_1_, field_8_b);
+ FMLServerHandler.instance().announceLogin(var2);
}
this.field_7_c = true;

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

@ -1,29 +1,17 @@
--- ../src-base/minecraft_server/net/minecraft/src/NetServerHandler.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/NetServerHandler.java 0000-00-00 00:00:00.000000000 -0000
@@ -3,6 +3,8 @@
import java.util.ArrayList;
@@ -7,6 +7,8 @@
import java.util.Iterator;
import java.util.Random;
import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLServerHandler;
import net.minecraft.server.MinecraftServer;
public class NetServerHandler extends NetHandler implements ICommandListener
@@ -558,7 +560,10 @@
}
public class NetServerHandler extends NetHandler
@@ -1011,4 +1013,9 @@
}
- if (var2.startsWith("/"))
+ if (FMLServerHandler.instance().handleChatPacket(p_23_1_,field_16_e)) {
+ // We handled it
+ }
+ else if (var2.startsWith("/"))
{
this.func_4010_d(var2);
}
@@ -898,4 +903,9 @@
{
this.field_16_e.field_35214_K.field_35658_b = p_50003_1_.field_50005_b && this.field_16_e.field_35214_K.field_35659_c;
}
}
+
+ @Override

14
fml/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft_server/net/minecraft/src/ServerConfigurationManager.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/ServerConfigurationManager.java 0000-00-00 00:00:00.000000000 -0000
@@ -11,6 +11,8 @@
@@ -9,6 +9,8 @@
import java.util.List;
import java.util.Set;
import java.util.logging.Logger;
@ -8,16 +8,8 @@
+import cpw.mods.fml.server.FMLServerHandler;
import net.minecraft.server.MinecraftServer;
public class ServerConfigurationManager
@@ -115,6 +117,7 @@
public void func_616_c(EntityPlayerMP p_616_1_)
{
+ FMLServerHandler.instance().announceLogout(p_616_1_);
this.field_914_l.func_726_a(p_616_1_);
this.field_923_c.func_28004_a(p_616_1_.field_4110_as).func_22085_d(p_616_1_);
this.field_924_b.remove(p_616_1_);
@@ -287,6 +290,8 @@
public abstract class ServerConfigurationManager
@@ -359,6 +361,8 @@
p_28168_1_.field_425_ad.func_35694_a(var5);
this.func_28170_a(p_28168_1_, var5);
this.func_30008_g(p_28168_1_);

2
fml/patches/minecraft_server/net/minecraft/src/ServerGUI.java.patch
View File

@ -8,7 +8,7 @@
import java.util.logging.Logger;
import javax.swing.JComponent;
import javax.swing.JFrame;
@@ -78,7 +79,9 @@
@@ -79,7 +80,9 @@
{
JPanel var1 = new JPanel(new BorderLayout());
JTextArea var2 = new JTextArea();

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

@ -8,8 +8,8 @@
public class SlotFurnace extends Slot
{
private EntityPlayer field_27007_d;
@@ -43,6 +45,8 @@
p_48416_1_.func_48584_a(this.field_27007_d.field_9093_l, this.field_27007_d, this.field_48419_f);
@@ -56,6 +58,8 @@
this.field_48419_f = 0;
+ FMLServerHandler.instance().onItemSmelted(field_27007_d, p_48416_1_);

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

@ -8,8 +8,8 @@
+
public class StringTranslate
{
private static StringTranslate field_25082_a = new StringTranslate();
@@ -71,6 +73,7 @@
private static StringTranslate field_25082_a = new StringTranslate("en_US");
@@ -77,6 +79,7 @@
}
}
}
@ -17,7 +17,7 @@
}
public void func_44010_a(String p_44010_1_)
@@ -139,4 +142,13 @@
@@ -145,4 +148,13 @@
String var3 = this.field_25081_b.getProperty(p_25078_1_, p_25078_1_);
return String.format(var3, p_25078_2_);
}

2
fml/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000
@@ -145,4 +145,8 @@
@@ -156,4 +156,8 @@
func_187_a(TileEntityEnchantmentTable.class, "EnchantTable");
func_187_a(TileEntityEndPortal.class, "Airportal");
}

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

@ -8,18 +8,3 @@
public class TileEntityFurnace extends TileEntity implements IInventory
{
private ItemStack[] field_489_e = new ItemStack[3];
@@ -236,7 +238,13 @@
else
{
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)))));
+ if (var1 < 256 && Block.field_542_n[var1].field_553_bn == Material.field_524_c) return 300;
+ if (var1 == Item.field_209_B.field_234_aS) return 100;
+ if (var1 == Item.field_168_k.field_234_aS) return 1600;
+ if (var1 == Item.field_201_aw.field_234_aS) return 20000;
+ if (var1 == Block.field_6047_y.field_573_bc) return 100;
+ if (var1 == Item.field_40239_bm.field_234_aS) return 2400;
+ return FMLCommonHandler.instance().fuelLookup(var1, p_194_1_.func_21125_h());
}
}

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

@ -10,7 +10,7 @@
public class WorldType
{
public static final WorldType[] field_48459_a = new WorldType[16];
@@ -11,17 +15,28 @@
@@ -12,17 +16,28 @@
private boolean field_48455_g;
private boolean field_48460_h;
@ -41,7 +41,7 @@
}
public String func_48449_a()
@@ -68,4 +83,41 @@
@@ -74,4 +89,41 @@
return null;
}