diff --git a/patches/minecraft/net/minecraft/server/gui/MinecraftServerGui.java.patch b/patches/minecraft/net/minecraft/server/gui/MinecraftServerGui.java.patch new file mode 100644 index 0000000000..70be448a30 --- /dev/null +++ b/patches/minecraft/net/minecraft/server/gui/MinecraftServerGui.java.patch @@ -0,0 +1,34 @@ +--- ../src-base/minecraft/net/minecraft/server/gui/MinecraftServerGui.java ++++ ../src-work/minecraft/net/minecraft/server/gui/MinecraftServerGui.java +@@ -13,6 +13,7 @@ + import java.awt.event.FocusEvent; + import java.awt.event.WindowAdapter; + import java.awt.event.WindowEvent; ++import java.util.concurrent.CountDownLatch; + import javax.swing.JComponent; + import javax.swing.JFrame; + import javax.swing.JPanel; +@@ -79,6 +80,7 @@ + System.exit(0); + } + }); ++ minecraftservergui.latch.countDown(); + } + + public MinecraftServerGui(DedicatedServer p_i2362_1_) +@@ -165,8 +167,15 @@ + return jpanel; + } + ++ private CountDownLatch latch = new CountDownLatch(1); + public void func_164247_a(final JTextArea p_164247_1_, final JScrollPane p_164247_2_, final String p_164247_3_) + { ++ try ++ { ++ latch.await(); ++ } catch (InterruptedException e) ++ { ++ } + if (!SwingUtilities.isEventDispatchThread()) + { + SwingUtilities.invokeLater(new Runnable() diff --git a/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java b/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java index 08403cf003..4544e8d64d 100644 --- a/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java +++ b/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java @@ -13,6 +13,7 @@ public class FMLServerTweaker extends FMLTweaker { @Override public void injectIntoClassLoader(LaunchClassLoader classLoader) { + classLoader.addClassLoaderExclusion("com.mojang.util."); classLoader.addTransformerExclusion("cpw.mods.fml.repackage."); classLoader.addTransformerExclusion("cpw.mods.fml.relauncher."); classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers."); diff --git a/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java b/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java index 8b8d7fb133..1a411a2e8a 100644 --- a/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java +++ b/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java @@ -125,13 +125,13 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespaced { @Override public void func_148756_a(int id, String name, Object thing) { - FMLLog.info("Add : %s %d %s", name, id, thing); + FMLLog.finer("Add : %s %d %s", name, id, thing); add(id, name, superType.cast(thing)); } int swap(int id, String name, I thing) { - FMLLog.info("Swap : %s %d %s", name, id, thing); + FMLLog.fine("Swap : %s %d %s", name, id, thing); BitSet temporary = availabilityMap; availabilityMap = transactionalAvailabilityMap; @@ -149,7 +149,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespaced { reassignMapping(name, idToUse); useSlot(idToUse); availabilityMap = temporary; - FMLLog.info("Swap : %s %d %s", name, idToUse, thing); + FMLLog.fine("Swap : %s %d %s", name, idToUse, thing); return idToUse; } public int add(int id, String name, I thing) @@ -178,7 +178,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespaced { namedIds.forcePut(func_148755_c(name),idToUse); super.func_148756_a(idToUse, name, thing); useSlot(idToUse); - FMLLog.info("Add : %s %d %s", name, idToUse, thing); + FMLLog.finer("Add : %s %d %s", name, idToUse, thing); return idToUse; } @@ -313,7 +313,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespaced { { String name = entry.getKey(); Object thing = idMap().get(entry.getValue().intValue()); - FMLLog.info("Registry : %s %d %s", name, entry.getValue(), thing); + FMLLog.finer("Registry : %s %d %s", name, entry.getValue(), thing); } } } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 5bb9b92ddd..5ce95d0927 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,5 +1,5 @@ - + @@ -8,10 +8,7 @@ - - - - + @@ -22,26 +19,26 @@ + - - + - - - - + + + + - - - + + +