diff --git a/build.gradle b/build.gradle index 30cdafd..62d2349 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.5" +version = "1.7.10-1.6" group= "wanion.lib" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "WanionLib" diff --git a/src/main/java/wanion/lib/Reference.java b/src/main/java/wanion/lib/Reference.java index c77f5db..9d3ede8 100644 --- a/src/main/java/wanion/lib/Reference.java +++ b/src/main/java/wanion/lib/Reference.java @@ -12,7 +12,7 @@ public final class Reference { public static final String MOD_ID = "wanionlib"; public static final String MOD_NAME = "WanionLib"; - public static final String MOD_VERSION = "1.7.10-1.5"; + public static final String MOD_VERSION = "1.7.10-1.6"; public static final String ACCEPTED_MINECRAFT = "[1.7.10]"; private Reference() {} diff --git a/src/main/java/wanion/lib/common/IRemovable.java b/src/main/java/wanion/lib/common/IRemovable.java new file mode 100644 index 0000000..8905c14 --- /dev/null +++ b/src/main/java/wanion/lib/common/IRemovable.java @@ -0,0 +1,15 @@ +package wanion.lib.common; + +/* + * Created by WanionCane(https://github.com/WanionCane). + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +public interface IRemovable +{ + boolean removed(); + void setRemoved(final boolean removed); +} \ No newline at end of file diff --git a/src/main/java/wanion/lib/recipe/RecipeHelper.java b/src/main/java/wanion/lib/recipe/RecipeHelper.java index 8b9cc30..ce8c5a2 100644 --- a/src/main/java/wanion/lib/recipe/RecipeHelper.java +++ b/src/main/java/wanion/lib/recipe/RecipeHelper.java @@ -73,7 +73,9 @@ public final class RecipeHelper continue; for (int x = 0; x < inputArray.length; x++) { final Object key = inputArray[x] instanceof ItemStack ? MetaItem.get((ItemStack) inputArray[x]) : inputArray[x]; - if (key instanceof Integer) + if (key == null) + continue; + else if (key instanceof Integer && !keyStackMap.containsKey(key)) keyStackMap.put((Integer) key, (ItemStack) inputArray[x]); if (thingToCharMap.containsKey(key)) almostTheShape[y][x] = thingToCharMap.get(key); diff --git a/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java b/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java index 486ead8..e1e3de8 100644 --- a/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java +++ b/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java @@ -56,22 +56,22 @@ public abstract class AbstractRecipeRegistry } } - public final ItemStack findMatchingRecipe(final InventoryCrafting matrix) + public final R findMatchingRecipe(@Nonnull final InventoryCrafting inventoryCrafting) { - final int root = (int) Math.sqrt(matrix.getSizeInventory()); - int offSetX = 0, offSetY = 0, width = 0, height = 0,recipeSize = 0; + final int root = (int) Math.sqrt(inventoryCrafting.getSizeInventory()); + int offSetX = 0, offSetY = 0, width = 0, height = 0, recipeSize = 0; long recipeKey = 0; boolean foundX = false, foundY = false; for (int x = 0; !foundX && x < root; x++) { for (int y = 0; !foundX && y < root; y++) - if (matrix.getStackInSlot(y * root + x) != null) + if (inventoryCrafting.getStackInSlot(y * root + x) != null) foundX = true; if (foundX) offSetX = x; } for (int y = 0; !foundY && y < root; y++) { for (int x = 0; x < root; x++) { - if (matrix.getStackInSlot(y * root + x) != null) + if (inventoryCrafting.getStackInSlot(y * root + x) != null) foundY = true; if (foundY) offSetY = y; @@ -84,7 +84,7 @@ public abstract class AbstractRecipeRegistry if (actualY < root) { final int actualX = offSetX + x++; if (actualX < root) { - if (matrix.getStackInSlot(actualY * root + actualX) == null) + if (inventoryCrafting.getStackInSlot(actualY * root + actualX) == null) continue; final int xDifference = actualX - (offSetX - 1); final int yDifference = actualY - (offSetY - 1); @@ -100,31 +100,26 @@ public abstract class AbstractRecipeRegistry final int actualY = offSetY + y; for (int x = 0; x < width; x++) { final int actualX = offSetX + x; - if (matrix.getStackInSlot(actualY * root + actualX) != null) { + if (inventoryCrafting.getStackInSlot(actualY * root + actualX) != null) { recipeKey |= 1L << (width * y + x); recipeSize++; } } } - ItemStack output = null; final List shapedRecipeList = shapedRecipes.get(recipeKey); if (shapedRecipeList != null) { for (R shapedRecipe : shapedRecipeList) { - output = shapedRecipe.recipeMatch(matrix, offSetX, offSetY); - if (output != null) - break; + if (shapedRecipe.recipeMatch(inventoryCrafting, offSetX, offSetY)) + return shapedRecipe; } } - if (output == null) { - final List shapelessRecipeList = shapelessRecipes.get(recipeSize); - if (shapelessRecipeList != null) { - for (R shapelessRecipe : shapelessRecipeList) { - output = shapelessRecipe.recipeMatch(matrix, offSetX, offSetY); - if (output != null) - break; - } + final List shapelessRecipeList = shapelessRecipes.get(recipeSize); + if (shapelessRecipeList != null) { + for (R shapelessRecipe : shapelessRecipeList) { + if (shapelessRecipe.recipeMatch(inventoryCrafting, offSetX, offSetY)) + return shapelessRecipe; } } - return output; + return null; } } \ No newline at end of file diff --git a/src/main/java/wanion/lib/recipe/advanced/IAdvancedRecipe.java b/src/main/java/wanion/lib/recipe/advanced/IAdvancedRecipe.java index f91a8d9..9a4706c 100644 --- a/src/main/java/wanion/lib/recipe/advanced/IAdvancedRecipe.java +++ b/src/main/java/wanion/lib/recipe/advanced/IAdvancedRecipe.java @@ -10,16 +10,17 @@ package wanion.lib.recipe.advanced; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; +import wanion.lib.common.IRemovable; import javax.annotation.Nonnull; -public interface IAdvancedRecipe +public interface IAdvancedRecipe extends IRemovable { long getRecipeKey(); int getRecipeSize(); - ItemStack recipeMatch(@Nonnull final InventoryCrafting inventoryCrafting, final int offSetX, final int offSetY); + boolean recipeMatch(@Nonnull final InventoryCrafting inventoryCrafting, final int offSetX, final int offSetY); @Nonnull ItemStack getOutput(); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 03f3f6a..61e77ed 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "wanionlib", "name": "WanionLib", "description": "Shared Code Library Used by (not)all WanionCane mods!", - "version": "1.5", + "version": "1.7.10-1.6", "mcversion": "${mcversion}", "url": "http://minecraft.curseforge.com/projects/wanionlib", "updateUrl": "",