diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index 368f89553..600ef961d 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -140,7 +140,7 @@ public class FMLClientHandler implements IFMLSidedHandler loading = true; client = minecraft; ObfuscationReflectionHelper.detectObfuscation(World.class); - TextureFXManager.instance().setClient(client); +// TextureFXManager.instance().setClient(client); FMLCommonHandler.instance().beginLoading(this); new ModLoaderClientHelper(client); try @@ -244,7 +244,7 @@ public class FMLClientHandler implements IFMLSidedHandler } else { - TextureFXManager.instance().loadTextures(client.field_71418_C.func_77292_e()); +// TextureFXManager.instance().loadTextures(client.field_71418_C.func_77292_e()); } } /** diff --git a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java index 2032e8aed..760d7f3fa 100644 --- a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java +++ b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java @@ -22,7 +22,6 @@ import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderEngine; -import net.minecraft.client.renderer.texturefx.TextureFX; import net.minecraft.client.texturepacks.ITexturePack; import net.minecraft.world.IBlockAccess; @@ -54,31 +53,6 @@ public class FMLRenderAccessLibrary FMLLog.log(level, throwable, message); } - public static void setTextureDimensions(int textureId, int width, int height, List textureFXList) - { - TextureFXManager.instance().setTextureDimensions(textureId, width, height, textureFXList); - } - - public static void preRegisterEffect(TextureFX textureFX) - { - TextureFXManager.instance().onPreRegisterEffect(textureFX); - } - - public static boolean onUpdateTextureEffect(TextureFX textureFX) - { - return TextureFXManager.instance().onUpdateTextureEffect(textureFX); - } - - public static Dimension getTextureDimensions(TextureFX textureFX) - { - return TextureFXManager.instance().getTextureDimensions(textureFX); - } - - public static void onTexturePackChange(RenderEngine engine, ITexturePack texturePack, List textureFXList) - { - TextureFXManager.instance().onTexturePackChange(engine, texturePack, textureFXList); - } - @SuppressWarnings("deprecation") public static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelId) { diff --git a/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java b/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java index ba1270e50..0eda64569 100644 --- a/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java +++ b/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java @@ -80,8 +80,7 @@ public class LanguageRegistry { // reload language table by forcing lang to null and reloading the properties file String lang = StringTranslate.func_74808_a().func_74811_c(); - StringTranslate.func_74808_a().field_74813_d = null; - StringTranslate.func_74808_a().func_74810_a(lang); + StringTranslate.func_74808_a().func_74810_a(lang, true); } diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 3190540fa..e89366e47 100644 --- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -12,7 +12,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.awt.BorderLayout; -@@ -120,6 +126,8 @@ +@@ -114,6 +120,8 @@ import org.lwjgl.opengl.PixelFormat; import org.lwjgl.util.glu.GLU; @@ -21,7 +21,7 @@ @SideOnly(Side.CLIENT) public abstract class Minecraft implements Runnable, IPlayerUsage { -@@ -302,6 +310,8 @@ +@@ -296,6 +304,8 @@ this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false); this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false); @@ -29,8 +29,8 @@ + if (this.field_71474_y.field_74363_ab != null) { - StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab); -@@ -346,6 +356,8 @@ + StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab, false); +@@ -332,6 +342,8 @@ GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d); this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); @@ -39,7 +39,7 @@ try { this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this); -@@ -374,6 +386,8 @@ +@@ -360,6 +372,8 @@ { this.func_71352_k(); } @@ -48,7 +48,7 @@ } private void func_71357_I() throws LWJGLException -@@ -738,9 +752,11 @@ +@@ -724,9 +738,11 @@ if (!this.field_71454_w) { @@ -60,7 +60,7 @@ } GL11.glFlush(); -@@ -1270,10 +1286,14 @@ +@@ -1256,10 +1272,14 @@ public void func_71407_l() { @@ -75,7 +75,7 @@ this.field_71424_I.func_76320_a("stats"); this.field_71413_E.func_77449_e(); -@@ -1730,6 +1750,8 @@ +@@ -1717,6 +1737,8 @@ this.field_71453_ak.func_74428_b(); } @@ -84,7 +84,7 @@ this.field_71424_I.func_76319_b(); this.field_71423_H = func_71386_F(); } -@@ -1768,8 +1790,27 @@ +@@ -1755,8 +1777,27 @@ } this.field_71413_E.func_77450_a(StatList.field_75936_f, 1); @@ -112,7 +112,7 @@ this.field_71455_al = true; this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel")); -@@ -1984,6 +2025,12 @@ +@@ -1978,6 +2019,12 @@ public static void main(String[] p_main_0_) { diff --git a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch index e33ba00f4..4bc873ef4 100644 --- a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.BufferedReader; -@@ -174,11 +175,14 @@ +@@ -175,11 +176,14 @@ public int field_72556_d = 20; Random field_72557_e = new Random(); @@ -22,7 +22,7 @@ } public NetClientHandler(Minecraft p_i3104_1_, IntegratedServer p_i3104_2_) throws IOException -@@ -186,6 +190,7 @@ +@@ -187,6 +191,7 @@ this.field_72563_h = p_i3104_1_; this.field_72555_g = new MemoryConnection(this); p_i3104_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i3104_1_.field_71449_j.field_74286_b); @@ -30,7 +30,7 @@ } public void func_72547_c() -@@ -256,6 +261,7 @@ +@@ -257,6 +262,7 @@ public void func_72513_a(Packet252SharedKey p_72513_1_) { @@ -38,7 +38,7 @@ this.func_72552_c(new Packet205ClientCommand(0)); } -@@ -271,6 +277,7 @@ +@@ -272,6 +278,7 @@ this.field_72563_h.field_71439_g.field_70157_k = p_72455_1_.field_73561_a; this.field_72556_d = p_72455_1_.field_73562_h; this.field_72563_h.field_71442_b.func_78746_a(p_72455_1_.field_73557_d); @@ -46,7 +46,7 @@ this.field_72563_h.field_71474_y.func_82879_c(); } -@@ -711,6 +718,7 @@ +@@ -704,6 +711,7 @@ { this.field_72555_g.func_74429_a(p_72546_1_); this.field_72555_g.func_74423_d(); @@ -54,7 +54,7 @@ } } -@@ -750,6 +758,7 @@ +@@ -743,6 +751,7 @@ public void func_72481_a(Packet3Chat p_72481_1_) { @@ -62,7 +62,7 @@ this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(p_72481_1_.field_73476_b); } -@@ -1243,6 +1252,11 @@ +@@ -1268,6 +1277,11 @@ public void func_72494_a(Packet131MapData p_72494_1_) { @@ -74,7 +74,7 @@ if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT) { ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c); -@@ -1352,6 +1366,11 @@ +@@ -1377,6 +1391,11 @@ public void func_72501_a(Packet250CustomPayload p_72501_1_) { @@ -86,7 +86,7 @@ if ("MC|TPack".equals(p_72501_1_.field_73630_a)) { String[] astring = (new String(p_72501_1_.field_73629_c)).split("\u0000"); -@@ -1396,4 +1415,20 @@ +@@ -1421,4 +1440,20 @@ { return this.field_72555_g; } diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index 15ba7f446..ebc40c537 100644 --- a/fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -7,88 +7,3 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -@@ -40,7 +41,12 @@ - public void func_78443_a(EntityLiving p_78443_1_, ItemStack p_78443_2_, int p_78443_3_) - { - GL11.glPushMatrix(); -- Block block = Block.field_71973_m[p_78443_2_.field_77993_c]; -+ -+ Block block = null; -+ if (p_78443_2_.field_77993_c < Block.field_71973_m.length) -+ { -+ block = Block.field_71973_m[p_78443_2_.field_77993_c]; -+ } - - if (block != null && RenderBlocks.func_78597_b(block.func_71857_b())) - { -@@ -136,10 +142,17 @@ - float f7; - float f8; - -- for (i = 0; i < 16; ++i) -- { -- f6 = (float)i / 16.0F; -- f7 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f6 - 0.001953125F; -+ /* Gets the width/16 of the currently bound texture, used -+ * to fix the side rendering issues on textures != 16 */ -+ int tileSize = TextureFXManager.instance().getTextureDimensions(GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D)).width / 16; -+ -+ float tx = 1.0f / (32 * tileSize); -+ float tz = 1.0f / tileSize; -+ -+ for (i = 0; i < tileSize; ++i) -+ { -+ f6 = (float)i / tileSize; -+ f7 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f6 - tx; - f8 = f5 * f6; - p_78439_0_.func_78374_a((double)f8, 0.0D, (double)(0.0F - p_78439_5_), (double)f7, (double)p_78439_4_); - p_78439_0_.func_78374_a((double)f8, 0.0D, 0.0D, (double)f7, (double)p_78439_4_); -@@ -151,11 +164,11 @@ - p_78439_0_.func_78382_b(); - p_78439_0_.func_78375_b(1.0F, 0.0F, 0.0F); - -- for (i = 0; i < 16; ++i) -- { -- f6 = (float)i / 16.0F; -- f7 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f6 - 0.001953125F; -- f8 = f5 * f6 + 0.0625F; -+ for (i = 0; i < tileSize; ++i) -+ { -+ f6 = (float)i / tileSize; -+ f7 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f6 - tx; -+ f8 = f5 * f6 + tz; - p_78439_0_.func_78374_a((double)f8, 1.0D, (double)(0.0F - p_78439_5_), (double)f7, (double)p_78439_2_); - p_78439_0_.func_78374_a((double)f8, 1.0D, 0.0D, (double)f7, (double)p_78439_2_); - p_78439_0_.func_78374_a((double)f8, 0.0D, 0.0D, (double)f7, (double)p_78439_4_); -@@ -166,11 +179,11 @@ - p_78439_0_.func_78382_b(); - p_78439_0_.func_78375_b(0.0F, 1.0F, 0.0F); - -- for (i = 0; i < 16; ++i) -- { -- f6 = (float)i / 16.0F; -- f7 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f6 - 0.001953125F; -- f8 = f5 * f6 + 0.0625F; -+ for (i = 0; i < tileSize; ++i) -+ { -+ f6 = (float)i / tileSize; -+ f7 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f6 - tx; -+ f8 = f5 * f6 + tz; - p_78439_0_.func_78374_a(0.0D, (double)f8, 0.0D, (double)p_78439_1_, (double)f7); - p_78439_0_.func_78374_a((double)f5, (double)f8, 0.0D, (double)p_78439_3_, (double)f7); - p_78439_0_.func_78374_a((double)f5, (double)f8, (double)(0.0F - p_78439_5_), (double)p_78439_3_, (double)f7); -@@ -181,10 +194,10 @@ - p_78439_0_.func_78382_b(); - p_78439_0_.func_78375_b(0.0F, -1.0F, 0.0F); - -- for (i = 0; i < 16; ++i) -- { -- f6 = (float)i / 16.0F; -- f7 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f6 - 0.001953125F; -+ for (i = 0; i < tileSize; ++i) -+ { -+ f6 = (float)i / tileSize; -+ f7 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f6 - tx; - f8 = f5 * f6; - p_78439_0_.func_78374_a((double)f5, (double)f8, 0.0D, (double)p_78439_3_, (double)f7); - p_78439_0_.func_78374_a(0.0D, (double)f8, 0.0D, (double)p_78439_1_, (double)f7); diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch index 9f8058e92..c3d5ac1ff 100644 --- a/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch @@ -1,18 +1,18 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/RenderBlocks.java +++ ../src-work/minecraft/net/minecraft/client/renderer/RenderBlocks.java -@@ -29,6 +29,7 @@ - import net.minecraft.block.BlockWall; +@@ -35,6 +35,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; + import net.minecraft.item.Icon; +import net.minecraft.src.FMLRenderAccessLibrary; import net.minecraft.util.Direction; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; -@@ -215,7 +216,82 @@ +@@ -231,7 +232,84 @@ int l = p_78612_1_.func_71857_b(); p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_); this.func_83018_a(p_78612_1_); -- return l == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 3 ? this.func_78590_h(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 9 ? this.func_78586_a((BlockRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 15 ? this.func_78610_x(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (l == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (l == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 26 ? this.func_78567_v(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false)))))))))))))))))))))))))))))))))); +- return l == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 3 ? this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 9 ? this.func_78586_a((BlockBaseRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 15 ? this.func_94176_a((BlockRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 36 ? this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 37 ? this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (l == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (l == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 26 ? this.func_94168_a((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 38 ? this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))))))); + + switch (l) + { @@ -35,7 +35,7 @@ + case 2: + return this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 3: -+ return this.func_78590_h(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); ++ return this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 5: + return this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 8: @@ -43,7 +43,7 @@ + case 7: + return this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 9: -+ return this.func_78586_a((BlockRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); ++ return this.func_78586_a((BlockBaseRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 10: + return this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 27: @@ -61,7 +61,7 @@ + case 14: + return this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 15: -+ return this.func_78610_x(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); ++ return this.func_94176_a((BlockRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 16: + return this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false); + case 17: @@ -81,18 +81,20 @@ + case 25: + return this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 26: -+ return this.func_78567_v(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); ++ return this.func_94168_a((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 28: + return this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 34: + return this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); ++ case 38: ++ return this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + default: + return FMLRenderAccessLibrary.renderWorldBlock(this, field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_, p_78612_1_, l); + } } - public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_) -@@ -6541,6 +6617,10 @@ + public boolean func_94168_a(BlockEndPortalFrame p_94168_1_, int p_94168_2_, int p_94168_3_, int p_94168_4_) +@@ -6623,6 +6701,10 @@ this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); this.func_78595_a(); } @@ -103,7 +105,7 @@ } else { -@@ -6599,6 +6679,36 @@ +@@ -6681,7 +6763,37 @@ public static boolean func_78597_b(int p_78597_0_) { @@ -140,4 +142,5 @@ + return FMLRenderAccessLibrary.renderItemAsFull3DBlock(p_78597_0_); + } } - } + + public Icon func_94170_a(Block p_94170_1_, IBlockAccess p_94170_2_, int p_94170_3_, int p_94170_4_, int p_94170_5_, int p_94170_6_) diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch index 66de877f1..7a9d7a1ba 100644 --- a/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch @@ -12,26 +12,26 @@ import java.awt.Graphics; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; -@@ -15,6 +18,9 @@ +@@ -13,6 +16,9 @@ + import java.util.HashMap; import java.util.Iterator; - import java.util.List; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + import javax.imageio.ImageIO; - import net.minecraft.client.renderer.texturefx.TextureFX; import net.minecraft.client.settings.GameSettings; -@@ -39,6 +45,8 @@ - public TexturePackList field_78366_k; - private BufferedImage field_78364_l = new BufferedImage(64, 64, 2); + import net.minecraft.client.texturepacks.ITexturePack; +@@ -38,6 +44,8 @@ + private final TextureMap field_94155_m; + private int field_94153_n; + public static Logger log = FMLLog.getLogger(); + public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_) { this.field_78366_k = p_i3192_1_; -@@ -102,8 +110,9 @@ +@@ -116,8 +124,9 @@ this.field_78359_d.put(p_78346_1_, aint1); return aint1; } @@ -43,77 +43,7 @@ ioexception.printStackTrace(); int[] aint2 = this.func_78348_b(this.field_78364_l); this.field_78359_d.put(p_78346_1_, aint2); -@@ -250,6 +259,7 @@ - - int j = p_78351_1_.getWidth(); - int k = p_78351_1_.getHeight(); -+ TextureFXManager.instance().setTextureDimensions(p_78351_2_, j, k, (List)field_78367_h); - int[] aint = new int[j * k]; - byte[] abyte = new byte[j * k * 4]; - p_78351_1_.getRGB(0, 0, j, k, aint, 0, j); -@@ -410,6 +420,7 @@ - - public void func_78355_a(TextureFX p_78355_1_) - { -+ TextureFXManager.instance().onPreRegisterEffect(p_78355_1_); - this.field_78367_h.add(p_78355_1_); - p_78355_1_.func_76846_a(); - } -@@ -422,28 +433,44 @@ - { - TextureFX texturefx = (TextureFX)this.field_78367_h.get(j); - texturefx.field_76851_c = this.field_78365_j.field_74337_g; -- texturefx.func_76846_a(); -- i = this.func_82772_a(texturefx, i); -+ if (TextureFXManager.instance().onUpdateTextureEffect(texturefx)) -+ { -+ i = this.func_82772_a(texturefx, i); -+ } - } - } - - public int func_82772_a(TextureFX p_82772_1_, int p_82772_2_) - { -- this.field_78358_g.clear(); -- this.field_78358_g.put(p_82772_1_.field_76852_a); -- this.field_78358_g.position(0).limit(p_82772_1_.field_76852_a.length); -- -- if (p_82772_1_.field_76850_b != p_82772_2_) -+ Dimension dim = TextureFXManager.instance().getTextureDimensions(p_82772_1_); -+ int tWidth = dim.width >> 4; -+ int tHeight = dim.height >> 4; -+ int tLen = tWidth * tHeight << 2; -+ -+ if (p_82772_1_.field_76852_a.length == tLen) -+ { -+ this.field_78358_g.clear(); -+ this.field_78358_g.put(p_82772_1_.field_76852_a); -+ this.field_78358_g.position(0).limit(p_82772_1_.field_76852_a.length); -+ } -+ else -+ { -+ TextureFXManager.instance().scaleTextureFXData(p_82772_1_.field_76852_a, field_78358_g, tWidth, tLen); -+ } -+ -+ if (p_82772_1_.field_76848_d != p_82772_2_) - { - p_82772_1_.func_76845_a(this); -- p_82772_2_ = p_82772_1_.field_76850_b; -+ p_82772_2_ = p_82772_1_.field_76848_d; - } - - for (int j = 0; j < p_82772_1_.field_76849_e; ++j) - { -+ int xOffset = p_82772_1_.field_76850_b % 16 * tWidth + j * tWidth; - for (int k = 0; k < p_82772_1_.field_76849_e; ++k) - { -- GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, p_82772_1_.field_76850_b % 16 * 16 + j * 16, p_82772_1_.field_76850_b / 16 * 16 + k * 16, 16, 16, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, this.field_78358_g); -+ int yOffset = p_82772_1_.field_76850_b / 16 * tHeight + k * tHeight; -+ GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, xOffset, yOffset, tWidth, tHeight, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, this.field_78358_g); - } - } - -@@ -509,8 +536,9 @@ +@@ -504,8 +513,9 @@ this.field_78361_b = false; this.field_78363_a = false; } @@ -125,7 +55,7 @@ ioexception.printStackTrace(); } } -@@ -546,8 +574,9 @@ +@@ -541,8 +551,9 @@ this.field_78361_b = false; this.field_78363_a = false; } diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch index 7d12d696a..a0189b0fc 100644 --- a/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch @@ -10,9 +10,9 @@ import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityBoat; -@@ -103,9 +106,10 @@ - { - Entity entity = null; +@@ -123,9 +126,10 @@ + p_75615_0_.func_82580_o("Type"); + } + Class oclass = null; try @@ -22,7 +22,7 @@ if (oclass != null) { -@@ -119,7 +123,17 @@ +@@ -139,7 +143,17 @@ if (entity != null) { diff --git a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index 0cbb93205..c43b914e2 100644 --- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -8,7 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.util.Iterator; -@@ -173,6 +175,7 @@ +@@ -175,6 +177,7 @@ public void func_70071_h_() { @@ -16,7 +16,7 @@ if (this.field_71074_e != null) { ItemStack itemstack = this.field_71071_by.func_70448_g(); -@@ -296,6 +299,7 @@ +@@ -298,6 +301,7 @@ { this.field_71100_bB.func_75118_a(this); } @@ -24,7 +24,7 @@ } public int func_82145_z() -@@ -1822,4 +1826,9 @@ +@@ -1839,4 +1843,9 @@ { return this.func_82241_s(1); } diff --git a/fml/patches/minecraft/net/minecraft/item/Item.java.patch b/fml/patches/minecraft/net/minecraft/item/Item.java.patch index 65543a6bf..39c5c39a2 100644 --- a/fml/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/fml/patches/minecraft/net/minecraft/item/Item.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.util.List; -@@ -207,6 +208,8 @@ +@@ -213,6 +214,8 @@ } field_77698_e[256 + p_i3659_1_] = this; @@ -15,4 +15,4 @@ + GameData.newItemAdded(this); } - public Item func_77665_c(int p_77665_1_) + public Item func_77625_d(int p_77625_1_) diff --git a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 695084c44..fa71f7994 100644 --- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -9,7 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.awt.GraphicsEnvironment; -@@ -378,7 +381,11 @@ +@@ -379,7 +382,11 @@ { if (this.func_71197_b()) { @@ -21,7 +21,7 @@ for (long k0 = 0L; this.field_71317_u; this.field_71296_Q = true) { -@@ -417,6 +424,7 @@ +@@ -418,6 +425,7 @@ Thread.sleep(1L); } @@ -29,7 +29,7 @@ } else { -@@ -425,6 +433,10 @@ +@@ -426,6 +434,10 @@ } catch (Throwable throwable) { @@ -40,7 +40,7 @@ throwable.printStackTrace(); field_71306_a.log(Level.SEVERE, "Encountered an unexpected exception " + throwable.getClass().getSimpleName(), throwable); CrashReport crashreport = null; -@@ -455,6 +467,10 @@ +@@ -456,6 +468,10 @@ { try { @@ -51,7 +51,7 @@ this.func_71260_j(); this.field_71316_v = true; } -@@ -464,6 +480,7 @@ +@@ -465,6 +481,7 @@ } finally { @@ -59,7 +59,7 @@ this.func_71240_o(); } } -@@ -480,8 +497,10 @@ +@@ -481,8 +498,10 @@ public void func_71217_p() { @@ -70,7 +70,7 @@ ++this.field_71315_w; if (this.field_71295_T) -@@ -527,6 +546,7 @@ +@@ -528,6 +547,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76319_b(); @@ -78,7 +78,7 @@ } public void func_71190_q() -@@ -554,6 +574,7 @@ +@@ -555,6 +575,7 @@ } this.field_71304_b.func_76320_a("tick"); @@ -86,7 +86,7 @@ CrashReport crashreport; try -@@ -578,6 +599,7 @@ +@@ -579,6 +600,7 @@ throw new ReportedException(crashreport); } @@ -94,7 +94,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76320_a("tracker"); worldserver.func_73039_n().func_72788_a(); -@@ -705,7 +727,7 @@ +@@ -706,7 +728,7 @@ public String getServerModName() { @@ -103,7 +103,7 @@ } public CrashReport func_71230_b(CrashReport p_71230_1_) -@@ -1146,6 +1168,13 @@ +@@ -1147,6 +1169,13 @@ @SideOnly(Side.SERVER) public static void main(String[] p_main_0_) { diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch index b2acebfe6..2da97b5ba 100644 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch +++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch @@ -45,12 +45,3 @@ } else { -@@ -183,7 +198,7 @@ - public void func_85027_a(CrashReportCategory p_85027_1_) - { - p_85027_1_.func_71500_a("Name", new CallableTileEntityName(this)); -- CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q.field_71990_ca, this.field_70325_p); -+ CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q != null ? this.field_70324_q.field_71990_ca : 0, this.field_70325_p); - } - - static Map func_85028_t() diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch index ef8dce84a..6bedc67dd 100644 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch +++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -@@ -287,7 +288,15 @@ +@@ -308,7 +309,15 @@ } } diff --git a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch b/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch index 6cdf39e18..beb777c8d 100644 --- a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch +++ b/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch @@ -7,15 +7,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.BufferedReader; -@@ -80,6 +81,7 @@ +@@ -93,6 +94,7 @@ } } } + LanguageRegistry.instance().loadLanguageTable(p_74812_1_, p_74812_2_); } - public void func_74810_a(String p_74810_1_) -@@ -138,7 +140,6 @@ + public synchronized void func_74810_a(String p_74810_1_, boolean p_74810_2_) +@@ -170,7 +172,6 @@ } } diff --git a/fml/patches/minecraft/net/minecraft/world/World.java.patch b/fml/patches/minecraft/net/minecraft/world/World.java.patch index 9a67b92fc..3d4ec82e0 100644 --- a/fml/patches/minecraft/net/minecraft/world/World.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/World.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/World.java +++ ../src-work/minecraft/net/minecraft/world/World.java -@@ -1797,13 +1797,14 @@ +@@ -1754,13 +1754,14 @@ } } @@ -16,7 +16,7 @@ this.field_72984_F.func_76318_c("pendingTileEntities"); -@@ -3637,7 +3638,7 @@ +@@ -3673,7 +3674,7 @@ @SideOnly(Side.CLIENT) public double func_72919_O() {