From 3d932700cdfb083305302fdf460c1fdeb8546524 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 3 Jan 2017 02:32:45 +0100 Subject: [PATCH] Fix carpenter and thermionic fabricator recipes --- .../api/recipes/IDescriptiveRecipe.java | 2 + .../api/recipes/IFabricatorRecipe.java | 2 + .../arboriculture/PluginArboriculture.java | 2 +- .../arboriculture/blocks/BlockWoodPile.java | 4 +- .../forestry/core/recipes/RecipeUtil.java | 3 + .../core/recipes/ShapedRecipeCustom.java | 14 ++++ .../forestry/core/utils/InventoryUtil.java | 60 ++++++++++++++++ .../forestry/core/utils/ItemStackUtil.java | 72 +++++++++++++++++++ .../factory/recipes/FabricatorRecipe.java | 10 ++- .../recipes/FabricatorRecipeManager.java | 2 +- .../forestry/factory/tiles/TileCarpenter.java | 2 +- .../factory/tiles/TileFabricator.java | 4 +- 12 files changed, 169 insertions(+), 8 deletions(-) diff --git a/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java b/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java index 54a9922a6..36dd2fdcb 100644 --- a/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java +++ b/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java @@ -30,6 +30,8 @@ public interface IDescriptiveRecipe { * Each inner list represents one slot's accepted ItemStacks */ NonNullList> getIngredients(); + + NonNullList getOreDicts(); ItemStack getRecipeOutput(); } diff --git a/src/main/java/forestry/api/recipes/IFabricatorRecipe.java b/src/main/java/forestry/api/recipes/IFabricatorRecipe.java index 9389d51bc..510a711c9 100644 --- a/src/main/java/forestry/api/recipes/IFabricatorRecipe.java +++ b/src/main/java/forestry/api/recipes/IFabricatorRecipe.java @@ -21,6 +21,8 @@ public interface IFabricatorRecipe extends IForestryRecipe { * Each inner list represents one slot's accepted ItemStacks */ NonNullList> getIngredients(); + + NonNullList getOreDicts(); /** * @return the width of ingredients in the crafting grid to create this recipe. diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 0280b1695..0c20c4b93 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -455,7 +455,7 @@ public class PluginArboriculture extends BlankForestryPlugin { RecipeUtil.addShapelessRecipe(new ItemStack(blocks.woodPile), OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD); //Dirt Pile Block - RecipeUtil.addShapelessRecipe(new ItemStack(blocks.loam), Items.CLAY_BALL, coreItems.fertilizerBio, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.fertilizerBio, Items.CLAY_BALL); + RecipeUtil.addShapelessRecipe(new ItemStack(blocks.loam, 4), Items.CLAY_BALL, coreItems.fertilizerBio, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.fertilizerBio, Items.CLAY_BALL); } private static void registerAlleles() { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java b/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java index 059300b7f..15c68bb9e 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java @@ -7,8 +7,8 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; import forestry.arboriculture.PluginArboriculture; -import forestry.core.CreativeTabForestry; import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.SoundType; @@ -40,7 +40,7 @@ public class BlockWoodPile extends Block implements IItemModelRegister, IStateMa super(Material.WOOD); setHardness(1.5f); setTickRandomly(true); - setCreativeTab(CreativeTabForestry.tabForestry); + setCreativeTab(Tabs.tabArboriculture); setSoundType(SoundType.WOOD); } diff --git a/src/main/java/forestry/core/recipes/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java index 62f84eb27..707f2b441 100644 --- a/src/main/java/forestry/core/recipes/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -266,6 +266,9 @@ public abstract class RecipeUtil { return resource.isEmpty(); } for (ItemStack item : recipeIngredient) { + if(item.isEmpty() && resource.isEmpty()){ + return true; + } if (ItemStackUtil.isCraftingEquivalent(item, resource)) { return true; } diff --git a/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java index 4d75bec61..4e35907ee 100644 --- a/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java +++ b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java @@ -30,6 +30,7 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR private static final int MAX_CRAFT_GRID_HEIGHT = 3; private NonNullList> input; + private NonNullList oreDicts; private int width; private int height; private boolean mirrored = true; @@ -78,6 +79,7 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR } HashMap> itemMap = new HashMap<>(); + HashMap oreMap = new HashMap<>(); for (; idx < recipe.length; idx += 2) { Character chr = (Character) recipe[idx]; @@ -100,6 +102,7 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR itemMap.put(chr, ingredient); } else if (in instanceof String) { itemMap.put(chr, OreDictionary.getOres((String) in)); + oreMap.put(chr, (String) in); } else { String ret = "Invalid shaped ore recipe: "; for (Object tmp : recipe) { @@ -111,11 +114,17 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR } input = NonNullList.withSize(9, NonNullList.create()); + oreDicts = NonNullList.withSize(9, ""); int x = 0; for (char chr : shape.toCharArray()) { NonNullList stacks = itemMap.get(chr); if (stacks != null) { input.set(x++, stacks); + if(oreMap.get(chr) != null){ + oreDicts.set(x-1, oreMap.get(chr)); + } + }else{ + input.set(x++, NonNullList.withSize(1, ItemStack.EMPTY)); } } } @@ -134,6 +143,11 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR public NonNullList> getIngredients() { return input; } + + @Override + public NonNullList getOreDicts() { + return oreDicts; + } @Override public boolean matches(InventoryCrafting inv, World world) { diff --git a/src/main/java/forestry/core/utils/InventoryUtil.java b/src/main/java/forestry/core/utils/InventoryUtil.java index 4eedd2aab..8b2161382 100644 --- a/src/main/java/forestry/core/utils/InventoryUtil.java +++ b/src/main/java/forestry/core/utils/InventoryUtil.java @@ -207,6 +207,17 @@ public abstract class InventoryUtil { return ItemStackUtil.containsSets(set, stock, oreDictionary, craftingTools) >= count; } } + + public static boolean removeSets(IInventory inventory, int count, NonNullList set, NonNullList oreDicts, @Nullable EntityPlayer player, boolean stowContainer, boolean craftingTools, boolean doRemove) { + NonNullList stock = getStacks(inventory); + + if (doRemove) { + NonNullList removed = removeSets(inventory, count, set, oreDicts, player, stowContainer, craftingTools); + return removed != null && removed.size() >= count; + } else { + return ItemStackUtil.containsSets(set, stock, oreDicts, craftingTools) >= count; + } + } @Nullable public static NonNullList removeSets(IInventory inventory, int count, NonNullList set, @Nullable EntityPlayer player, boolean stowContainer, boolean oreDictionary, boolean craftingTools) { @@ -235,6 +246,34 @@ public abstract class InventoryUtil { } return removed; } + + @Nullable + public static NonNullList removeSets(IInventory inventory, int count, NonNullList set, NonNullList oreDicts, @Nullable EntityPlayer player, boolean stowContainer, boolean craftingTools) { + NonNullList removed = NonNullList.withSize(set.size(), ItemStack.EMPTY); + NonNullList stock = getStacks(inventory); + + if (ItemStackUtil.containsSets(set, stock, oreDicts, craftingTools) < count) { + return null; + } + + for (int i = 0; i < set.size(); i++) { + ItemStack itemStack = set.get(i); + if (!itemStack.isEmpty()) { + ItemStack stackToRemove = itemStack.copy(); + stackToRemove.setCount(stackToRemove.getCount() * count); + + // try to remove the exact stack first + ItemStack removedStack = removeStack(inventory, stackToRemove, player, stowContainer, false, false); + if (removedStack.isEmpty()) { + // remove crafting equivalents next + removedStack = removeStack(inventory, stackToRemove, oreDicts.get(i), player, stowContainer, craftingTools); + } + + removed.set(i, removedStack); + } + } + return removed; + } /** * Private Helper for removeSetsFromInventory. Assumes removal is possible. @@ -259,6 +298,27 @@ public abstract class InventoryUtil { } return ItemStack.EMPTY; } + + private static ItemStack removeStack(IInventory inventory, ItemStack stackToRemove, String oreDictOfStack, @Nullable EntityPlayer player, boolean stowContainer, boolean craftingTools) { + for (int j = 0; j < inventory.getSizeInventory(); j++) { + ItemStack stackInSlot = inventory.getStackInSlot(j); + if (!stackInSlot.isEmpty()) { + if (ItemStackUtil.isCraftingEquivalent(stackToRemove, stackInSlot, oreDictOfStack, craftingTools)) { + ItemStack removed = inventory.decrStackSize(j, stackToRemove.getCount()); + stackToRemove.shrink(removed.getCount()); + + if (stowContainer && stackToRemove.getItem().hasContainerItem(stackToRemove)) { + stowContainerItem(removed, inventory, j, player); + } + + if (stackToRemove.isEmpty()) { + return removed; + } + } + } + } + return ItemStack.EMPTY; + } /* CONTAINS */ diff --git a/src/main/java/forestry/core/utils/ItemStackUtil.java b/src/main/java/forestry/core/utils/ItemStackUtil.java index 3025f1b3e..b74d351a9 100644 --- a/src/main/java/forestry/core/utils/ItemStackUtil.java +++ b/src/main/java/forestry/core/utils/ItemStackUtil.java @@ -254,6 +254,38 @@ public abstract class ItemStackUtil { return totalSets; } + + /** + * Counts how many full sets are contained in the passed stock + */ + public static int containsSets(NonNullList set, NonNullList stock, NonNullList oreDicts, boolean craftingTools) { + int totalSets = 0; + + NonNullList condensedRequired = ItemStackUtil.condenseStacks(set); + NonNullList condensedOffered = ItemStackUtil.condenseStacks(stock); + + for (ItemStack req : condensedRequired) { + + int reqCount = 0; + for (int i = 0;i < condensedOffered.size();i++) { + ItemStack offer = condensedOffered.get(i); + if (isCraftingEquivalent(req, offer, oreDicts.get(i), craftingTools)) { + int stackCount = (int) Math.floor(offer.getCount() / req.getCount()); + reqCount = Math.max(reqCount, stackCount); + } + } + + if (reqCount == 0) { + return 0; + } else if (totalSets == 0) { + totalSets = reqCount; + } else if (totalSets > reqCount) { + totalSets = reqCount; + } + } + + return totalSets; + } public static boolean equalSets(NonNullList set1, NonNullList set2) { if (set1 == set2) { @@ -298,6 +330,46 @@ public abstract class ItemStackUtil { return ItemStack.areItemStackTagsEqual(base, comparison); } } + + /** + * Compare two item stacks for crafting equivalency. + */ + public static boolean isCraftingEquivalent(ItemStack base, ItemStack comparison, String oreDict, boolean craftingTools) { + if (base.isEmpty() || comparison.isEmpty()) { + return false; + } + + if (craftingTools && isCraftingToolEquivalent(base, comparison)) { + return true; + } + + if (isCraftingEquivalent(base, comparison)) { + return true; + } + + if (base.getTagCompound() != null && !base.getTagCompound().hasNoTags()) { + if (!ItemStack.areItemStacksEqual(base, comparison)) { + return false; + } + } + + if (!oreDict.isEmpty()) { + int[] idsBase = OreDictionary.getOreIDs(base); + Arrays.sort(idsBase); + int idComp = OreDictionary.getOreID(oreDict); + + int iBase = 0; + while (iBase < idsBase.length) { + if (idsBase[iBase] == idComp) { + iBase++; + } else { + return true; + } + } + } + + return false; + } /** * Compare two item stacks for crafting equivalency. diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipe.java b/src/main/java/forestry/factory/recipes/FabricatorRecipe.java index c8d1fde5e..08ee3eec5 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorRecipe.java +++ b/src/main/java/forestry/factory/recipes/FabricatorRecipe.java @@ -20,18 +20,21 @@ public class FabricatorRecipe implements IFabricatorRecipe { private final ItemStack plan; private final FluidStack molten; private final NonNullList> ingredients; + private final NonNullList oreDicts; private final ItemStack result; - public FabricatorRecipe(ItemStack plan, FluidStack molten, ItemStack result, NonNullList> ingredients) { + public FabricatorRecipe(ItemStack plan, FluidStack molten, ItemStack result, NonNullList> ingredients, NonNullList oreDicts) { Preconditions.checkNotNull(plan); Preconditions.checkNotNull(molten); Preconditions.checkNotNull(result); Preconditions.checkArgument(!result.isEmpty()); Preconditions.checkNotNull(ingredients); + Preconditions.checkNotNull(oreDicts); this.plan = plan; this.molten = molten; this.result = result; this.ingredients = ingredients; + this.oreDicts = oreDicts; } @Override @@ -39,6 +42,11 @@ public class FabricatorRecipe implements IFabricatorRecipe { return ingredients; } + @Override + public NonNullList getOreDicts() { + return oreDicts; + } + @Override public int getWidth() { return 3; diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java index 209e7e187..8034e12df 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java @@ -34,7 +34,7 @@ public class FabricatorRecipeManager implements IFabricatorManager { ShapedRecipeCustom patternRecipe = new ShapedRecipeCustom(result, pattern); NonNullList> ingredients = patternRecipe.getIngredients(); - IFabricatorRecipe recipe = new FabricatorRecipe(plan, molten, result, ingredients); + IFabricatorRecipe recipe = new FabricatorRecipe(plan, molten, result, ingredients, patternRecipe.getOreDicts()); addRecipe(recipe); } diff --git a/src/main/java/forestry/factory/tiles/TileCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java index 6f82ce400..6a6869db6 100644 --- a/src/main/java/forestry/factory/tiles/TileCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -186,7 +186,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu NonNullList craftingSets = InventoryUtil.getStacks(craftingInventory, InventoryGhostCrafting.SLOT_CRAFTING_1, InventoryGhostCrafting.SLOT_CRAFTING_COUNT); IInventory inventory = new InventoryMapper(getInternalInventory(), InventoryCarpenter.SLOT_INVENTORY_1, InventoryCarpenter.SLOT_INVENTORY_COUNT); - return InventoryUtil.removeSets(inventory, 1, craftingSets, null, true, true, false, doRemove); + return InventoryUtil.removeSets(inventory, 1, craftingSets, currentRecipe.getCraftingGridRecipe().getOreDicts(), null, true, false, doRemove); } /* STATE INFORMATION */ diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index 3478a7425..07c735932 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -221,7 +221,7 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I private boolean removeFromInventory(NonNullList set, boolean doRemove) { IInventory inventory = new InventoryMapper(this, InventoryFabricator.SLOT_INVENTORY_1, InventoryFabricator.SLOT_INVENTORY_COUNT); - return InventoryUtil.removeSets(inventory, 1, set, null, true, true, false, doRemove); + return InventoryUtil.removeSets(inventory, 1, set, getRecipe().getOreDicts(), null, true, false, doRemove); } @Override @@ -237,7 +237,7 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I hasResources = removeFromInventory(crafting, false); FluidStack toDrain = recipe.getLiquid(); FluidStack drained = moltenTank.drainInternal(toDrain, false); - hasLiquidResources = drained.isFluidStackIdentical(toDrain); + hasLiquidResources = drained != null && drained.isFluidStackIdentical(toDrain); } else { hasRecipe = false; }