From 67062474fa9739a112f1ad8a6963ed9a0bf665cb Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Sat, 20 Mar 2021 05:07:13 +0800 Subject: [PATCH] Fix race condition on NEIConfig#bloodOrbs initialization (#10) --- .../client/nei/NEIAlchemyRecipeHandler.java | 27 +--------- .../client/nei/NEIBloodOrbShapedHandler.java | 49 +++++-------------- .../nei/NEIBloodOrbShapelessHandler.java | 4 +- .../client/nei/NEIConfig.java | 39 +++++++++++++-- 4 files changed, 52 insertions(+), 67 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java index 326dad5d..229fae8c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.client.nei; -import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.bloodOrbs; +import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.getBloodOrbs; import java.awt.Rectangle; import java.util.ArrayList; @@ -57,7 +57,7 @@ public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler { this.output = new PositionedStack(recipe.getResult(), 76, 25); this.lp = recipe.getAmountNeeded() * 100; this.orbs = new ArrayList(); - for (Item orb : bloodOrbs) { + for (Item orb : getBloodOrbs()) { if (((IBloodOrb) orb).getOrbLevel() >= recipe.getOrbLevel()) { orbs.add(new BloodOrbs(new ItemStack(orb))); } @@ -81,29 +81,6 @@ public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler { } } - @Override - public TemplateRecipeHandler newInstance() { - // We need to populate available blood orbs, - // but don't try to do it more than once - if (bloodOrbs.isEmpty()) { - for (ItemStack item : ItemList.items) { - if (item != null && item.getItem() instanceof IBloodOrb) { - bloodOrbs.add(item.getItem()); - } - } - if (bloodOrbs.isEmpty()) { - // If there is NEI no cache - go to item registry - for (Object anItemRegistry : Item.itemRegistry) { - Item item = (Item) anItemRegistry; - if (item != null && item instanceof IBloodOrb) { - bloodOrbs.add(item); - } - } - } - } - return super.newInstance(); - } - @Override public String getOverlayIdentifier() { return "alchemicalwizardry.alchemy"; diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java index 6e0dbf33..c573ecda 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java @@ -1,25 +1,23 @@ package WayofTime.alchemicalWizardry.client.nei; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - +import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; import codechicken.nei.ItemList; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.ShapedRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.StatCollector; -import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapedRecipeHandler; -import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.bloodOrbs; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.getBloodOrbs; /** * NEI Blood Orb Shaped Recipe Handler by joshie * @@ -43,8 +41,8 @@ public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { stack.setMaxSize(1); ingredients.add(stack); } else if (o instanceof Integer) { - ArrayList orbs = new ArrayList(); - for (Item item : bloodOrbs) { + ArrayList orbs = new ArrayList<>(); + for (Item item : getBloodOrbs()) { if (((IBloodOrb) item).getOrbLevel() >= (Integer) o) { orbs.add(new ItemStack(item)); } @@ -144,27 +142,4 @@ public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { return StatCollector.translateToLocal("bm.string.crafting.orb.shaped"); } - @Override - public TemplateRecipeHandler newInstance() { - // We need to populate available blood orbs, - // but don't try to do it more than once - if (bloodOrbs.isEmpty()) { - for (ItemStack item : ItemList.items) { - if (item != null && item.getItem() instanceof IBloodOrb) { - bloodOrbs.add(item.getItem()); - } - } - if (bloodOrbs.isEmpty()) { - // If there is NEI no cache - go to item registry - for (Object anItemRegistry : Item.itemRegistry) { - Item item = (Item) anItemRegistry; - if (item != null && item instanceof IBloodOrb) { - bloodOrbs.add(item); - } - } - } - } - return super.newInstance(); - } - } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java index 7be1ee25..25215e21 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java @@ -34,8 +34,8 @@ public class NEIBloodOrbShapelessHandler extends ShapelessRecipeHandler { stack.setMaxSize(1); ingredients.add(stack); } else if (o instanceof Integer) { - ArrayList orbs = new ArrayList(); - for (Item item : NEIConfig.bloodOrbs) { + ArrayList orbs = new ArrayList<>(); + for (Item item : NEIConfig.getBloodOrbs()) { if (((IBloodOrb) item).getOrbLevel() >= (Integer) o) { orbs.add(new ItemStack(item)); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java index c1ef8769..88f0bc5c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java @@ -2,13 +2,46 @@ package WayofTime.alchemicalWizardry.client.nei; import java.util.ArrayList; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import codechicken.nei.ItemList; import net.minecraft.item.Item; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; +import net.minecraft.item.ItemStack; + +public class NEIConfig implements IConfigureNEI { + private static ArrayList bloodOrbs = null; + + public static ArrayList getBloodOrbs() { + if (bloodOrbs == null) { + synchronized (NEIConfig.class) { + if (bloodOrbs == null) { + bloodOrbs = collectAllBloodOrbs(); + } + } + } + return bloodOrbs; + } + + private static ArrayList collectAllBloodOrbs() { + ArrayList bloodOrbsTemp = new ArrayList<>(); + for (ItemStack item : ItemList.items) { + if (item != null && item.getItem() instanceof IBloodOrb) { + bloodOrbsTemp.add(item.getItem()); + } + } + if (bloodOrbsTemp.isEmpty()) { + // If there is NEI no cache - go to item registry + for (Object anItemRegistry : Item.itemRegistry) { + Item item = (Item) anItemRegistry; + if (item instanceof IBloodOrb) { + bloodOrbsTemp.add(item); + } + } + } + return bloodOrbsTemp; + } -public class NEIConfig implements IConfigureNEI { - public static ArrayList bloodOrbs = new ArrayList(); - @Override public void loadConfig() { API.registerRecipeHandler(new NEIAlchemyRecipeHandler());