From 9c50745bdbbe51cc7f146e1311b616deca75b2d9 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Tue, 3 Feb 2015 00:26:17 -0800 Subject: [PATCH 1/7] Updated FML: MinecraftForge/FML@1de3bf733aef754f15de55006b1750376871feb0 Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds. Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes. MinecraftForge/FML@05ecefb53857ecc1dc52d4a577ed593c26da9659 Update to ASM5 for Java 8 support MinecraftForge/FML@1112c455b9758c38eab385f48578bad17c0180f9 Merge pull request #595 from Grinch/master --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index d00feb58c7..1112c455b9 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit d00feb58c762b0bbc506d79faf1ce40bc96732e9 +Subproject commit 1112c455b9758c38eab385f48578bad17c0180f9 From 9704f25aa89415c2bb4ca4dd932a0ef8849ddf9e Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Thu, 5 Feb 2015 17:03:43 -0800 Subject: [PATCH 2/7] Fixed potential NPEs in Structure code caused by componenets not being able to load. --- .../world/gen/structure/StructureStart.java.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch index b21aa36e81..9615cd3393 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch @@ -11,3 +11,13 @@ NBTTagCompound nbttagcompound = new NBTTagCompound(); nbttagcompound.func_74778_a("id", MapGenStructureIO.func_143033_a(this)); nbttagcompound.func_74768_a("ChunkX", p_143021_1_); +@@ -97,7 +101,8 @@ + + for (int i = 0; i < nbttaglist.func_74745_c(); ++i) + { +- this.field_75075_a.add(MapGenStructureIO.func_143032_b(nbttaglist.func_150305_b(i), p_143020_1_)); ++ StructureComponent tmp = MapGenStructureIO.func_143032_b(nbttaglist.func_150305_b(i), p_143020_1_); ++ if (tmp != null) this.field_75075_a.add(tmp); //Forge: Prevent NPEs further down the line when a component can't be loaded. + } + + this.func_143017_b(p_143020_2_); From c9fd2b617310fec401b877ad01d96a87a82db6a7 Mon Sep 17 00:00:00 2001 From: cpw Date: Fri, 20 Mar 2015 14:40:47 -0400 Subject: [PATCH 3/7] MinecraftForge/FML@6b0ae369eb9b8cf89eb9d53fe997a6e5ef222093 Try and improve performance of the registry by avoiding superType.cast. MinecraftForge/FML@dfebcafd49550b8c3f90c6c028ef0d7f3a13e607 Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int) dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers but bumping a server to this version will allow clients with this version as well to now login in dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions. MinecraftForge/FML@6011419fa055c1375d05189f9bf0d86705c9c0ec Clean up my patch. Terrible person I am.. MinecraftForge/FML@c6bbd0e82de3d8f7993d70aa7be3f883b3afbc47 Forgot that I need a noarg ctor. I'm so rusty. MinecraftForge/FML@6edc1635de163c41b6b5dfe02bee13d6a9c5aa4d Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events) works properly --- fml | 2 +- .../network/NetHandlerPlayClient.java.patch | 8 +++---- .../ServerConfigurationManager.java.patch | 22 +++++++++---------- .../world/storage/SaveHandler.java.patch | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/fml b/fml index 1112c455b9..6edc1635de 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 1112c455b9758c38eab385f48578bad17c0180f9 +Subproject commit 6edc1635de163c41b6b5dfe02bee13d6a9c5aa4d diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch index 365c394770..b3d3008cd1 100644 --- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch +++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java -@@ -195,6 +195,8 @@ +@@ -196,6 +196,8 @@ import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.MapStorage; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -389,7 +391,8 @@ +@@ -390,7 +392,8 @@ public void func_147286_a(S11PacketSpawnExperienceOrb p_147286_1_) { @@ -19,7 +19,7 @@ entityxporb.field_70118_ct = p_147286_1_.func_148984_d(); entityxporb.field_70117_cu = p_147286_1_.func_148983_e(); entityxporb.field_70116_cv = p_147286_1_.func_148982_f(); -@@ -686,7 +689,11 @@ +@@ -687,7 +690,11 @@ public void func_147251_a(S02PacketChat p_147251_1_) { @@ -32,7 +32,7 @@ } public void func_147279_a(S0BPacketAnimation p_147279_1_) -@@ -1126,6 +1133,10 @@ +@@ -1127,6 +1134,10 @@ { tileentity.func_145839_a(p_147273_1_.func_148857_g()); } diff --git a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch index 0f030973a5..a959f9dc05 100644 --- a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java +++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java -@@ -55,11 +55,15 @@ +@@ -55,12 +55,15 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraft.util.MathHelper; @@ -11,12 +11,12 @@ import net.minecraft.world.WorldSettings; import net.minecraft.world.demo.DemoWorldManager; import net.minecraft.world.storage.IPlayerFileData; + import net.minecraft.world.storage.SaveHandler; +import net.minecraftforge.common.chunkio.ChunkIOExecutor; -+ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -108,7 +112,17 @@ +@@ -109,7 +112,17 @@ String s = gameprofile1 == null ? gameprofile.getName() : gameprofile1.getName(); playerprofilecache.func_152649_a(gameprofile); NBTTagCompound nbttagcompound = this.func_72380_a(p_72355_2_); @@ -35,7 +35,7 @@ p_72355_2_.field_71134_c.func_73080_a((WorldServer)p_72355_2_.field_70170_p); String s1 = "local"; -@@ -242,6 +256,7 @@ +@@ -243,6 +256,7 @@ p_72380_1_.func_70020_e(nbttagcompound); nbttagcompound1 = nbttagcompound; field_148546_d.debug("loading single player"); @@ -43,7 +43,7 @@ } else { -@@ -269,6 +284,7 @@ +@@ -283,6 +297,7 @@ this.func_148540_a(new S38PacketPlayerListItem(p_72377_1_.func_70005_c_(), true, 1000)); this.field_72404_b.add(p_72377_1_); WorldServer worldserver = this.field_72400_f.func_71218_a(p_72377_1_.field_71093_bK); @@ -51,7 +51,7 @@ worldserver.func_72838_d(p_72377_1_); this.func_72375_a(p_72377_1_, (WorldServer)null); -@@ -301,6 +317,7 @@ +@@ -315,6 +330,7 @@ worldserver.func_73040_p().func_72695_c(p_72367_1_); this.field_72404_b.remove(p_72367_1_); this.field_148547_k.remove(p_72367_1_.func_110124_au()); @@ -59,7 +59,7 @@ this.func_148540_a(new S38PacketPlayerListItem(p_72367_1_.func_70005_c_(), false, 9999)); } -@@ -382,13 +399,23 @@ +@@ -396,13 +412,23 @@ public EntityPlayerMP func_72368_a(EntityPlayerMP p_72368_1_, int p_72368_2_, boolean p_72368_3_) { @@ -85,7 +85,7 @@ p_72368_1_.field_71093_bK = p_72368_2_; Object object; -@@ -404,6 +431,7 @@ +@@ -418,6 +444,7 @@ EntityPlayerMP entityplayermp1 = new EntityPlayerMP(this.field_72400_f, this.field_72400_f.func_71218_a(p_72368_1_.field_71093_bK), p_72368_1_.func_146103_bH(), (ItemInWorldManager)object); entityplayermp1.field_71135_a = p_72368_1_.field_71135_a; entityplayermp1.func_71049_a(p_72368_1_, p_72368_3_); @@ -93,7 +93,7 @@ entityplayermp1.func_145769_d(p_72368_1_.func_145782_y()); WorldServer worldserver = this.field_72400_f.func_71218_a(p_72368_1_.field_71093_bK); this.func_72381_a(entityplayermp1, p_72368_1_, worldserver); -@@ -448,14 +476,19 @@ +@@ -462,14 +489,19 @@ public void func_72356_a(EntityPlayerMP p_72356_1_, int p_72356_2_) { @@ -115,7 +115,7 @@ this.func_72375_a(p_72356_1_, worldserver); p_72356_1_.field_71135_a.func_147364_a(p_72356_1_.field_70165_t, p_72356_1_.field_70163_u, p_72356_1_.field_70161_v, p_72356_1_.field_70177_z, p_72356_1_.field_70125_A); p_72356_1_.field_71134_c.func_73080_a(worldserver1); -@@ -473,38 +506,47 @@ +@@ -487,38 +519,47 @@ public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_) { @@ -175,7 +175,7 @@ { ChunkCoordinates chunkcoordinates; -@@ -539,7 +581,7 @@ +@@ -553,7 +594,7 @@ if (p_82448_1_.func_70089_S()) { p_82448_1_.func_70012_b(d0, p_82448_1_.field_70163_u, d1, p_82448_1_.field_70177_z, p_82448_1_.field_70125_A); diff --git a/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch b/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch index a265ec02f7..3e8518a0f0 100644 --- a/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch +++ b/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/storage/SaveHandler.java +++ ../src-work/minecraft/net/minecraft/world/storage/SaveHandler.java -@@ -254,6 +254,7 @@ +@@ -256,6 +256,7 @@ } file1.renameTo(file2); @@ -8,7 +8,7 @@ } catch (Exception exception) { -@@ -284,6 +285,7 @@ +@@ -286,6 +287,7 @@ p_75752_1_.func_70020_e(nbttagcompound); } From ce10d0dfd051537f96af6b3cc244071df8f745ec Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 22 Mar 2015 13:07:06 -0400 Subject: [PATCH 4/7] MinecraftForge/FML@4ca6f6e19f3c3147fcf48c58669f55478a9a1345 What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise. MinecraftForge/FML@6f6cec96be73b4c94999cf60dc00741f3f3c2cc2 Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever. MinecraftForge/FML@13ac015f0c36b8e2091ae332c556be315429f4c8 Change iterator behaviour for the registry - include substitutions in the standard iterator, so that vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the absolute set, used mostly for sanity checking and serialization. --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index 6edc1635de..13ac015f0c 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 6edc1635de163c41b6b5dfe02bee13d6a9c5aa4d +Subproject commit 13ac015f0c36b8e2091ae332c556be315429f4c8 From 9e7e9e5cbfa202648b8e5485662363a97f149a00 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Fri, 27 Mar 2015 02:54:55 -0700 Subject: [PATCH 5/7] MinecraftForge/FML@24cb4a42c4e4bddde95c0e49d1f8b8bcc20c626d Enhance output of common FML errors in crash reports and server GUI. Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions. --- fml | 2 +- .../minecraftforge/common/MinecraftForge.java | 112 +++++++++++++++++- 2 files changed, 111 insertions(+), 3 deletions(-) diff --git a/fml b/fml index 13ac015f0c..24cb4a42c4 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 13ac015f0c36b8e2091ae332c556be315429f4c8 +Subproject commit 24cb4a42c4e4bddde95c0e49d1f8b8bcc20c626d diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java index c0f0414cbd..93692ed9f0 100644 --- a/src/main/java/net/minecraftforge/common/MinecraftForge.java +++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java @@ -1,8 +1,14 @@ package net.minecraftforge.common; +import java.util.concurrent.Callable; + +import com.google.common.collect.ObjectArrays; + +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.EventBus; +import cpw.mods.fml.relauncher.Side; import net.minecraft.crash.CrashReport; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeHooks.SeedEntry; @@ -47,11 +53,113 @@ public class MinecraftForge OreDictionary.getOreName(0); //Force these classes to be defined, Should prevent derp error hiding. - new CrashReport("ThisIsFake", new Exception("Not real")); - + CrashReport fake = new CrashReport("ThisIsFake", new Exception("Not real")); + //Lets init World's crash report inner classes to prevent them from hiding errors. + String[] handlers = { + "net.minecraft.world.World$1", + "net.minecraft.world.World$2", + "net.minecraft.world.World$3", + "net.minecraft.world.World$4", + "net.minecraft.world.chunk.Chunk$1", + "net.minecraft.crash.CrashReportCategory$1", + "net.minecraft.crash.CrashReportCategory$2", + "net.minecraft.crash.CrashReportCategory$3", + "net.minecraft.entity.Entity$1", + "net.minecraft.entity.Entity$2", + "net.minecraft.entity.EntityTracker$1", + "net.minecraft.world.gen.layer.GenLayer$1", + "net.minecraft.world.gen.layer.GenLayer$2", + "net.minecraft.entity.player.InventoryPlayer$1", + "net.minecraft.world.gen.structure.MapGenStructure$1", + "net.minecraft.world.gen.structure.MapGenStructure$2", + "net.minecraft.world.gen.structure.MapGenStructure$3", + "net.minecraft.server.MinecraftServer$3", + "net.minecraft.server.MinecraftServer$4", + "net.minecraft.server.MinecraftServer$5", + "net.minecraft.nbt.NBTTagCompound$1", + "net.minecraft.nbt.NBTTagCompound$2", + "net.minecraft.network.NetHandlerPlayServer$2", + "net.minecraft.network.NetworkSystem$3", + "net.minecraft.tileentity.TileEntity$1", + "net.minecraft.tileentity.TileEntity$2", + "net.minecraft.tileentity.TileEntity$3", + "net.minecraft.world.storage.WorldInfo$1", + "net.minecraft.world.storage.WorldInfo$2", + "net.minecraft.world.storage.WorldInfo$3", + "net.minecraft.world.storage.WorldInfo$4", + "net.minecraft.world.storage.WorldInfo$5", + "net.minecraft.world.storage.WorldInfo$6", + "net.minecraft.world.storage.WorldInfo$7", + "net.minecraft.world.storage.WorldInfo$8", + "net.minecraft.world.storage.WorldInfo$9" + }; + String[] client = { + "net.minecraft.client.Minecraft$3", + "net.minecraft.client.Minecraft$4", + "net.minecraft.client.Minecraft$5", + "net.minecraft.client.Minecraft$6", + "net.minecraft.client.Minecraft$7", + "net.minecraft.client.Minecraft$8", + "net.minecraft.client.Minecraft$9", + "net.minecraft.client.Minecraft$10", + "net.minecraft.client.Minecraft$11", + "net.minecraft.client.Minecraft$12", + "net.minecraft.client.Minecraft$13", + "net.minecraft.client.Minecraft$14", + "net.minecraft.client.Minecraft$15", + "net.minecraft.client.multiplayer.WorldClient$1", + "net.minecraft.client.multiplayer.WorldClient$2", + "net.minecraft.client.multiplayer.WorldClient$3", + "net.minecraft.client.multiplayer.WorldClient$4", + "net.minecraft.client.particle,EffectRenderer$1", + "net.minecraft.client.particle,EffectRenderer$2", + "net.minecraft.client.particle,EffectRenderer$3", + "net.minecraft.client.particle,EffectRenderer$4", + "net.minecraft.client.renderer.EntityRenderer$1", + "net.minecraft.client.renderer.EntityRenderer$2", + "net.minecraft.client.renderer.EntityRenderer$3", + "net.minecraft.server.integrated.IntegratedServer$1", + "net.minecraft.server.integrated.IntegratedServer$2", + "net.minecraft.client.renderer.RenderGlobal$1", + "net.minecraft.client.renderer.entity.RenderItem$1", + "net.minecraft.client.renderer.entity.RenderItem$2", + "net.minecraft.client.renderer.entity.RenderItem$3", + "net.minecraft.client.renderer.entity.RenderItem$4", + "net.minecraft.client.renderer.texture.TextureAtlasSprite$1", + "net.minecraft.client.renderer.texture.TextureManager$1", + "net.minecraft.client.renderer.texture.TextureMap$1", + "net.minecraft.client.renderer.texture.TextureMap$2", + "net.minecraft.client.renderer.texture.TextureMap$3" + }; + String[] server = { + "net.minecraft.server.dedicated.DedicatedServer$3", + "net.minecraft.server.dedicated.DedicatedServer$4" + }; + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) + handlers = ObjectArrays.concat(handlers, client, String.class); + else + handlers = ObjectArrays.concat(handlers, server, String.class); + + FMLLog.info("Preloading CrashReport classes", ForgeVersion.getVersion()); + for (String s : handlers) + { + FMLLog.info("\t" + s); + try + { + Class cls = Class.forName(s, false, MinecraftForge.class.getClassLoader()); + if (cls != null && !Callable.class.isAssignableFrom(cls)) + { + FMLLog.info("\t% s is not a instance of callable!", s); + } + } + catch (Exception e){} + } + UsernameCache.load(); } + + public static String getBrandingVersion() { return "Minecraft Forge "+ ForgeVersion.getVersion(); From 1b7ce7592caafb760ec93066184182ae0711e793 Mon Sep 17 00:00:00 2001 From: cpw Date: Tue, 31 Mar 2015 20:50:16 -0400 Subject: [PATCH 6/7] Experimental "fix" for the weird rendering in the Acheivements screen. Thanks skyboy for spotting this. --- .../client/gui/achievement/GuiAchievements.java.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch index 7fc8d0e2f5..a322f04b22 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch @@ -61,6 +61,15 @@ } } +@@ -260,7 +286,7 @@ + GL11.glDepthFunc(GL11.GL_GEQUAL); + GL11.glPushMatrix(); + GL11.glTranslatef((float)k1, (float)l1, -200.0F); +- GL11.glScalef(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 0.0F); ++ GL11.glScalef(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 1.0F); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -339,11 +365,12 @@ int j4; int l4; From e1c83de490e32f61760bc0bbd97bdd0c077a7392 Mon Sep 17 00:00:00 2001 From: cpw Date: Wed, 1 Apr 2015 07:13:14 -0400 Subject: [PATCH 7/7] Comment on previous commit fix - it worked. Thanks to skyboy and tterrag for investigating and verifying. A chest as an acheivement icon will recreate the original problem, for note. --- .../gui/achievement/GuiAchievements.java.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch index a322f04b22..9313947d25 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch @@ -61,16 +61,18 @@ } } -@@ -260,7 +286,7 @@ +@@ -260,7 +286,9 @@ GL11.glDepthFunc(GL11.GL_GEQUAL); GL11.glPushMatrix(); GL11.glTranslatef((float)k1, (float)l1, -200.0F); - GL11.glScalef(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 0.0F); ++ // FIXES models rendering weirdly in the acheivements pane ++ // see https://github.com/MinecraftForge/MinecraftForge/commit/1b7ce7592caafb760ec93066184182ae0711e793#commitcomment-10512284 + GL11.glScalef(1.0F / this.field_146570_r, 1.0F / this.field_146570_r, 1.0F); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); -@@ -339,11 +365,12 @@ +@@ -339,11 +367,12 @@ int j4; int l4; @@ -86,7 +88,7 @@ { j3 = achievement1.field_75993_a * 24 - k + 11; k3 = achievement1.field_75991_b * 24 - l + 11; -@@ -400,9 +427,9 @@ +@@ -400,9 +429,9 @@ int i5; int j5; @@ -98,7 +100,7 @@ i5 = achievement2.field_75993_a * 24 - k; j5 = achievement2.field_75991_b * 24 - l; -@@ -444,6 +471,7 @@ +@@ -444,6 +473,7 @@ this.field_146297_k.func_110434_K().func_110577_a(field_146561_C); @@ -106,7 +108,7 @@ if (achievement2.func_75984_f()) { this.func_73729_b(i5 - 2, j5 - 2, 26, 202, 26, 26); -@@ -452,6 +480,7 @@ +@@ -452,6 +482,7 @@ { this.func_73729_b(i5 - 2, j5 - 2, 0, 202, 26, 26); } @@ -114,7 +116,7 @@ if (!this.field_146556_E.func_77442_b(achievement2)) { -@@ -460,7 +489,7 @@ +@@ -460,7 +491,7 @@ renderitem.field_77024_a = false; }