diff options
author | Maya <10861407+serenibyss@users.noreply.github.com> | 2024-10-09 00:05:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-09 05:05:47 +0000 |
commit | 55e95b68ca039042ddb0e80933aa57c5839678d6 (patch) | |
tree | be1ae84441427c7ffe9164dc212bf2db5216ff0e /src | |
parent | f3814081ef4b7355dabd1f04cbbe8e3fc19410d8 (diff) | |
download | GT5-Unofficial-55e95b68ca039042ddb0e80933aa57c5839678d6.tar.gz GT5-Unofficial-55e95b68ca039042ddb0e80933aa57c5839678d6.tar.bz2 GT5-Unofficial-55e95b68ca039042ddb0e80933aa57c5839678d6.zip |
Remove unneeded recipe constant, fix sb compressor (#3344)
Diffstat (limited to 'src')
3 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java index 722bcf2346..18efdb07c9 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java @@ -14,7 +14,6 @@ import static gregtech.api.metatileentity.BaseTileEntity.STALLED_STUTTERING_TOOL import static gregtech.api.metatileentity.BaseTileEntity.STALLED_VENT_TOOLTIP; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.metatileentity.BaseTileEntity.UNUSED_SLOT_TOOLTIP; -import static gregtech.api.util.GTRecipeConstants.COMPRESSION_TIER; import static gregtech.api.util.GTRecipeConstants.EXPLODE; import static gregtech.api.util.GTRecipeConstants.ON_FIRE; import static gregtech.api.util.GTUtility.moveMultipleItemStacks; @@ -76,6 +75,7 @@ import gregtech.api.objects.overclockdescriber.EUOverclockDescriber; import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.recipe.BasicUIProperties; import gregtech.api.recipe.RecipeMap; +import gregtech.api.recipe.metadata.CompressionTierKey; import gregtech.api.render.TextureFactory; import gregtech.api.util.CoverBehaviorBase; import gregtech.api.util.GTClientPreference; @@ -1079,7 +1079,8 @@ public abstract class MTEBasicMachine extends MTEBasicTank implements RecipeMapW getBaseMetaTileEntity().setOnFire(); return DID_NOT_FIND_RECIPE; } - if (tRecipe.getMetadataOrDefault(COMPRESSION_TIER, 0) > 0) return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; + if (tRecipe.getMetadataOrDefault(CompressionTierKey.INSTANCE, 0) > 0) + return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; if (GTMod.gregtechproxy.mLowGravProcessing && (tRecipe.mSpecialValue == -100 || tRecipe.mSpecialValue == -300) && !isValidForLowGravity(tRecipe, getBaseMetaTileEntity().getWorld().provider.dimensionId)) return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; diff --git a/src/main/java/gregtech/api/util/GTRecipeConstants.java b/src/main/java/gregtech/api/util/GTRecipeConstants.java index dfaaff8713..d1a9f2c60a 100644 --- a/src/main/java/gregtech/api/util/GTRecipeConstants.java +++ b/src/main/java/gregtech/api/util/GTRecipeConstants.java @@ -691,7 +691,6 @@ public class GTRecipeConstants { GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(NKE_RANGE); GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(PRECISE_ASSEMBLER_CASING_TIER); GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COAL_CASING_TIER); - GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(COMPRESSION_TIER); GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(RESEARCH_STATION_DATA); GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(SIEVERTS); GTRecipeMapUtil.SPECIAL_VALUE_ALIASES.add(DECAY_TICKS); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 539d64533b..d699429a0c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -19,7 +19,6 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT; -import static gregtech.api.util.GTRecipeConstants.COMPRESSION_TIER; import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import static gregtech.api.util.GTUtility.calculateRecipeEU; |