From 22dbe411d9178de73c3fe56a597cf6a78e6daffd Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 4 Feb 2013 10:58:48 -0500 Subject: [PATCH 1/6] Fix up mistake that broke all modloading. Nice. --- common/cpw/mods/fml/common/LoadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cpw/mods/fml/common/LoadController.java b/common/cpw/mods/fml/common/LoadController.java index c9f1cb9ce5..6a8d5bab51 100644 --- a/common/cpw/mods/fml/common/LoadController.java +++ b/common/cpw/mods/fml/common/LoadController.java @@ -62,7 +62,7 @@ public class LoadController if (isActive) { Level level = Logger.getLogger(mod.getModId()).getLevel(); - FMLLog.log(mod.getModId(), Level.FINE, "Mod Logging channel %s configured at %s level.", level == null ? "default" : level); + FMLLog.log(mod.getModId(), Level.FINE, "Mod Logging channel %s configured at %s level.", mod.getModId(), level == null ? "default" : level); FMLLog.log(mod.getModId(), Level.INFO, "Activating mod %s", mod.getModId()); activeModList.add(mod); modStates.put(mod.getModId(), ModState.UNLOADED); From cd96718339e2c6e494600828c0c2938b1cc1df64 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 6 Feb 2013 01:25:46 -0500 Subject: [PATCH 2/6] Fix HD mob skins, FINALLY!!! Stupid eyes are stupid. --- .../cpw/mods/fml/client/TextureFXManager.java | 15 +++++++++++++ .../client/renderer/RenderEngine.java.patch | 21 ++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/client/cpw/mods/fml/client/TextureFXManager.java b/client/cpw/mods/fml/client/TextureFXManager.java index fe1fe5575f..aee69376d1 100644 --- a/client/cpw/mods/fml/client/TextureFXManager.java +++ b/client/cpw/mods/fml/client/TextureFXManager.java @@ -317,4 +317,19 @@ public class TextureFXManager return INSTANCE; } + public void fixTransparency(BufferedImage loadedImage, String textureName) + { + if (textureName.matches("^/mob/.*_eyes.*.png$")) + { + for (int x = 0; x < loadedImage.getWidth(); x++) { + for (int y = 0; y < loadedImage.getHeight(); y++) { + int argb = loadedImage.getRGB(x, y); + if ((argb & 0xff000000) == 0 && argb != 0) { + loadedImage.setRGB(x, y, 0); + } + } + } + } + } + } diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch index 47203a4115..569f9c8fd0 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch @@ -43,7 +43,18 @@ var6.printStackTrace(); int[] var5 = this.func_78348_b(this.field_78364_l); this.field_78359_d.put(p_78346_1_, var5); -@@ -250,6 +259,7 @@ +@@ -181,7 +190,9 @@ + } + else + { +- this.func_78351_a(this.func_78345_a(var7), var3); ++ BufferedImage loadedImage = this.func_78345_a(var7); ++ TextureFXManager.instance().fixTransparency(loadedImage, p_78341_1_); ++ this.func_78351_a(loadedImage, var3); + } + } + +@@ -250,6 +261,7 @@ int var3 = p_78351_1_.getWidth(); int var4 = p_78351_1_.getHeight(); @@ -51,7 +62,7 @@ int[] var5 = new int[var3 * var4]; byte[] var6 = new byte[var3 * var4 * 4]; p_78351_1_.getRGB(0, 0, var3, var4, var5, 0, var3); -@@ -410,6 +420,7 @@ +@@ -410,6 +422,7 @@ public void func_78355_a(TextureFX p_78355_1_) { @@ -59,7 +70,7 @@ this.field_78367_h.add(p_78355_1_); p_78355_1_.func_76846_a(); } -@@ -422,28 +433,44 @@ +@@ -422,28 +435,44 @@ { TextureFX var3 = (TextureFX)this.field_78367_h.get(var2); var3.field_76851_c = this.field_78365_j.field_74337_g; @@ -113,7 +124,7 @@ } } -@@ -509,8 +536,9 @@ +@@ -509,8 +538,9 @@ this.field_78361_b = false; this.field_78363_a = false; } @@ -125,7 +136,7 @@ var7.printStackTrace(); } } -@@ -546,8 +574,9 @@ +@@ -546,8 +576,9 @@ this.field_78361_b = false; this.field_78363_a = false; } From 1c3dc132cbd1dc445f058e37dac7c31150ce6fb3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 8 Feb 2013 14:50:17 -0800 Subject: [PATCH 3/6] Option to disable renaming for srgnames. --- install/fml.py | 7 ++++--- install/install.py | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/install/fml.py b/install/fml.py index 419beea7ea..a75d2ca5a1 100644 --- a/install/fml.py +++ b/install/fml.py @@ -429,15 +429,16 @@ def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True): if os.path.isdir(os.path.join(src_dir, 'minecraft', 'argo')): shutil.rmtree(os.path.join(src_dir, 'minecraft', 'argo')) -def finish_setup_fml(fml_dir, mcp_dir, enable_server=False, disable_client=False): +def finish_setup_fml(fml_dir, mcp_dir, enable_server=False, disable_client=False, disable_rename=False): sys.path.append(mcp_dir) from runtime.updatenames import updatenames from runtime.updatemd5 import updatemd5 from runtime.updatemcp import updatemcp os.chdir(mcp_dir) - updatenames(None, True, not disable_client, enable_server) - reset_logger() + if not disable_rename: + updatenames(None, True, not disable_client, enable_server) + reset_logger() updatemd5(None, True, not disable_client, enable_server) reset_logger() os.chdir(fml_dir) diff --git a/install/install.py b/install/install.py index 97dec17703..6de130e0e1 100644 --- a/install/install.py +++ b/install/install.py @@ -3,7 +3,8 @@ from optparse import OptionParser from fml import setup_fml, finish_setup_fml, apply_fml_patches, setup_mcp -def fml_main(fml_dir, mcp_dir, dont_gen_conf=True, disable_patches=False, disable_at=False, disable_merge=False, enable_server=False, disable_client=False): +def fml_main(fml_dir, mcp_dir, dont_gen_conf=True, disable_patches=False, disable_at=False, disable_merge=False, enable_server=False, disable_client=False, + disable_rename=False): print '================ Forge ModLoader Setup Start ===================' setup_mcp(fml_dir, mcp_dir, dont_gen_conf) setup_fml(fml_dir, mcp_dir, disable_at=disable_at, disable_merge=disable_merge, enable_server=enable_server, disable_client=disable_client) @@ -11,7 +12,7 @@ def fml_main(fml_dir, mcp_dir, dont_gen_conf=True, disable_patches=False, disabl print 'Patching disabled' else: apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src')) - finish_setup_fml(fml_dir, mcp_dir, enable_server=enable_server, disable_client=disable_client) + finish_setup_fml(fml_dir, mcp_dir, enable_server=enable_server, disable_client=disable_client, disable_rename=disable_rename) print '================ Forge ModLoader Setup End ===================' if __name__ == '__main__': @@ -22,6 +23,7 @@ if __name__ == '__main__': parser.add_option('-s', '--server', action="store_true", dest='enable_server', help='Enable decompilation of server', default=False) parser.add_option('-c', '--no-client', action="store_true", dest='no_client', help='Disable decompilation of server', default=False) parser.add_option('-e', '--no-merge', action="store_true", dest='no_merge', help='Disable merging server code into client', default=False) + parser.add_option('-n', '--no-rename', action="store_true", dest='no_rename', help='Disable running updatenames', default=False) options, _ = parser.parse_args() fml_dir = os.path.dirname(os.path.abspath(__file__)) @@ -40,4 +42,5 @@ if __name__ == '__main__': fml_main(fml_dir, mcp_dir, disable_patches=options.no_patch, disable_at=options.no_access, disable_merge=options.no_merge, - enable_server=options.enable_server, disable_client=options.no_client) \ No newline at end of file + enable_server=options.enable_server, disable_client=options.no_client, + disable_rename=options.no_rename) \ No newline at end of file From ce68456f97876d5b63612a3a95787c5a1158aa46 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 17 Feb 2013 16:22:58 -0500 Subject: [PATCH 4/6] Fix Language Registry, closes #163 --- .../fml/common/registry/LanguageRegistry.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/common/cpw/mods/fml/common/registry/LanguageRegistry.java b/common/cpw/mods/fml/common/registry/LanguageRegistry.java index 1de27d199f..65a7d2bd2d 100644 --- a/common/cpw/mods/fml/common/registry/LanguageRegistry.java +++ b/common/cpw/mods/fml/common/registry/LanguageRegistry.java @@ -12,6 +12,8 @@ import java.util.logging.Level; import com.google.common.base.Charsets; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -122,7 +124,23 @@ public class LanguageRegistry public void loadLocalization(String localizationFile, String lang, boolean isXML) { - loadLocalization(this.getClass().getResource(localizationFile), lang, isXML); + URL urlResource = this.getClass().getResource(localizationFile); + if (urlResource != null) + { + loadLocalization(urlResource, lang, isXML); + } + else + { + ModContainer activeModContainer = Loader.instance().activeModContainer(); + if (activeModContainer!=null) + { + FMLLog.log(activeModContainer.getModId(), Level.SEVERE, "The language resource %s cannot be located on the classpath. This is a programming error.", localizationFile); + } + else + { + FMLLog.log(Level.SEVERE, "The language resource %s cannot be located on the classpath. This is a programming error.", localizationFile); + } + } } public void loadLocalization(URL localizationFile, String lang, boolean isXML) From bad55cacfaac6c3465775f6147eb282cb6d6f235 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 22 Feb 2013 14:45:25 -0800 Subject: [PATCH 5/6] Fix sprite map issue. --- client/cpw/mods/fml/client/SpriteHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/cpw/mods/fml/client/SpriteHelper.java b/client/cpw/mods/fml/client/SpriteHelper.java index 0c2a6133f2..637fcd8147 100644 --- a/client/cpw/mods/fml/client/SpriteHelper.java +++ b/client/cpw/mods/fml/client/SpriteHelper.java @@ -61,9 +61,9 @@ public class SpriteHelper "0000000000000000" + "0000000000000000" + "0111110000000000" + - "1111111010000000" + + "0111111010000000" + "0111111110000000" + - "0111111111111001" + + "0111111110001000" + "1111111111111111" + "0000011111111111" + "0000000000000000"); From 67f12d6dec67b025a678f96e359526f123b64172 Mon Sep 17 00:00:00 2001 From: immibis Date: Sat, 23 Feb 2013 19:27:16 +1300 Subject: [PATCH 6/6] Console log thread should be a daemon thread. --- common/cpw/mods/fml/relauncher/FMLRelaunchLog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java b/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java index 88d85830cf..87da04e1fb 100644 --- a/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java +++ b/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java @@ -151,6 +151,7 @@ public class FMLRelaunchLog log.myLog.setLevel(Level.ALL); log.myLog.setUseParentHandlers(false); consoleLogThread = new Thread(new ConsoleLogThread()); + consoleLogThread.setDaemon(true); consoleLogThread.start(); formatter = new FMLLogFormatter(); try