diff options
| author | miozune <miozune@gmail.com> | 2023-07-26 17:59:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-26 10:59:36 +0200 |
| commit | 005fd2fbf72950f019cc2a20c37bb97c2c68b428 (patch) | |
| tree | a689f2378c82f185f26eef6c79d8d9d83a6640f6 /src/main/java/gregtech | |
| parent | 16ee6e47da3728f70b99d8a02c538acfe692a705 (diff) | |
| download | GT5-Unofficial-005fd2fbf72950f019cc2a20c37bb97c2c68b428.tar.gz GT5-Unofficial-005fd2fbf72950f019cc2a20c37bb97c2c68b428.tar.bz2 GT5-Unofficial-005fd2fbf72950f019cc2a20c37bb97c2c68b428.zip | |
Remove "Ore Byproduct List" NEI in favor of custom diagram mod (#2183)
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | 19 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index e2975c3e8a..cac1e67ee3 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -1277,6 +1277,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_DUST) .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE) .setProgressBar(GT_UITextures.PROGRESSBAR_MACERATE, ProgressBar.Direction.RIGHT); + @Deprecated public static final GT_Recipe_Map sByProductList = new GT_Recipe_Map( new HashSet<>(1000), "gt.recipe.byproductlist", @@ -1292,7 +1293,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { 1, E, true, - true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + false).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sReplicatorFakeRecipes = new ReplicatorFakeMap( new HashSet<>(100), "gt.recipe.replicator", diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index f0ffe2d39b..8ac1bf9ae5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -111,11 +111,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra (long) aMaterial.mOreMultiplier * aMultiplier); } - ArrayList<ItemStack> tByProductStacks = new ArrayList<>(); - for (Materials tMat : aMaterial.mOreByProducts) { - ItemStack tByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (tByProduct != null) tByProductStacks.add(tByProduct); + GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); @@ -126,20 +123,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } - if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) { - this.mAlreadyListedOres.add(aMaterial); - gregtech.api.util.GT_Recipe.GT_Recipe_Map.sByProductList.addFakeRecipe( - false, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L) }, - tByProductStacks.toArray(new ItemStack[0]), - null, - null, - null, - null, - 0, - 0, - 0); - } if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial; if (tPrimaryByProduct == null) tPrimaryByProduct = tDust; |