From 2dcb2187c0a3c6a4a2d860b6abb04d61acb427ad Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 6 Mar 2016 23:42:30 -0500 Subject: [PATCH] Some client handler cleanup --- .../gui/GuiListWorldSelectionEntry.java.patch | 11 ++++++++++ .../client/gui/GuiSelectWorld.java.patch.rej | 10 ---------- .../fml/client/FMLClientHandler.java | 20 ++++++++++--------- .../fml/client/GuiOldSaveLoadConfirm.java | 3 +-- 4 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 patches.mcp/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java.patch delete mode 100644 rejects/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch.rej diff --git a/patches.mcp/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java.patch b/patches.mcp/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java.patch new file mode 100644 index 0000000000..3731eb6579 --- /dev/null +++ b/patches.mcp/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java.patch @@ -0,0 +1,11 @@ +--- ../src-base/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java ++++ ../src-work/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java +@@ -242,7 +242,7 @@ + + if (this.field_186784_e.getSaveLoader().canLoadWorld(this.field_186786_g.getFileName())) + { +- this.field_186784_e.launchIntegratedServer(this.field_186786_g.getFileName(), this.field_186786_g.getDisplayName(), (WorldSettings)null); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(field_186785_f, this.field_186786_g); + } + } + diff --git a/rejects/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch.rej b/rejects/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch.rej deleted file mode 100644 index d588a78c5e..0000000000 --- a/rejects/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch.rej +++ /dev/null @@ -1,10 +0,0 @@ -++++ REJECTED PATCH 1 - - if (this.mc.getSaveLoader().canLoadWorld(s)) - { -- this.mc.launchIntegratedServer(s, s1, (WorldSettings)null); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1); - } - } - } -++++ END PATCH diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index 3f24d4e62c..a782e3042a 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -30,16 +30,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiIngameMenu; +import net.minecraft.client.gui.GuiListWorldSelectionEntry; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiSelectWorld; +import net.minecraft.client.gui.GuiWorldSelection; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.ServerListEntryNormal; import net.minecraft.client.multiplayer.GuiConnecting; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; -import net.minecraft.client.network.OldServerPinger; +import net.minecraft.client.network.ServerPinger; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.AbstractResourcePack; import net.minecraft.client.resources.FallbackResourceManager; @@ -67,6 +68,7 @@ import net.minecraft.util.IThreadListener; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; import net.minecraft.world.WorldSettings; +import net.minecraft.world.storage.SaveFormatComparator; import net.minecraft.world.storage.SaveFormatOld; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.fml.client.registry.RenderingRegistry; @@ -123,7 +125,7 @@ import com.google.gson.JsonObject; /** * Handles primary communication from hooked code into the system * - * The FML entry point is {@link #beginMinecraftLoading(Minecraft, List)} called from + * The FML entry point is {@link #beginMinecraftLoading(Minecraft, List, IReloadableResourceManager)} called from * {@link Minecraft} * * Obfuscated code should focus on this class and other members of the "server" @@ -666,9 +668,9 @@ public class FMLClientHandler implements IFMLSidedHandler { return new File(client.mcDataDir, "saves"); } - public void tryLoadExistingWorld(GuiSelectWorld selectWorldGUI, String dirName, String saveName) + public void tryLoadExistingWorld(GuiWorldSelection selectWorldGUI, SaveFormatComparator comparator) { - File dir = new File(getSavesDir(), dirName); + File dir = new File(getSavesDir(), comparator.getFileName()); NBTTagCompound leveldat; try { @@ -682,20 +684,20 @@ public class FMLClientHandler implements IFMLSidedHandler } catch (Exception e1) { - FMLLog.warning("There appears to be a problem loading the save %s, both level files are unreadable.", dirName); + FMLLog.warning("There appears to be a problem loading the save %s, both level files are unreadable.", comparator.getFileName()); return; } } NBTTagCompound fmlData = leveldat.getCompoundTag("FML"); if (fmlData.hasKey("ModItemData")) { - showGuiScreen(new GuiOldSaveLoadConfirm(dirName, saveName, selectWorldGUI)); + showGuiScreen(new GuiOldSaveLoadConfirm(comparator.getFileName(), comparator.getDisplayName(), selectWorldGUI)); } else { try { - client.launchIntegratedServer(dirName, saveName, (WorldSettings)null); + client.launchIntegratedServer(comparator.getFileName(), comparator.getDisplayName(), (WorldSettings)null); } catch (StartupQuery.AbortedException e) { @@ -820,7 +822,7 @@ public class FMLClientHandler implements IFMLSidedHandler public void connectToServerAtStartup(String host, int port) { setupServerList(); - OldServerPinger osp = new OldServerPinger(); + ServerPinger osp = new ServerPinger(); ServerData serverData = new ServerData("Command Line", host+":"+port,false); try { diff --git a/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java b/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java index ccc4269dd4..9244883935 100644 --- a/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java +++ b/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java @@ -6,7 +6,7 @@ import java.io.IOException; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiLabel; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiSelectWorld; +import net.minecraft.client.gui.GuiWorldSelection; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.world.WorldSettings; @@ -57,7 +57,6 @@ public class GuiOldSaveLoadConfirm extends GuiYesNo implements GuiYesNoCallback { if (button.id == 1) { - ObfuscationReflectionHelper.setPrivateValue(GuiSelectWorld.class, (GuiSelectWorld)parentScreen, false, "field_"+"146634_i"); FMLClientHandler.instance().showGuiScreen(parent); } else