Expose the world via IModuleGuiBuilder

McJtyMods · Nov 11, 2018 · fa6b845 · fa6b845
1 parent 71436d8
commit fa6b845
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/mcjty/rftools/api/screens/IModuleGuiBuilder.java b/src/main/java/mcjty/rftools/api/screens/IModuleGuiBuilder.java
@@ -1,6 +1,7 @@
 package mcjty.rftools.api.screens;
 
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
 
 /**
  * A builder to help create gui's for your screen modules. The 'tagname' parameter is what will
@@ -24,6 +25,8 @@ public interface IModuleGuiBuilder {
 
     NBTTagCompound getCurrentData();
 
+    World getWorld();
+
     IModuleGuiBuilder label(String text);
 
     IModuleGuiBuilder leftLabel(String text);

diff --git a/...java/mcjty/rftools/blocks/screens/modulesclient/MachineInformationClientScreenModule.java b/...java/mcjty/rftools/blocks/screens/modulesclient/MachineInformationClientScreenModule.java
@@ -5,7 +5,6 @@
 import mcjty.rftools.api.screens.*;
 import mcjty.rftools.api.screens.data.IModuleDataString;
 import mcjty.rftools.blocks.screens.modulesclient.helper.ScreenTextHelper;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.nbt.NBTTagCompound;
@@ -61,8 +60,7 @@ public void mouseClick(World world, int x, int y, boolean clicked) {
 
     @Override
     public void createGui(IModuleGuiBuilder guiBuilder) {
-        // @todo Hacky, solve this better
-        World world = Minecraft.getMinecraft().player.getEntityWorld();
+        World world = guiBuilder.getWorld();
         NBTTagCompound currentData = guiBuilder.getCurrentData();
         IModuleGuiBuilder.Choice[] choices = EMPTY_CHOICES;
         if((currentData.hasKey("monitordim") ? currentData.getInteger("monitordim") : currentData.getInteger("dim")) == world.provider.getDimension()) {

diff --git a/src/main/java/mcjty/rftools/blocks/screens/modulesclient/helper/ScreenModuleGuiBuilder.java b/src/main/java/mcjty/rftools/blocks/screens/modulesclient/helper/ScreenModuleGuiBuilder.java
@@ -43,6 +43,11 @@ public NBTTagCompound getCurrentData() {
         return currentData;
     }
 
+    @Override
+    public World getWorld() {
+        return mc.player.getEntityWorld();
+    }
+
     public IModuleGuiChanged getModuleGuiChanged() {
         return moduleGuiChanged;
     }
@@ -231,7 +236,7 @@ public ScreenModuleGuiBuilder block(String tagnamePos) {
                 // For compatibility reasons.
                 dim = currentData.getInteger("dim");
             }
-            World world = mc.player.getEntityWorld();
+            World world = getWorld();
             if (dim == world.provider.getDimension()) {
                 int x = currentData.getInteger(tagnamePos+"x");
                 int y = currentData.getInteger(tagnamePos+"y");