From 543dd4a60fe6517940b6eaaaecfe85cafb7d826d Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Sun, 8 Sep 2024 00:25:53 +0800 Subject: Fix more broken NEI caused by renaming (#3102) Co-authored-by: Martin Robertz --- .../java/bartworks/neiHandler/BWNEIConfig.java | 96 ---------------------- .../bartworks/neiHandler/BioLabNEIHandler.java | 6 +- .../bartworks/neiHandler/BioVatNEIHandler.java | 4 +- .../java/bartworks/neiHandler/NEIBWConfig.java | 96 ++++++++++++++++++++++ .../java/bartworks/neiHandler/OreNEIHandler.java | 2 +- 5 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 src/main/java/bartworks/neiHandler/BWNEIConfig.java create mode 100644 src/main/java/bartworks/neiHandler/NEIBWConfig.java (limited to 'src/main/java/bartworks/neiHandler') diff --git a/src/main/java/bartworks/neiHandler/BWNEIConfig.java b/src/main/java/bartworks/neiHandler/BWNEIConfig.java deleted file mode 100644 index 6226613e91..0000000000 --- a/src/main/java/bartworks/neiHandler/BWNEIConfig.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package bartworks.neiHandler; - -import net.minecraft.item.ItemStack; - -import bartworks.API.recipe.BartWorksRecipeMaps; -import bartworks.MainMod; -import bartworks.common.loaders.FluidLoader; -import bartworks.common.loaders.ItemRegistry; -import bartworks.system.material.WerkstoffLoader; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import gregtech.api.enums.OrePrefixes; - -public class BWNEIConfig implements IConfigureNEI { - - static boolean sIsAdded = true; - - static boolean checkRecipe(ItemStack labPart, Iterable stacks) { - for (PositionedStack stack : stacks) { - for (ItemStack item : stack.items) { - if (labPart.getTagCompound() - .equals(item.getTagCompound())) { - return true; - } - } - } - return false; - } - - @Override - public void loadConfig() { - API.hideItem(new ItemStack(ItemRegistry.TAB)); - API.hideItem(new ItemStack(FluidLoader.bioFluidBlock)); - API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses)); - API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses2)); - ItemStack[] prefixesToHide = { - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustTiny, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustSmall, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushed, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedPurified, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedCentrifuged, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.nugget, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemChipped, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawed, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawless, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemExquisite, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustImpure, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustPure, WerkstoffLoader.Bismutite) - .copy(), }; - for (ItemStack stack : prefixesToHide) { - stack.setItemDamage(Short.MAX_VALUE); - API.hideItem(stack); - } - - BWNEIConfig.sIsAdded = false; - new OreNEIHandler(); - new BioVatNEIHandler(BartWorksRecipeMaps.bacterialVatRecipes.getDefaultRecipeCategory()); - new BioLabNEIHandler(BartWorksRecipeMaps.bioLabRecipes.getDefaultRecipeCategory()); - BWNEIConfig.sIsAdded = true; - } - - @Override - public String getName() { - return "BartWorks NEI Plugin"; - } - - @Override - public String getVersion() { - return MainMod.APIVERSION; - } -} diff --git a/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java b/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java index 40c20e42d3..243f3fe426 100644 --- a/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java +++ b/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java @@ -28,7 +28,7 @@ public class BioLabNEIHandler extends GTNEIDefaultHandler { public BioLabNEIHandler(RecipeCategory recipeCategory) { super(recipeCategory); - if (!BWNEIConfig.sIsAdded) { + if (!NEIBWConfig.sIsAdded) { FMLInterModComms.sendRuntimeMessage( GTValues.GT, "NEIPlugins", @@ -50,7 +50,7 @@ public class BioLabNEIHandler extends GTNEIDefaultHandler { && aResult.getItemDamage() < 3 && aResult.getTagCompound() != null) { for (CachedDefaultRecipe recipe : this.getCache()) - if (BWNEIConfig.checkRecipe(aResult, recipe.mOutputs)) this.arecipes.add(recipe); + if (NEIBWConfig.checkRecipe(aResult, recipe.mOutputs)) this.arecipes.add(recipe); } else { super.loadCraftingRecipes(aResult); } @@ -62,7 +62,7 @@ public class BioLabNEIHandler extends GTNEIDefaultHandler { && aResult.getItemDamage() < 3 && aResult.getTagCompound() != null) { for (CachedDefaultRecipe recipe : this.getCache()) - if (BWNEIConfig.checkRecipe(aResult, recipe.mInputs)) this.arecipes.add(recipe); + if (NEIBWConfig.checkRecipe(aResult, recipe.mInputs)) this.arecipes.add(recipe); } else { super.loadUsageRecipes(aResult); } diff --git a/src/main/java/bartworks/neiHandler/BioVatNEIHandler.java b/src/main/java/bartworks/neiHandler/BioVatNEIHandler.java index 08583a617d..90651d3d7a 100644 --- a/src/main/java/bartworks/neiHandler/BioVatNEIHandler.java +++ b/src/main/java/bartworks/neiHandler/BioVatNEIHandler.java @@ -31,7 +31,7 @@ public class BioVatNEIHandler extends GTNEIDefaultHandler { public BioVatNEIHandler(RecipeCategory recipeCategory) { super(recipeCategory); - if (!BWNEIConfig.sIsAdded) { + if (!NEIBWConfig.sIsAdded) { FMLInterModComms.sendRuntimeMessage( GTValues.GT, "NEIPlugins", @@ -53,7 +53,7 @@ public class BioVatNEIHandler extends GTNEIDefaultHandler { // see constructor of CachedDefaultRecipe on why relx==120 and rely==52 means special slot for (PositionedStack stack : recipe.mInputs) { if (stack.relx == 120 && stack.rely == 52 - && BWNEIConfig.checkRecipe(aResult, Collections.singletonList(stack))) this.arecipes.add(recipe); + && NEIBWConfig.checkRecipe(aResult, Collections.singletonList(stack))) this.arecipes.add(recipe); } } } diff --git a/src/main/java/bartworks/neiHandler/NEIBWConfig.java b/src/main/java/bartworks/neiHandler/NEIBWConfig.java new file mode 100644 index 0000000000..64c91072ee --- /dev/null +++ b/src/main/java/bartworks/neiHandler/NEIBWConfig.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following + * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +package bartworks.neiHandler; + +import net.minecraft.item.ItemStack; + +import bartworks.API.recipe.BartWorksRecipeMaps; +import bartworks.MainMod; +import bartworks.common.loaders.FluidLoader; +import bartworks.common.loaders.ItemRegistry; +import bartworks.system.material.WerkstoffLoader; +import codechicken.nei.PositionedStack; +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; +import gregtech.api.enums.OrePrefixes; + +public class NEIBWConfig implements IConfigureNEI { + + static boolean sIsAdded = true; + + static boolean checkRecipe(ItemStack labPart, Iterable stacks) { + for (PositionedStack stack : stacks) { + for (ItemStack item : stack.items) { + if (labPart.getTagCompound() + .equals(item.getTagCompound())) { + return true; + } + } + } + return false; + } + + @Override + public void loadConfig() { + API.hideItem(new ItemStack(ItemRegistry.TAB)); + API.hideItem(new ItemStack(FluidLoader.bioFluidBlock)); + API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses)); + API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses2)); + ItemStack[] prefixesToHide = { + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustTiny, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustSmall, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushed, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedPurified, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedCentrifuged, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.nugget, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemChipped, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawed, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawless, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemExquisite, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustImpure, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustPure, WerkstoffLoader.Bismutite) + .copy(), }; + for (ItemStack stack : prefixesToHide) { + stack.setItemDamage(Short.MAX_VALUE); + API.hideItem(stack); + } + + NEIBWConfig.sIsAdded = false; + new OreNEIHandler(); + new BioVatNEIHandler(BartWorksRecipeMaps.bacterialVatRecipes.getDefaultRecipeCategory()); + new BioLabNEIHandler(BartWorksRecipeMaps.bioLabRecipes.getDefaultRecipeCategory()); + NEIBWConfig.sIsAdded = true; + } + + @Override + public String getName() { + return "BartWorks NEI Plugin"; + } + + @Override + public String getVersion() { + return MainMod.APIVERSION; + } +} diff --git a/src/main/java/bartworks/neiHandler/OreNEIHandler.java b/src/main/java/bartworks/neiHandler/OreNEIHandler.java index bbb6802a61..7b5e5eee40 100644 --- a/src/main/java/bartworks/neiHandler/OreNEIHandler.java +++ b/src/main/java/bartworks/neiHandler/OreNEIHandler.java @@ -40,7 +40,7 @@ import gregtech.api.enums.OrePrefixes; public class OreNEIHandler extends TemplateRecipeHandler { public OreNEIHandler() { - if (!BWNEIConfig.sIsAdded) { + if (!NEIBWConfig.sIsAdded) { FMLInterModComms.sendRuntimeMessage( MainMod.MOD_ID, "NEIPlugins", -- cgit