From 8ec13988de348719229a33be8c9267ecfe3227f7 Mon Sep 17 00:00:00 2001 From: WanionCane Date: Sat, 15 Apr 2017 10:24:07 -0300 Subject: [PATCH] 1.7.10-1.7 --- build.gradle | 2 +- src/main/java/wanion/lib/Reference.java | 2 +- .../advanced/AbstractRecipeRegistry.java | 73 +++++-------------- .../lib/recipe/advanced/IAdvancedRecipe.java | 4 +- src/main/resources/mcmod.info | 2 +- 5 files changed, 24 insertions(+), 59 deletions(-) diff --git a/build.gradle b/build.gradle index 62d2349..01903d6 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.6" +version = "1.7.10-1.7" 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 9d3ede8..03664c0 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.6"; + public static final String MOD_VERSION = "1.7.10-1.7"; public static final String ACCEPTED_MINECRAFT = "[1.7.10]"; private Reference() {} diff --git a/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java b/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java index e1e3de8..93009c0 100644 --- a/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java +++ b/src/main/java/wanion/lib/recipe/advanced/AbstractRecipeRegistry.java @@ -8,12 +8,9 @@ package wanion.lib.recipe.advanced; * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import gnu.trove.map.TIntObjectMap; -import gnu.trove.map.TLongObjectMap; -import gnu.trove.map.hash.TIntObjectHashMap; -import gnu.trove.map.hash.TLongObjectHashMap; +import gnu.trove.map.TShortObjectMap; +import gnu.trove.map.hash.TShortObjectHashMap; import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -22,45 +19,30 @@ import java.util.List; public abstract class AbstractRecipeRegistry { - public final TLongObjectMap> shapedRecipes = new TLongObjectHashMap<>(); - public final TIntObjectMap> shapelessRecipes = new TIntObjectHashMap<>(); + public final TShortObjectMap> recipeMap = new TShortObjectHashMap<>(); public final void addRecipe(@Nonnull final R recipe) { - final long recipeKey = recipe.getRecipeKey(); - if (recipeKey != 0) { - if (!shapedRecipes.containsKey(recipeKey)) - shapedRecipes.put(recipeKey, new ArrayList<>()); - shapedRecipes.get(recipeKey).add(recipe); - } else { - final int recipeSize = recipe.getRecipeSize(); - if (!shapelessRecipes.containsKey(recipeSize)) - shapelessRecipes.put(recipeSize, new ArrayList<>()); - shapelessRecipes.get(recipeSize).add(recipe); - } + final short recipeKey = recipe.getRecipeKey(); + if (!recipeMap.containsKey(recipeKey)) + recipeMap.put(recipeKey, new ArrayList<>()); + recipeMap.get(recipeKey).add(recipe); } public final void removeRecipe(@Nullable final R recipe) { if (recipe == null) return; - final long recipeKey = recipe.getRecipeKey(); - if (recipeKey != 0) { - final List shapedRecipeList = shapedRecipes.get(recipeKey); - if (shapedRecipeList != null) - shapedRecipeList.remove(recipe); - } else { - final List shapelessRecipeList = shapelessRecipes.get(recipe.getRecipeSize()); - if (shapelessRecipeList != null) - shapelessRecipeList.remove(recipe); - } + final List recipeList = recipeMap.get(recipe.getRecipeKey()); + if (recipeList != null) + recipeList.remove(recipe); } public final R findMatchingRecipe(@Nonnull final InventoryCrafting inventoryCrafting) { final int root = (int) Math.sqrt(inventoryCrafting.getSizeInventory()); - int offSetX = 0, offSetY = 0, width = 0, height = 0, recipeSize = 0; - long recipeKey = 0; + int offSetX = 0, offSetY = 0, width = 0, height = 0; + short recipeKey = 0, recipeSize = 0; boolean foundX = false, foundY = false; for (int x = 0; !foundX && x < root; x++) { for (int y = 0; !foundX && y < root; y++) @@ -96,30 +78,15 @@ public abstract class AbstractRecipeRegistry } else break; } } - for (int y = 0; y < height; y++) { - final int actualY = offSetY + y; - for (int x = 0; x < width; x++) { - final int actualX = offSetX + x; - if (inventoryCrafting.getStackInSlot(actualY * root + actualX) != null) { - recipeKey |= 1L << (width * y + x); + for (int y = 0; y < height; y++) + for (int x = 0; x < width; x++) + if (inventoryCrafting.getStackInSlot((offSetY + y) * root + (offSetX + x)) != null) recipeSize++; - } - } - } - final List shapedRecipeList = shapedRecipes.get(recipeKey); - if (shapedRecipeList != null) { - for (R shapedRecipe : shapedRecipeList) { - if (shapedRecipe.recipeMatch(inventoryCrafting, offSetX, offSetY)) - return shapedRecipe; - } - } - final List shapelessRecipeList = shapelessRecipes.get(recipeSize); - if (shapelessRecipeList != null) { - for (R shapelessRecipe : shapelessRecipeList) { - if (shapelessRecipe.recipeMatch(inventoryCrafting, offSetX, offSetY)) - return shapelessRecipe; - } - } + final List recipeList = recipeMap.containsKey((recipeKey |= (width << 8) + (height << 12))) ? recipeMap.get(recipeKey) : recipeMap.get(recipeSize); + if (recipeList != null) + for (R recipe : recipeList) + if (recipe.recipeMatch(inventoryCrafting, offSetX, offSetY)) + return recipe; 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 9a4706c..f41b71f 100644 --- a/src/main/java/wanion/lib/recipe/advanced/IAdvancedRecipe.java +++ b/src/main/java/wanion/lib/recipe/advanced/IAdvancedRecipe.java @@ -16,9 +16,7 @@ import javax.annotation.Nonnull; public interface IAdvancedRecipe extends IRemovable { - long getRecipeKey(); - - int getRecipeSize(); + short getRecipeKey(); boolean recipeMatch(@Nonnull final InventoryCrafting inventoryCrafting, final int offSetX, final int offSetY); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 61e77ed..2f335c9 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.7.10-1.6", + "version": "1.7.10-1.7", "mcversion": "${mcversion}", "url": "http://minecraft.curseforge.com/projects/wanionlib", "updateUrl": "",