diff options
| author | Andrey <timeconqueror999@gmail.com> | 2023-01-13 21:22:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 02:22:53 +0800 |
| commit | 8fbe90185c7b81dcaf2fb7992e77109cf15dae45 (patch) | |
| tree | f81cd2dd5b4a36e90d8656183abd508496eee164 /src/main/java/gregtech/common/tileentities/automation | |
| parent | f0478b14ef55e6758d0e780743667636b85ee170 (diff) | |
| download | GT5-Unofficial-8fbe90185c7b81dcaf2fb7992e77109cf15dae45.tar.gz GT5-Unofficial-8fbe90185c7b81dcaf2fb7992e77109cf15dae45.tar.bz2 GT5-Unofficial-8fbe90185c7b81dcaf2fb7992e77109cf15dae45.zip | |
Pulling the hardcoded ore behavior from TypeFilter (#1648)
Co-authored-by: Andrey <timeconqueror999@gmail.com>
Co-authored-by: GitHub GTNH Actions <>
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/automation')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java index 6c3441c905..49cdc6617c 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.Textures.BlockIcons.AUTOMATION_TYPEFILTER; import static gregtech.api.enums.Textures.BlockIcons.AUTOMATION_TYPEFILTER_GLOW; +import com.google.common.collect.ImmutableList; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -24,6 +25,21 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte public int mRotationIndex = 0; public OrePrefixes mPrefix = OrePrefixes.ore; + public static ImmutableList<OrePrefixes> OREBLOCK_PREFIXES = ImmutableList.of( + OrePrefixes.oreBlackgranite, + OrePrefixes.oreDense, + OrePrefixes.oreEnd, + OrePrefixes.oreEndstone, + OrePrefixes.oreNether, + OrePrefixes.oreNetherrack, + OrePrefixes.oreNormal, + OrePrefixes.orePoor, + OrePrefixes.oreRedgranite, + OrePrefixes.oreRich, + OrePrefixes.oreSmall, + OrePrefixes.oreBasalt, + OrePrefixes.oreMarble); + public GT_MetaTileEntity_TypeFilter(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, new String[] { "Filters 1 Item Type", @@ -126,27 +142,13 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte @Override protected boolean isStackAllowed(ItemStack aStack) { - boolean tAllowPrefix = this.mPrefix.contains(aStack); if (this.mPrefix == OrePrefixes.ore) { - ItemData tData = GT_OreDictUnificator.getItemData(aStack); - if (tData != null && tData.mPrefix != null) { - OrePrefixes tFix = tData.mPrefix; - if (tFix == OrePrefixes.oreBlackgranite - || tFix == OrePrefixes.oreDense - || tFix == OrePrefixes.oreEnd - || tFix == OrePrefixes.oreEndstone - || tFix == OrePrefixes.oreNether - || tFix == OrePrefixes.oreNetherrack - || tFix == OrePrefixes.oreNormal - || tFix == OrePrefixes.orePoor - || tFix == OrePrefixes.oreRedgranite - || tFix == OrePrefixes.oreRich - || tFix == OrePrefixes.oreSmall - || tFix == OrePrefixes.oreBasalt - || tFix == OrePrefixes.oreMarble) tAllowPrefix = true; + ItemData data = GT_OreDictUnificator.getItemData(aStack); + if (data != null && data.mPrefix != null && OREBLOCK_PREFIXES.contains(data.mPrefix)) { + return true; } } - return tAllowPrefix; + return this.mPrefix.contains(aStack); } @Override |