From e6a48383576d57e6c5b07dacc7d6d1b08b753a8b Mon Sep 17 00:00:00 2001
From: Irtimaled <irtimaled@gmail.com>
Date: Tue, 5 May 2020 00:38:42 -0700
Subject: [PATCH] Move displaying screens to ClientInterop

---
 .../java/com/irtimaled/bbor/client/gui/ListScreen.java |  3 ++-
 .../com/irtimaled/bbor/client/gui/LoadSavesScreen.java |  4 ++--
 .../com/irtimaled/bbor/client/gui/SettingsScreen.java  |  4 ++--
 .../bbor/client/gui/SettingsScreenButton.java          |  4 ++--
 .../irtimaled/bbor/client/interop/ClientInterop.java   | 10 +++++++---
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java b/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java
index 9e8da44..2339ac8 100644
--- a/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java
@@ -1,5 +1,6 @@
 package com.irtimaled.bbor.client.gui;
 
+import com.irtimaled.bbor.client.interop.ClientInterop;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 
@@ -20,7 +21,7 @@ public abstract class ListScreen extends GuiScreen {
     }
 
     protected void onDoneClicked() {
-        mc.displayGuiScreen(lastScreen);
+        ClientInterop.displayScreen(lastScreen);
     }
 
     @Override
diff --git a/src/main/java/com/irtimaled/bbor/client/gui/LoadSavesScreen.java b/src/main/java/com/irtimaled/bbor/client/gui/LoadSavesScreen.java
index 9d941e1..07d9e0e 100644
--- a/src/main/java/com/irtimaled/bbor/client/gui/LoadSavesScreen.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/LoadSavesScreen.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.gui;
 
+import com.irtimaled.bbor.client.interop.ClientInterop;
 import net.minecraft.client.AnvilConverterException;
-import net.minecraft.client.Minecraft;
 import net.minecraft.world.storage.ISaveFormat;
 import net.minecraft.world.storage.WorldSummary;
 
@@ -9,7 +9,7 @@ import java.util.List;
 
 public class LoadSavesScreen extends ListScreen {
     public static void show() {
-        Minecraft.getInstance().displayGuiScreen(new LoadSavesScreen());
+        ClientInterop.displayScreen(new LoadSavesScreen());
     }
 
     @Override
diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
index 88fecf4..4f0c74d 100644
--- a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
@@ -1,9 +1,9 @@
 package com.irtimaled.bbor.client.gui;
 
 import com.irtimaled.bbor.client.ClientRenderer;
+import com.irtimaled.bbor.client.interop.ClientInterop;
 import com.irtimaled.bbor.common.BoundingBoxType;
 import com.irtimaled.bbor.config.ConfigManager;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 
@@ -13,7 +13,7 @@ public class SettingsScreen extends ListScreen {
     private static final String netherFossilVersionPattern = "(?:1\\.1[6-9]|1\\.[2-9][0-9]|20w(?:1[1-9]|[2-5][0-9])|2[1-9]w).*";
 
     public static void show() {
-        Minecraft.getInstance().displayGuiScreen(new SettingsScreen(null));
+        ClientInterop.displayScreen(new SettingsScreen(null));
     }
 
     SettingsScreen(GuiScreen lastScreen) {
diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreenButton.java b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreenButton.java
index c0894df..32a977d 100644
--- a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreenButton.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreenButton.java
@@ -1,6 +1,6 @@
 package com.irtimaled.bbor.client.gui;
 
-import net.minecraft.client.Minecraft;
+import com.irtimaled.bbor.client.interop.ClientInterop;
 import net.minecraft.client.gui.GuiScreen;
 
 public class SettingsScreenButton extends AbstractButton {
@@ -13,6 +13,6 @@ public class SettingsScreenButton extends AbstractButton {
 
     @Override
     public void onPressed() {
-        Minecraft.getInstance().displayGuiScreen(screen);
+        ClientInterop.displayScreen(screen);
     }
 }
diff --git a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
index e1d0fdf..d2bb473 100644
--- a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
@@ -13,6 +13,7 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.ISuggestionProvider;
@@ -101,9 +102,8 @@ public class ClientInterop {
     }
 
     public static void saveLoaded(String fileName, long seed) {
-        Minecraft minecraft = Minecraft.getInstance();
-        minecraft.displayGuiScreen(null);
-        minecraft.mouseHelper.grabMouse();
+        displayScreen(null);
+        Minecraft.getInstance().mouseHelper.grabMouse();
 
         clearStructures();
 
@@ -115,4 +115,8 @@ public class ClientInterop {
         EventBus.publish(new SaveLoaded());
         SaveGameStructureLoader.clear();
     }
+
+    public static void displayScreen(GuiScreen screen) {
+        Minecraft.getInstance().displayGuiScreen(screen);
+    }
 }
-- 
2.44.0