Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove "Ore Byproduct List" NEI in favor of custom diagram mod #2183

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Remove "Ore Byproduct List" NEI in favor of custom diagram mod #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/gregtech/api/util/GT_Recipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,7 @@ public static class GT_Recipe_Map implements IGT_RecipeMap {
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",
Expand All @@ -1292,7 +1293,7 @@ public static class GT_Recipe_Map implements IGT_RecipeMap {
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",
Expand Down
19 changes: 1 addition & 18 deletions src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,8 @@ private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMater
(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);
Expand All @@ -126,20 +123,6 @@ private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMater
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;
Expand Down