From f74f9e496788653aed125aad2da477813e79c737 Mon Sep 17 00:00:00 2001 From: Ryan Nasers <42074409+Cardinalstars@users.noreply.github.com> Date: Sun, 15 Sep 2024 04:07:23 -0500 Subject: [PATCH] Should be fixed (#49) --- settings.gradle | 2 +- .../genetics/nei/InoculatorRecipeHandler.java | 21 ++++++++----------- .../genetics/nei/SplicerRecipeHandler.java | 8 +++---- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/settings.gradle b/settings.gradle index 43f3180f..ec9681d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,5 +17,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27' } diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index 7dee9f32..07ba13ca 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -1,5 +1,8 @@ package binnie.genetics.nei; +import static binnie.genetics.Genetics.itemSerum; +import static binnie.genetics.Genetics.itemSerumArray; + import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; @@ -15,11 +18,9 @@ import binnie.core.Mods; import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.RecipeHandlerBase; -import binnie.genetics.Genetics; import binnie.genetics.api.IItemSerum; import binnie.genetics.item.GeneticLiquid; import codechicken.lib.gui.GuiDraw; -import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; @@ -30,14 +31,9 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase { private static final List recipes = new ArrayList<>(); private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) { + recipes.add(new InoculatorRecipe(dnaManipulable, new ItemStack(itemSerum, 1, OreDictionary.WILDCARD_VALUE))); recipes.add( - new InoculatorRecipe( - dnaManipulable, - new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add( - new InoculatorRecipe( - dnaManipulable, - new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE))); + new InoculatorRecipe(dnaManipulable, new ItemStack(itemSerumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override @@ -151,9 +147,10 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase { if (recipe.getSerum() != null && recipe.getDnaManipulable() != null) { ISpeciesRoot root1 = AlleleManager.alleleRegistry.getSpeciesRoot(recipe.getDnaManipulable()); - List serums = new ArrayList<>(); - - for (ItemStack serumStack : ItemList.itemMap.get(recipe.getSerum().getItem())) { + List serums = new ArrayList<>(200); + List allSerumList = new ArrayList<>(1000); + recipe.serum.getItem().getSubItems(recipe.serum.getItem(), null, allSerumList); + for (ItemStack serumStack : allSerumList) { if (serumStack.getTagCompound() != null) { IItemSerum itemSerum = (IItemSerum) serumStack.getItem(); ISpeciesRoot root2 = itemSerum.getSpeciesRoot(serumStack); diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index eaa7e1d6..f2e825cc 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -18,7 +18,6 @@ import binnie.genetics.Genetics; import binnie.genetics.api.IItemSerum; import binnie.genetics.item.GeneticLiquid; import codechicken.lib.gui.GuiDraw; -import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; @@ -143,9 +142,10 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { public CachedSplicer(SplicerRecipe recipe) { if (recipe.getSerum() != null && recipe.getDnaManipulable() != null) { ISpeciesRoot root1 = AlleleManager.alleleRegistry.getSpeciesRoot(recipe.getDnaManipulable()); - List serums = new ArrayList<>(); - - for (ItemStack serumStack : ItemList.itemMap.get(recipe.getSerum().getItem())) { + List serums = new ArrayList<>(200); + List allSerumList = new ArrayList<>(1000); + recipe.serum.getItem().getSubItems(recipe.serum.getItem(), null, allSerumList); + for (ItemStack serumStack : allSerumList) { if (serumStack.getTagCompound() != null) { IItemSerum itemSerum = (IItemSerum) serumStack.getItem(); ISpeciesRoot root2 = itemSerum.getSpeciesRoot(serumStack);