Merge pull request #5 from mellamokb/master

Fix UNDO message; fix recipe file growth
DoubleDoorDevelopment · Sep 11, 2015 · 0526d2b · 0526d2b
2 parents b167e9d + c3d66f8
commit 0526d2b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/net/doubledoordev/craycrafting/recipes/BaseType.java b/src/main/java/net/doubledoordev/craycrafting/recipes/BaseType.java
@@ -159,7 +159,7 @@ public void undo()
     {
         if (applied)
         {
-            CrayCrafting.instance.logger.info("UNDO " + getTypeName() + "\t Removed " + removedList.size() + "\t & added " + addedList.size() + "\t recipes from " + FMLCommonHandler.instance().getEffectiveSide());
+            CrayCrafting.instance.logger.info("UNDO " + getTypeName() + "\t Removed " + addedList.size() + "\t & added " + removedList.size() + "\t recipes from " + FMLCommonHandler.instance().getEffectiveSide());
             applied = false;
             CraftingManager.getInstance().getRecipeList().removeAll(addedList);
             CraftingManager.getInstance().getRecipeList().addAll(removedList);
@@ -176,6 +176,16 @@ public NBTTagList getNBTList()
     {
         return nbtList;
     }
+
+	/**
+	 * Used to clear existing randomized recipes in nbt file data, before adding the new ones.
+     * <p/>
+	 * Used on server only.
+	 */
+	public void resetNBTList()
+	{
+		nbtList = new NBTTagList();
+	}
 
     /**
      * Used on server only.

diff --git a/src/main/java/net/doubledoordev/craycrafting/recipes/RecipeRegistry.java b/src/main/java/net/doubledoordev/craycrafting/recipes/RecipeRegistry.java
@@ -147,6 +147,11 @@ public static void randomizeRecipes(File recipeFile)
         ArrayList<ItemStack> outputs = new ArrayList<ItemStack>(CraftingManager.getInstance().getRecipeList().size());
         ArrayList<IRecipe> acceptedRecipes = new ArrayList<IRecipe>();
 
+		for (BaseType<IRecipe> baseType : typeList)
+		{
+			baseType.resetNBTList();
+		}
+
         for (IRecipe recipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList())
         {
             for (BaseType<IRecipe> baseType : typeList)