Merge pull request #2 from DeForce/develop

Release 1.0.10
DeForce · Jun 24, 2018 · 033e006 · 033e006
2 parents 7be29e4 + 8f56210
commit 033e006
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ repositories {
 
 apply plugin: 'forge'
 
-version = "1.0.9"
+version = "1.0.10"
 group = "com.uabart.todolist"
 archivesBaseName = "todolist"
 

diff --git a/src/main/java/com/uabart/todolist/ToDoListMod.java b/src/main/java/com/uabart/todolist/ToDoListMod.java
@@ -9,13 +9,15 @@
 import com.uabart.todolist.handler.OverlayDrawHandler;
 import com.uabart.todolist.manager.Manager;
 
+import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.server.MinecraftServer;
+
+import net.minecraft.client.Minecraft;
 import net.minecraftforge.common.MinecraftForge;
 
 import java.io.File;
@@ -34,7 +36,7 @@
 @Mod(modid = ToDoListMod.MODID, version = ToDoListMod.VERSION)
 public class ToDoListMod {
     public static final String MODID = "todolist";
-    public static final String VERSION = "1.0.9";
+    public static final String VERSION = "1.0.10";
 
     @Mod.Instance("todolist")
     public static ToDoListMod instance;
@@ -70,9 +72,15 @@ public void preInit(FMLPreInitializationEvent event) {
     public void onClientConnect(FMLNetworkEvent.ClientConnectedToServerEvent event)
     {
         logger.info("Server is starting, loading base settings");
-        String serverName = MinecraftServer.getServer().getWorldName()+".json";
 
-        logger.info(String.format("Server name is %s", serverName));
+        String serverName;
+        if(event.isLocal) {
+            serverName = Minecraft.getMinecraft().getIntegratedServer().getWorldName() + ".xml";
+        } else {
+            serverName = FMLClientHandler.instance().getClient().func_147104_D().serverName + ".xml";
+        }
+
+        logger.info(String.format("Server filename is %s", serverName));
         currentServerConfig = new File(configDir, serverName);
 
         DrawHandler.init = true;
@@ -86,6 +94,9 @@ public void onClientConnect(FMLNetworkEvent.ClientConnectedToServerEvent event)
             } catch (Exception e) {
                 e.printStackTrace();
             }
+        } else {
+            TaskHolder empty = new TaskHolder();
+            Manager.getHolder().setCategories(empty.getCategories());
         }
         API.registerNEIGuiHandler(new NEIToDoGuiHandler());
     }

diff --git a/src/main/java/com/uabart/todolist/handler/InputHandler.java b/src/main/java/com/uabart/todolist/handler/InputHandler.java
@@ -7,15 +7,12 @@
 import codechicken.nei.Widget;
 import codechicken.nei.guihook.IContainerInputHandler;
 
+import static com.uabart.todolist.entity.Options.DEFAULT_KEY;
+
 public class InputHandler implements IContainerInputHandler {
 
     @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-        for (Widget widget : Manager.getLayout().getToDraw()) {
-            if (widget.handleKeyPress(keyCode, keyChar))
-                return true;
-        }
-
+    public boolean keyTyped(GuiContainer gui, char keyChar, int keyID) {
         return false;
     }
 
@@ -26,6 +23,12 @@ public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
 
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
+        if (keyID == DEFAULT_KEY) {
+            Manager.getLayout().toggleMenuHidden();
+        }
+        for (Widget widget : Manager.getLayout().getToDraw()) {
+            if (widget.handleKeyPress(keyID, keyChar)) return true;
+        }
         return false;
     }
 

diff --git a/src/main/java/com/uabart/todolist/handler/KeyStateTracker.java b/src/main/java/com/uabart/todolist/handler/KeyStateTracker.java
@@ -5,15 +5,18 @@
 import codechicken.nei.KeyManager;
 import codechicken.nei.KeyManager.IKeyStateTracker;
 import codechicken.nei.api.API;
+import net.minecraft.client.Minecraft;
 
 import static com.uabart.todolist.entity.Options.DEFAULT_KEY;
 import static com.uabart.todolist.entity.Options.KEY_IDENTIFIER;
 
 public class KeyStateTracker implements IKeyStateTracker {
     @Override
     public void tickKeyStates() {
-        if (KeyManager.keyStates.get(KEY_IDENTIFIER).down) {
-            Manager.getLayout().toggleMenuHidden();
+        if (Minecraft.getMinecraft().currentScreen == null) {
+            if (KeyManager.keyStates.get(KEY_IDENTIFIER).down) {
+                Manager.getLayout().toggleMenuHidden();
+            }
         }
     }