From 2cb19594212a80f3a4b6bf018ca83bb1b3401733 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 7 Dec 2014 16:15:40 -0800 Subject: [PATCH] Add blacklist to worktable memory, blacklist non-empty maps --- .../factory/gadgets/TileWorktable.java | 6 ++++ .../factory/recipes/RecipeMemory.java | 29 +++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index d390ec65e..213f917a1 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -98,6 +98,12 @@ public class TileWorktable extends TileBase implements ICrafter { Proxies.net.sendToPlayer(new PacketTileNBT(PacketIds.TILE_NBT, this), player); } + @Override + public void validate() { + super.validate(); + memorized.validate(worldObj); + } + /* RECIPE SELECTION */ public RecipeMemory getMemory() { return memorized; diff --git a/src/main/java/forestry/factory/recipes/RecipeMemory.java b/src/main/java/forestry/factory/recipes/RecipeMemory.java index b027b3769..1afccfd46 100644 --- a/src/main/java/forestry/factory/recipes/RecipeMemory.java +++ b/src/main/java/forestry/factory/recipes/RecipeMemory.java @@ -17,18 +17,20 @@ import forestry.core.utils.PlainInventory; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemMap; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; +import java.util.ArrayList; import java.util.LinkedList; +import java.util.List; public class RecipeMemory implements INBTTagable { - private final static Container DUMMY_CONTAINER = new ContainerDummy(); - public static final class Recipe implements INBTTagable { private InventoryAdapter matrix; @@ -117,16 +119,39 @@ public class RecipeMemory implements INBTTagable { } } + private static final Container DUMMY_CONTAINER = new ContainerDummy(); + private static final List> memoryBlacklist = new ArrayList>(); + static { + memoryBlacklist.add(ItemMap.class); // almost every ItemMap is unique + } + private LinkedList recipes = new LinkedList(); private long lastUpdate; public final int capacity = 9; + private static boolean isValid(World world, Recipe recipe) { + Item item = recipe.getRecipeOutput(world).getItem(); + return item != null && !memoryBlacklist.contains(item.getClass()); + } + + public void validate(World world) { + LinkedList validRecipes = new LinkedList(); + for (Recipe recipe : recipes) { + if (isValid(world, recipe)) + validRecipes.add(recipe); + } + this.recipes = validRecipes; + } + public long getLastUpdate() { return lastUpdate; } public void memorizeRecipe(World world, Recipe recipe, InventoryCrafting crafting) { + if (!isValid(world, recipe)) + return; + lastUpdate = world.getTotalWorldTime(); recipe.updateLastUse(lastUpdate);