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

Recycling hiding logic #1577

Open
wants to merge 3 commits into
base: unstable
Choose a base branch
from
+6 −4
Open

Recycling hiding logic #1577

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be6c573
Merge pull request #1 from Blood-Asp/unstable
MauveCloud Oct 19, 2020
02da943
Improved logic for hiding recycling recipes.
MauveCloud Oct 28, 2020
c3300b1
Removed test for item data in method that didn't pass it.
MauveCloud Oct 28, 2020
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
10 changes: 6 additions & 4 deletions src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import gregtech.api.enums.*;
import gregtech.api.enums.TC_Aspects.TC_AspectStack;
import gregtech.api.interfaces.internal.IThaumcraftCompat;
import gregtech.api.items.GT_MetaGenerated_Item_X32;
import gregtech.api.objects.ItemData;
import gregtech.api.objects.MaterialStack;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

import java.util.ArrayList;
Expand Down Expand Up @@ -166,7 +168,7 @@ public static void registerReverseSmelting(ItemStack aStack, Materials aMaterial
aMaterialAmount /= aStack.stackSize;
if(aMaterial==Materials.Naquadah||aMaterial==Materials.NaquadahEnriched)return;

boolean tHide = (aMaterial != Materials.Iron)&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes);
boolean tHide = (aStack.getItem() == Item.getItemFromBlock(GregTech_API.sBlockMachines))&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes);
if (aAllowAlloySmelter)
GT_ModHandler.addSmeltingAndAlloySmeltingRecipe(GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.getIngot(aMaterial.mSmeltInto, aMaterialAmount),tHide);
else
Expand Down Expand Up @@ -231,7 +233,7 @@ public static void registerReverseArcSmelting(ItemStack aStack, ItemData aData)
for (MaterialStack tMaterial : aData.getAllMaterialStacks())
tAmount += tMaterial.mAmount * tMaterial.mMaterial.getMass();

boolean tHide = !tIron && GT_Mod.gregtechproxy.mHideRecyclingRecipes;
boolean tHide = (aStack.getItem() == Item.getItemFromBlock(GregTech_API.sBlockMachines) || (aStack.getItem() instanceof GT_MetaGenerated_Item_X32 && !aData.hasValidPrefixData())) && GT_Mod.gregtechproxy.mHideRecyclingRecipes;
RA.addArcFurnaceRecipe(aStack, new ItemStack[]{GT_OreDictUnificator.getIngotOrDust(aData.mMaterial), GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(0)), GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(1)), GT_OreDictUnificator.getIngotOrDust(aData.getByProduct(2))}, null, (int) Math.max(16, tAmount / M), 96, tHide);
}

Expand All @@ -255,7 +257,7 @@ public static void registerReverseMacerating(ItemStack aStack, ItemData aData, b
long tAmount = 0;
for (MaterialStack tMaterial : aData.getAllMaterialStacks())
tAmount += tMaterial.mAmount * tMaterial.mMaterial.getMass();
boolean tHide = (aData.mMaterial.mMaterial != Materials.Iron)&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes);
boolean tHide = (aStack.getItem() == Item.getItemFromBlock(GregTech_API.sBlockMachines) || (aStack.getItem() instanceof GT_MetaGenerated_Item_X32 && !aData.hasValidPrefixData()))&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes);
RA.addPulveriserRecipe(aStack, new ItemStack[]{GT_OreDictUnificator.getDust(aData.mMaterial), GT_OreDictUnificator.getDust(aData.getByProduct(0)), GT_OreDictUnificator.getDust(aData.getByProduct(1)), GT_OreDictUnificator.getDust(aData.getByProduct(2))}, null, aData.mMaterial.mMaterial==Materials.Marble ? 1 : (int) Math.max(16, tAmount / M), 4, tHide);

if (aAllowHammer) for (MaterialStack tMaterial : aData.getAllMaterialStacks())
Expand Down Expand Up @@ -346,4 +348,4 @@ public static synchronized void registerUsagesForMaterials(ItemStack aMat, Strin
}
}
}
}
}