From 658f175f7e05fa66efcd3a2b5b4ca0073eea5c58 Mon Sep 17 00:00:00 2001
From: Steven Liu <towdium@gmail.com>
Date: Tue, 22 Mar 2016 19:32:25 +0800
Subject: [PATCH] fix multiPlayer crash

---
 build.gradle                                  |  2 +-
 .../JustEnoughCalculation.java                |  5 ++--
 .../event/PlayerEventHandler.java             | 29 ++++---------------
 .../gui/guis/calculator/GuiCalculator.java    | 25 ++++++++++++++++
 .../item/ItemCalculator.java                  |  2 +-
 src/main/resources/mcmod.info                 |  1 -
 6 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9b1f161..275e63b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-0.1.0"
+version = "1.7.10-0.1.1"
 group= "pers.towdium.justEnoughCalculation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "je_calculation"
 
diff --git a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java
index 2197b7d..739b1a9 100644
--- a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java
+++ b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java
@@ -34,7 +34,8 @@ import java.io.File;
  * @author Towdium
  */
 
-@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION)
+@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION,
+        dependencies = "after:NotEnoughItems")
 public class JustEnoughCalculation{
     public static Item itemCalculator = new ItemCalculator().setUnlocalizedName("itemCalculator").setTextureName(Reference.MODID + ":" + "itemCalculator");
     public static SimpleNetworkWrapper networkWrapper;
@@ -49,7 +50,7 @@ public class JustEnoughCalculation{
     public static class Reference {
         public static final String MODID = "je_calculation";
         public static final String MODNAME = "Just Enough Calculation";
-        public static final String VERSION = "0.1.0";
+        public static final String VERSION = "0.1.1";
     }
 
     @Mod.EventHandler
diff --git a/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java
index 103f74b..0222922 100644
--- a/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java
+++ b/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java
@@ -3,8 +3,13 @@ package pers.towdium.justEnoughCalculation.event;
 import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.ICraftingHandler;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent;
 import pers.towdium.justEnoughCalculation.JustEnoughCalculation;
 import net.minecraftforge.event.entity.player.PlayerEvent.*;
 import pers.towdium.justEnoughCalculation.gui.guis.calculator.ContainerCalculator;
@@ -24,30 +29,6 @@ public class PlayerEventHandler {
     @SubscribeEvent
     public void onSave(SaveToFile event){
         JustEnoughCalculation.proxy.getPlayerHandler().handleSave(event);
-        if(!JustEnoughCalculation.JECConfig.initialized){
-            ArrayList<String> idents = new ArrayList<>();
-            LOOP:
-            for(ICraftingHandler handler : GuiCraftingRecipe.craftinghandlers){
-                if(handler instanceof TemplateRecipeHandler){
-                    if(((TemplateRecipeHandler) handler).getOverlayIdentifier() == null){
-                        continue;
-                    }
-                    for (String id : idents){
-                        if(((TemplateRecipeHandler) handler).getOverlayIdentifier().equals(id) ){
-                            continue LOOP;
-                        }
-                    }
-                    idents.add(((TemplateRecipeHandler) handler).getOverlayIdentifier());
-                }
-            }
-            String[] strings = new String[idents.size()];
-            for(int i=0; i<idents.size(); i++){
-                strings[i] = idents.get(i);
-            }
-            JustEnoughCalculation.JECConfig.EnumItems.ListRecipeCategory.getProperty().set(strings);
-            JustEnoughCalculation.JECConfig.save();
-            JustEnoughCalculation.JECConfig.initialized = true;
-        }
     }
 
     @SubscribeEvent
diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java
index 74ef56e..b91ac8e 100644
--- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java
+++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java
@@ -3,6 +3,7 @@ package pers.towdium.justEnoughCalculation.gui.guis.calculator;
 import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.ICraftingHandler;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -74,6 +75,30 @@ public class GuiCalculator extends GuiTooltipScreen{
         dest.inventory.setInventorySlotContents(dest.getSlotIndex(), ItemStackWrapper.NBT.getItem(itemStack, "dest"));
         textFieldAmount.setText(ItemStackWrapper.NBT.getString(itemStack, "text"));
         updateLayout();
+        if(!JustEnoughCalculation.JECConfig.initialized){
+            ArrayList<String> idents = new ArrayList<>();
+            LOOP:
+            for(ICraftingHandler handler : GuiCraftingRecipe.craftinghandlers){
+                if(handler instanceof TemplateRecipeHandler){
+                    if(((TemplateRecipeHandler) handler).getOverlayIdentifier() == null){
+                        continue;
+                    }
+                    for (String id : idents){
+                        if(((TemplateRecipeHandler) handler).getOverlayIdentifier().equals(id) ){
+                            continue LOOP;
+                        }
+                    }
+                    idents.add(((TemplateRecipeHandler) handler).getOverlayIdentifier());
+                }
+            }
+            String[] strings = new String[idents.size()];
+            for(int i=0; i<idents.size(); i++){
+                strings[i] = idents.get(i);
+            }
+            JustEnoughCalculation.JECConfig.EnumItems.ListRecipeCategory.getProperty().set(strings);
+            JustEnoughCalculation.JECConfig.save();
+            JustEnoughCalculation.JECConfig.initialized = true;
+        }
     }
 
     @Override
diff --git a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java
index aa320dd..2ccd4ea 100644
--- a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java
+++ b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java
@@ -21,7 +21,7 @@ public class ItemCalculator extends Item {
     public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) {
         playerIn.openGui(JustEnoughCalculation.instance, GuiHandler.GuiId.CALCULATOR, worldIn, 0, 0, 0);
         ItemStack stack = playerIn.inventory.getStackInSlot(0);
-        JustEnoughCalculation.log.info(stack==null ? "" : stack.getItem().getUnlocalizedName() + "-" + stack.getItemDamage());
+        //JustEnoughCalculation.log.info(stack==null ? "" : stack.getItem().getUnlocalizedName() + "-" + stack.getItemDamage());
         return itemStackIn;
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 52b1bcf..a3e6776 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -5,7 +5,6 @@
   "description": "A simple mod to help you with recipe calculation.",
   "version": "0.1.0",
   "mcversion": "1.8.9",
-  "updateUrl": "",
   "authorList": ["Towdium"],
   "credits": "The MCP, Forge and FML guys; sesess, Pahimar, MrCrayfish and BedrockMiner"
 }