From d8e82d4c35e40d9ae26ee7d52fb6695e8dc2730c Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 27 Feb 2013 22:40:15 -0800 Subject: [PATCH] Fix bug in rename_vars where certian items would fail to be renamed. --- fml/install/rename_vars.py | 11 +++++++---- .../minecraft/client/renderer/ItemRenderer.java.patch | 9 --------- .../net/minecraft/server/MinecraftServer.java.patch | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch diff --git a/fml/install/rename_vars.py b/fml/install/rename_vars.py index b639131073..6080f16b9e 100644 --- a/fml/install/rename_vars.py +++ b/fml/install/rename_vars.py @@ -124,13 +124,16 @@ def rename_class(data, indent='3', MCP=False): if method: namer = VarNamer() todo = map(lambda x: [x, namer.get_name(x.split(' ')[0], x)], method_variables) - - todo.reverse() + + replace = {} for mapping in todo: if not ' ' in mapping[0]: continue - original = mapping[0].split(' ')[1] - to = mapping[1] + replace[mapping[0].split(' ')[1]] = mapping[1] + + for k in sorted(replace, key=len, reverse=True): + original = k + to = replace[k] #Don't rename already renamed things. if not re.match('var\d+', original): diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch deleted file mode 100644 index ebc40c537f..0000000000 --- a/fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/renderer/ItemRenderer.java -+++ ../src-work/minecraft/net/minecraft/client/renderer/ItemRenderer.java -@@ -1,5 +1,6 @@ - package net.minecraft.client.renderer; - -+import cpw.mods.fml.client.TextureFXManager; - import cpw.mods.fml.relauncher.Side; - import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; diff --git a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index d244ed32f1..54be4dedcb 100644 --- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -19,7 +19,7 @@ + + FMLCommonHandler.instance().onWorldLoadTick(field_71305_c); - for (long k0 = 0L; this.field_71317_u; this.field_71296_Q = true) + for (long j = 0L; this.field_71317_u; this.field_71296_Q = true) { @@ -390,6 +397,7 @@