Move displaying screens to ClientInterop

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 9e8da44eaf63f0b6538242722e6a1574ce121644..2339ac86ba846f51d6334415c0afd0b6e8409bf6 100644 (file)
--- 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 9d941e1c3e2b34016c60049788055c4cc266cb37..07d9e0e2162e6444504fda6e623de7e6c9d35590 100644 (file)
--- 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 88fecf46891ef70688f1145afcf5d7d8a31adfd2..4f0c74de0ecd1c912a4815a0b93b6aaefebfe171 100644 (file)
--- 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 c0894df6fbe564d43607cfe9335a2a87e9014f50..32a977d78b7960f61f5a6009ad9a3e98ed9e18fb 100644 (file)
--- 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 e1d0fdf50009ab82b2bcc143393822412fa93984..d2bb47373c842f9256a77f1fa8791102df20cd06 100644 (file)
--- 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);
+    }
 }