From 0ca8ace988a3903cb6cdf75891e2fb146ad3fd4d Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Fri, 4 May 2012 17:04:18 -0400 Subject: [PATCH] And some patches for that --- .../net/minecraft/client/Minecraft.java.patch | 19 ++++++++++++++++++ .../net/minecraft/src/EntityList.java.patch | 20 +++++++++++++++++++ .../net/minecraft/src/TileEntity.java.patch | 11 ++++++++++ 3 files changed, 50 insertions(+) create mode 100644 patches/minecraft/net/minecraft/client/Minecraft.java.patch create mode 100644 patches/minecraft/net/minecraft/src/EntityList.java.patch create mode 100644 patches/minecraft/net/minecraft/src/TileEntity.java.patch diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch new file mode 100644 index 0000000000..7ac98579b5 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -0,0 +1,19 @@ +--- ../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 +@@ -117,6 +117,8 @@ + import org.lwjgl.opengl.PixelFormat; + import org.lwjgl.util.glu.GLU; + ++import cpw.mods.fml.client.FMLClientHandler; ++ + public abstract class Minecraft implements Runnable + { + public static byte[] field_28006_b = new byte[10485760]; +@@ -282,6 +284,7 @@ + + OpenGlHelper.func_40453_a(); + this.field_6297_D = func_6240_b(); ++ FMLClientHandler.instance().onPreLoad(this); + this.field_22008_V = new AnvilSaveConverter(new File(this.field_6297_D, "saves")); + this.field_6304_y = new GameSettings(this, this.field_6297_D); + this.field_6298_C = new TexturePackList(this, this.field_6297_D); diff --git a/patches/minecraft/net/minecraft/src/EntityList.java.patch b/patches/minecraft/net/minecraft/src/EntityList.java.patch new file mode 100644 index 0000000000..eba3716675 --- /dev/null +++ b/patches/minecraft/net/minecraft/src/EntityList.java.patch @@ -0,0 +1,20 @@ +--- ../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 @@ + func_46152_a(EntityVillager.class, "Villager", 120, 5651507, 12422002); + func_1080_a(EntityEnderCrystal.class, "EnderCrystal", 200); + } ++ ++ public static void addNewEntityListMapping(Class entityClass, String entityName, int id) { ++ func_1080_a(entityClass,entityName,id); ++ } ++ ++ public static void addNewEntityListMapping(Class entityClass, String entityName, int id, int backgroundEggColour, int foregroundEggColour) { ++ func_46152_a(entityClass,entityName,id,backgroundEggColour,foregroundEggColour); ++ } ++ ++ @SuppressWarnings("unchecked") ++ public static Map> getEntityToClassMapping() { ++ return field_1611_a; ++ } + } diff --git a/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/patches/minecraft/net/minecraft/src/TileEntity.java.patch new file mode 100644 index 0000000000..1bd14474a6 --- /dev/null +++ b/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -0,0 +1,11 @@ +--- ../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 @@ + func_476_a(TileEntityEnchantmentTable.class, "EnchantTable"); + func_476_a(TileEntityEndPortal.class, "Airportal"); + } ++ ++ public static void addNewTileEntityMapping(Class tileEntityClass, String id) { ++ func_476_a(tileEntityClass, id); ++ } + }