Fix #935 Most farm blocks are uncraftable

This commit is contained in:
mezz committed 2015-10-29 21:25:35 -07:00
1 parent 6a3e3e6f55
commit bcb468b496
2 files changed
+41 -36

No files matched your search

@@ -282,7 +282,11 @@ public abstract class RecipeUtil {
}
public static boolean matches(IDescriptiveRecipe recipe, IInventory inventoryCrafting) {
if (!matches(recipe.getIngredients(), recipe.getWidth(), recipe.getHeight(), inventoryCrafting)) {
ItemStack[][] resources = getResources(inventoryCrafting);
Object[] recipeIngredients = recipe.getIngredients();
int width = recipe.getWidth();
int height = recipe.getHeight();
if (!matches(recipeIngredients, width, height, resources)) {
return false;
}
@@ -295,7 +299,7 @@ public abstract class RecipeUtil {
return true;
}
public static boolean matches(Object[] ingredients, int width, int height, IInventory inventoryCrafting) {
private static ItemStack[][] getResources(IInventory inventoryCrafting) {
ItemStack[][] resources = new ItemStack[3][3];
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) {
@@ -303,18 +307,17 @@ public abstract class RecipeUtil {
resources[i][j] = inventoryCrafting.getStackInSlot(k);
}
}
return matches(ingredients, width, height, resources);
return resources;
}
public static boolean matches(Object[] ingredients, int width, int height, ItemStack[][] resources) {
public static boolean matches(Object[] recipeIngredients, int width, int height, ItemStack[][] resources) {
for (int i = 0; i <= 3 - width; i++) {
for (int j = 0; j <= 3 - height; j++) {
if (checkMatch(ingredients, width, height, resources, i, j, true)) {
if (checkMatch(recipeIngredients, width, height, resources, i, j, true)) {
return true;
}
if (checkMatch(ingredients, width, height, resources, i, j, false)) {
if (checkMatch(recipeIngredients, width, height, resources, i, j, false)) {
return true;
}
}
@@ -323,42 +326,24 @@ public abstract class RecipeUtil {
return false;
}
private static boolean checkMatch(Object[] ingredients, int width, int height, ItemStack[][] resources, int xInGrid, int yInGrid, boolean flag) {
private static boolean checkMatch(Object[] recipeIngredients, int width, int height, ItemStack[][] resources, int xInGrid, int yInGrid, boolean mirror) {
for (int k = 0; k < 3; k++) {
for (int l = 0; l < 3; l++) {
ItemStack resource = resources[k][l];
int widthIt = k - xInGrid;
int heightIt = l - yInGrid;
Object compare = null;
Object recipeIngredient = null;
if (widthIt >= 0 && heightIt >= 0 && widthIt < width && heightIt < height) {
if (flag) {
compare = ingredients[(width - widthIt - 1) + heightIt * width];
if (mirror) {
recipeIngredient = recipeIngredients[(width - widthIt - 1) + heightIt * width];
} else {
compare = ingredients[widthIt + heightIt * width];
recipeIngredient = recipeIngredients[widthIt + heightIt * width];
}
}
ItemStack resource = resources[k][l];
if (compare instanceof ItemStack) {
if (!ItemStackUtil.isIdenticalItem((ItemStack) compare, resource)) {
return false;
}
} else if (compare instanceof Iterable) {
boolean matched = false;
for (Object item : (Iterable) compare) {
if (item instanceof ItemStack) {
matched = matched || ItemStackUtil.isIdenticalItem((ItemStack) item, resource);
}
}
if (!matched) {
return false;
}
} else if (compare == null && resource != null) {
if (!checkIngredientMatch(recipeIngredient, resource)) {
return false;
}
}
@@ -366,4 +351,21 @@ public abstract class RecipeUtil {
return true;
}
private static boolean checkIngredientMatch(Object recipeIngredient, ItemStack resource) {
if (recipeIngredient == null && resource == null) {
return true;
} else if (recipeIngredient instanceof ItemStack) {
return ItemStackUtil.isCraftingEquivalent((ItemStack) recipeIngredient, resource);
} else if (recipeIngredient instanceof Iterable) {
for (Object item : (Iterable) recipeIngredient) {
if (checkIngredientMatch(item, resource)) {
return true;
}
}
return false;
} else {
return false;
}
}
}
@@ -301,17 +301,20 @@ public class PluginFarming extends ForestryPlugin {
ShapedRecipeCustom.buildRecipe(basic.copy(), "I#I", "WCW", '#', block.getBase(), 'W', "slabWood", 'C', ForestryItem.tubes.getItemStack(1, 1), 'I', "ingotCopper");
}
// use wildcard (null) NBT for the basic ingredient so that any basic type can be used
ItemStack basicWildcard = ForestryBlock.farm.getItemStack(1, 0);
ItemStack gearbox = ForestryBlock.farm.getItemStack(1, 2);
ShapedRecipeCustom.buildRecipe(gearbox, " # ", "TTT", '#', basic, 'T', "gearTin").setPreserveNBT();
ShapedRecipeCustom.buildRecipe(gearbox, " # ", "TTT", '#', basicWildcard, 'T', "gearTin").setPreserveNBT();
ItemStack hatch = ForestryBlock.farm.getItemStack(1, 3);
ShapedRecipeCustom.buildRecipe(hatch, " # ", "TDT", '#', basic, 'T', "gearTin", 'D', Blocks.trapdoor).setPreserveNBT();
ShapedRecipeCustom.buildRecipe(hatch, " # ", "TDT", '#', basicWildcard, 'T', "gearTin", 'D', Blocks.trapdoor).setPreserveNBT();
ItemStack valve = ForestryBlock.farm.getItemStack(1, 4);
ShapedRecipeCustom.buildRecipe(valve, " # ", "XTX", '#', basic, 'T', "gearTin", 'X', "blockGlass").setPreserveNBT();
ShapedRecipeCustom.buildRecipe(valve, " # ", "XTX", '#', basicWildcard, 'T', "gearTin", 'X', "blockGlass").setPreserveNBT();
ItemStack control = ForestryBlock.farm.getItemStack(1, 5);
ShapedRecipeCustom.buildRecipe(control, " # ", "XTX", '#', basic, 'T', ForestryItem.tubes.getItemStack(1, 4), 'X', "dustRedstone").setPreserveNBT();
ShapedRecipeCustom.buildRecipe(control, " # ", "XTX", '#', basicWildcard, 'T', ForestryItem.tubes.getItemStack(1, 4), 'X', "dustRedstone").setPreserveNBT();
// Circuits
ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed");