From fc08d072a405227986c7d6d9da3cf4606e64ea09 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 15 Aug 2012 19:54:56 -0400 Subject: [PATCH] Small fixes, including showing the FULL name of Forge Mod Loader --- client/cpw/mods/fml/client/GuiScrollingList.java | 5 +++-- client/cpw/mods/fml/client/GuiSlotModList.java | 12 ++++++------ .../mods/fml/common/network/FMLNetworkHandler.java | 1 - .../cpw/mods/fml/common/network/NetworkRegistry.java | 5 +++-- common/cpw/mods/fml/relauncher/FMLRelauncher.java | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/client/cpw/mods/fml/client/GuiScrollingList.java b/client/cpw/mods/fml/client/GuiScrollingList.java index 033d3655a0..f602b0ce78 100644 --- a/client/cpw/mods/fml/client/GuiScrollingList.java +++ b/client/cpw/mods/fml/client/GuiScrollingList.java @@ -81,9 +81,10 @@ public abstract class GuiScrollingList protected void func_27257_b(int p_27257_1_, int p_27257_2_) {} public int func_27256_c(int p_27256_1_, int p_27256_2_) + { - int var3 = this.listWidth / 2 - 110; - int var4 = this.listWidth / 2 + 110; + int var3 = this.left + 1; + int var4 = this.left + this.listWidth - 7; int var5 = p_27256_2_ - this.top - this.field_27261_r + (int)this.scrollDistance - 4; int var6 = var5 / this.slotHeight; return p_27256_1_ >= var3 && p_27256_1_ <= var4 && var6 >= 0 && var5 >= 0 && var6 < this.getSize() ? var6 : -1; diff --git a/client/cpw/mods/fml/client/GuiSlotModList.java b/client/cpw/mods/fml/client/GuiSlotModList.java index d40ea1b466..62f24a4f52 100644 --- a/client/cpw/mods/fml/client/GuiSlotModList.java +++ b/client/cpw/mods/fml/client/GuiSlotModList.java @@ -78,15 +78,15 @@ public class GuiSlotModList extends GuiScrollingList ModContainer mc=mods.get(listIndex); if (Loader.instance().getModState(mc)==ModState.DISABLED) { - this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getName(), listWidth - 11), this.left + 3 , var3 + 2, 0xFF2222); - this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getVersion(), listWidth - 11), this.left + 3 , var3 + 12, 0xFF2222); - this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a("DISABLED", listWidth - 11), this.left + 3 , var3 + 22, 0xFF2222); + this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getName(), listWidth - 10), this.left + 3 , var3 + 2, 0xFF2222); + this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getVersion(), listWidth - 10), this.left + 3 , var3 + 12, 0xFF2222); + this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a("DISABLED", listWidth - 10), this.left + 3 , var3 + 22, 0xFF2222); } else { - this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getName(), listWidth - 11), this.left + 3 , var3 + 2, 0xFFFFFF); - this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getVersion(), listWidth - 11), this.left + 3 , var3 + 12, 0xCCCCCC); - this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getMetadata() !=null ? mc.getMetadata().getChildModCountString() : "Metadata not found", listWidth - 9), this.left + 3 , var3 + 22, 0xCCCCCC); + this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getName(), listWidth - 10), this.left + 3 , var3 + 2, 0xFFFFFF); + this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getVersion(), listWidth - 10), this.left + 3 , var3 + 12, 0xCCCCCC); + this.parent.getFontRenderer().func_78276_b(this.parent.getFontRenderer().func_78269_a(mc.getMetadata() !=null ? mc.getMetadata().getChildModCountString() : "Metadata not found", listWidth - 10), this.left + 3 , var3 + 22, 0xCCCCCC); } } diff --git a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java index 97fb996ce6..dafffc52fb 100644 --- a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java +++ b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java @@ -53,7 +53,6 @@ public class FMLNetworkHandler if (target.startsWith("MC|")) { handler.handleVanilla250Packet(packet); - return; } if (target.equals("FML")) { diff --git a/common/cpw/mods/fml/common/network/NetworkRegistry.java b/common/cpw/mods/fml/common/network/NetworkRegistry.java index ed09c9e569..9a7c43ead8 100644 --- a/common/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/common/cpw/mods/fml/common/network/NetworkRegistry.java @@ -216,9 +216,10 @@ public class NetworkRegistry private void handlePacket(Packet250CustomPayload packet, NetworkManager network, Player player) { - if (activeChannels.containsEntry(player, packet.field_73630_a)) + String channel = packet.field_73630_a; + if (activeChannels.containsEntry(player, channel)) { - for (IPacketHandler handler : Iterables.concat(universalPacketHandlers.get(packet.field_73630_a), player instanceof EntityPlayerMP ? serverPacketHandlers.get(packet.field_73630_a) : clientPacketHandlers.get(packet.field_73630_a))) + for (IPacketHandler handler : Iterables.concat(universalPacketHandlers.get(channel), player instanceof EntityPlayerMP ? serverPacketHandlers.get(channel) : clientPacketHandlers.get(channel))) { handler.onPacketData(network, packet, player); } diff --git a/common/cpw/mods/fml/relauncher/FMLRelauncher.java b/common/cpw/mods/fml/relauncher/FMLRelauncher.java index b5669e677f..71b6bdb391 100644 --- a/common/cpw/mods/fml/relauncher/FMLRelauncher.java +++ b/common/cpw/mods/fml/relauncher/FMLRelauncher.java @@ -117,7 +117,7 @@ public class FMLRelauncher private Class setupNewClientHome(File minecraftHome) { Class client = ReflectionHelper.getClass(classLoader, "net.minecraft.client.Minecraft"); - ReflectionHelper.setPrivateValue(client, null, minecraftHome, "minecraftDir", "am", "minecraftDir"); + ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "am", "minecraftDir"); return client; }