diff --git a/build.gradle b/build.gradle index 91ba7238..7da74753 100644 --- a/build.gradle +++ b/build.gradle @@ -65,8 +65,8 @@ allprojects { deobfCompile("net.sengir.forestry:forestry_${mcversion}:${forestry_version}") { transitive = false } - deobfProvided "mezz.jei:jei_${mcversion}:${jei_version}:api" - runtime "mezz.jei:jei_${mcversion}:${jei_version}" + deobfProvided "mezz.jei:jei_${jei_mcversion}:${jei_version}:api" + runtime "mezz.jei:jei_${jei_mcversion}:${jei_version}" runtime "jei-bees:jeibees:${jeibees_version}:mc${mcversion}" deobfProvided "net.industrial-craft:industrialcraft-2:${ic2_version}:api" runtime "net.industrial-craft:industrialcraft-2:${ic2_version}" diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index 2a4bb8d2..c51f1a79 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -1,17 +1,9 @@ package binnie.extratrees.integration.jei; -import mezz.jei.api.IModPlugin; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; - import binnie.core.Constants; import binnie.core.integration.jei.Drawables; -import binnie.extratrees.modules.ModuleAlcohol; -import binnie.extratrees.modules.ModuleWood; -import binnie.extratrees.wood.WoodManager; +import binnie.core.modules.ExtraTreesModuleUIDs; +import binnie.core.modules.ModuleManager; import binnie.extratrees.blocks.decor.FenceDescription; import binnie.extratrees.blocks.decor.FenceType; import binnie.extratrees.integration.jei.brewery.BreweryRecipeCategory; @@ -24,15 +16,20 @@ import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeCategory; import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeMaker; import binnie.extratrees.integration.jei.multifence.MultiFenceRecipeRegistryPlugin; import binnie.extratrees.machines.ExtraTreeMachine; -import binnie.core.modules.ExtraTreesModuleUIDs; -import binnie.core.modules.ModuleManager; - +import binnie.extratrees.modules.ModuleAlcohol; +import binnie.extratrees.modules.ModuleWood; +import binnie.extratrees.wood.WoodManager; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.ISubtypeRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.IRecipeCategoryRegistration; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; @JEIPlugin public class ExtraTreesJeiPlugin implements IModPlugin { @@ -82,13 +79,14 @@ public class ExtraTreesJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { + IJeiHelpers jeiHelpers = registry.getJeiHelpers(); if(ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.MACHINES)) { registry.addRecipeCatalyst(ExtraTreeMachine.Lumbermill.get(1), RecipeUids.LUMBERMILL); registry.addRecipeCatalyst(ExtraTreeMachine.Press.get(1), RecipeUids.FRUIT_PRESS); registry.addRecipeCatalyst(ExtraTreeMachine.BREWERY.get(1), RecipeUids.BREWING); registry.addRecipeCatalyst(ExtraTreeMachine.Distillery.get(1), RecipeUids.DISTILLING); - registry.addRecipes(LumbermillRecipeMaker.create(), RecipeUids.LUMBERMILL); + registry.addRecipes(LumbermillRecipeMaker.create(jeiHelpers), RecipeUids.LUMBERMILL); registry.addRecipes(FruitPressRecipeMaker.create(), RecipeUids.FRUIT_PRESS); registry.addRecipes(BreweryRecipeMaker.create(), RecipeUids.BREWING); registry.addRecipes(DistilleryRecipeMaker.create(), RecipeUids.DISTILLING); diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java index 380402e8..f22598c7 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java @@ -3,21 +3,22 @@ package binnie.extratrees.integration.jei.distillery; import java.util.ArrayList; import java.util.List; -import net.minecraftforge.fluids.FluidStack; - import binnie.extratrees.api.recipes.ExtraTreesRecipeManager; +import binnie.extratrees.api.recipes.IDistilleryManager; import binnie.extratrees.api.recipes.IDistilleryRecipe; +import net.minecraftforge.fluids.FluidStack; public class DistilleryRecipeMaker { public static List create() { List recipes = new ArrayList<>(); - if(ExtraTreesRecipeManager.distilleryManager == null){ + IDistilleryManager distilleryManager = ExtraTreesRecipeManager.distilleryManager; + if (distilleryManager == null){ return recipes; } for (int level = 0; level < 3; level++) { - for (IDistilleryRecipe recipe : ExtraTreesRecipeManager.distilleryManager.recipes(level)) { + for (IDistilleryRecipe recipe : distilleryManager.recipes(level)) { FluidStack input = recipe.getInput(); FluidStack output = recipe.getOutput(); recipes.add(new DistilleryRecipeWrapper(level, input, output)); diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java index f300917d..35a517f7 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java @@ -1,29 +1,43 @@ package binnie.extratrees.integration.jei.lumbermill; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import net.minecraft.item.ItemStack; - import binnie.extratrees.api.recipes.ExtraTreesRecipeManager; +import binnie.extratrees.api.recipes.ILumbermillManager; import binnie.extratrees.api.recipes.ILumbermillRecipe; +import binnie.extratrees.machines.lumbermill.recipes.LumbermillRecipeManager; +import mezz.jei.api.IJeiHelpers; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.oredict.OreDictionary; public class LumbermillRecipeMaker { - public static List create() { + public static List create(IJeiHelpers helpers) { List recipes = new ArrayList<>(); - if(ExtraTreesRecipeManager.lumbermillManager == null){ + ILumbermillManager lumbermillManager = ExtraTreesRecipeManager.lumbermillManager; + if (lumbermillManager == null) { return recipes; } - Collection lumbermillRecipes = ExtraTreesRecipeManager.lumbermillManager.recipes(); - for (ILumbermillRecipe recipe : lumbermillRecipes) { + for (ILumbermillRecipe recipe : lumbermillManager.recipes()) { ItemStack logInput = recipe.getInput(); ItemStack plankOutput = recipe.getOutput(); recipes.add(new LumbermillRecipeWrapper(logInput, plankOutput)); } + NonNullList oreDictLogs = OreDictionary.getOres("logWood"); + List logSubtypes = helpers.getStackHelper().getAllSubtypes(oreDictLogs); + + for (ItemStack log : logSubtypes) { + ItemStack plankStack = LumbermillRecipeManager.getRecipeWithPlanksOutput(log.copy(), null); + if (!plankStack.isEmpty()) { + plankStack.setCount((int) Math.ceil(plankStack.getCount() * 1.5f)); // turns stack of 4 up to 6 + recipes.add(new LumbermillRecipeWrapper(log.copy(), plankStack)); + } + } + return recipes; } } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java index c44433d1..9a5e5ec7 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java @@ -1,15 +1,13 @@ package binnie.extratrees.machines.lumbermill.recipes; import javax.annotation.Nullable; +import java.util.Collection; -import binnie.core.util.UniqueItemStackSet; +import binnie.core.util.OreDictionaryUtil; +import binnie.extratrees.api.recipes.ILumbermillManager; +import binnie.extratrees.api.recipes.ILumbermillRecipe; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; - -import java.util.Collection; -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -17,95 +15,47 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; - import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.oredict.OreDictionary; - -import binnie.core.util.OreDictionaryUtil; -import binnie.extratrees.api.recipes.ILumbermillManager; -import binnie.extratrees.api.recipes.ILumbermillRecipe; public class LumbermillRecipeManager implements ILumbermillManager { - private static Multimap recipes = ArrayListMultimap.create(); - private static boolean calculatedRecipes = false; + private static final Multimap recipes = ArrayListMultimap.create(); + private static final InventoryCrafting FAKE_CRAFT_INV = new InventoryCrafting(new FakeCraftingHandler(), 3, 3) {}; public static ItemStack getPlankProduct(ItemStack logStack, World world) { - if (!calculatedRecipes) { - calculateProducts(world); - calculatedRecipes = true; - } - Item logItem = logStack.getItem(); for (ILumbermillRecipe recipe : recipes.get(logItem)) { if (recipe.getInput().isItemEqual(logStack)) { return recipe.getOutput().copy(); } } + + if (OreDictionaryUtil.hasOreName(logStack, "logWood")) { + return getRecipeWithPlanksOutput(logStack.copy(), world); + } + return ItemStack.EMPTY; } - private static void calculateProducts(World world) { - InventoryCrafting fakeCraftingInventory = new InventoryCrafting(new FakeCraftingHandler(), 3, 3){}; - NonNullList oreDictLogs = OreDictionary.getOres("logWood"); - UniqueItemStackSet logsSet = new UniqueItemStackSet(); - for (ItemStack logStack : oreDictLogs) { - List subtypes = getSubtypes(logStack); - logsSet.addAll(subtypes); - } - - for (ItemStack log : logsSet) { - ItemStack logCopy = log.copy(); - logCopy.setCount(1); - fakeCraftingInventory.clear(); - fakeCraftingInventory.setInventorySlotContents(0, logCopy.copy()); - - ItemStack recipeOutput = getRecipeWithPlanksOutput(fakeCraftingInventory, world); - if (recipeOutput != null) { - addLogToPlankRecipe(logCopy, recipeOutput.copy()); - } - } - } - - @Nullable - private static ItemStack getRecipeWithPlanksOutput(InventoryCrafting fakeCraftingInventory, World world) { + public static ItemStack getRecipeWithPlanksOutput(ItemStack logStack, @Nullable World world) { + FAKE_CRAFT_INV.clear(); + FAKE_CRAFT_INV.setInventorySlotContents(0, logStack); for (IRecipe recipe : ForgeRegistries.RECIPES.getValues()) { - boolean matches; try { - matches = recipe.matches(fakeCraftingInventory, world); - } catch (RuntimeException | LinkageError e) { - matches = false; - } - if (matches) { - ItemStack recipeOutput = recipe.getCraftingResult(fakeCraftingInventory); - if (!recipeOutput.isEmpty()) { - if (OreDictionaryUtil.hasOreName(recipeOutput, "plankWood")) { - return recipeOutput; + //noinspection ConstantConditions + if (recipe.matches(FAKE_CRAFT_INV, world)) { + ItemStack recipeOutput = recipe.getCraftingResult(FAKE_CRAFT_INV); + if (!recipeOutput.isEmpty()) { + if (OreDictionaryUtil.hasOreName(recipeOutput, "plankWood")) { + return recipeOutput; + } } } + } catch (RuntimeException | LinkageError ignored) { + } } - return null; - } - - private static List getSubtypes(ItemStack itemStack) { - NonNullList subtypes = NonNullList.create(); - if (itemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE && itemStack.getHasSubtypes()) { - Item item = itemStack.getItem(); - for (CreativeTabs creativeTab : item.getCreativeTabs()) { - item.getSubItems(creativeTab, subtypes); - } - } else { - subtypes.add(itemStack); - } - return subtypes; - } - - private static void addLogToPlankRecipe(ItemStack logStack, ItemStack plankStack){ - Item logItem = logStack.getItem(); - plankStack.setCount((int) Math.ceil(plankStack.getCount() * 1.5f)); // turns stack of 4 up to 6 - recipes.put(logItem, new LumbermillRecipe(logStack, plankStack)); + return ItemStack.EMPTY; } @Override diff --git a/gradle.properties b/gradle.properties index 00ac5b5b..8f63db6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,7 @@ version_major=2 version_minor=3 version_patch=0 -jei_version=4.7.5.84 +jei_version=4.7.5.88 +jei_mcversion=1.12.1 jeibees_version=0.9.0.2 minetweaker_version=4.0.3.239