From ad791089ca9d1f98e74c38d8354846c1c1b7979e Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:33:26 +1000 Subject: [PATCH] Cleanup Universal Crystalizer Code --- .../MetaTileEntityUniversalCrystalizer.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityUniversalCrystalizer.java b/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityUniversalCrystalizer.java index 144c31b2..7e01e943 100644 --- a/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityUniversalCrystalizer.java +++ b/src/main/java/com/nomiceu/nomilabs/gregtech/metatileentity/multiblock/MetaTileEntityUniversalCrystalizer.java @@ -24,7 +24,6 @@ import com.nomiceu.nomilabs.gregtech.recipe.LabsRecipeMaps; import com.nomiceu.nomilabs.util.LabsModeHelper; -import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; import gregicality.multiblocks.api.render.GCYMTextures; import gregicality.multiblocks.common.block.GCYMMetaBlocks; @@ -83,23 +82,18 @@ protected BlockPattern createStructurePattern() { .build(); } + /** + * Allow usage of Laser Hatches. + */ @Override public TraceabilityPredicate autoAbilities() { - return abilities(MultiblockAbility.MAINTENANCE_HATCH) - .setMinGlobalLimited(1) - .setMaxGlobalLimited(1) - .or(abilities(GCYMMultiblockAbility.PARALLEL_HATCH) - .setMaxGlobalLimited(1)) - .or(abilities(MultiblockAbility.IMPORT_ITEMS) - .setMinGlobalLimited(1)) - .or(abilities(MultiblockAbility.IMPORT_FLUIDS) - .setMinGlobalLimited(1)) - .or(abilities(MultiblockAbility.EXPORT_ITEMS) - .setMinGlobalLimited(1)) + // Don't get the energy (we do that ourselves) or fluid export (not needed for UC) from super + return super.autoAbilities(false, true, true, true, true, false, true) .or(abilities(MultiblockAbility.INPUT_ENERGY, MultiblockAbility.SUBSTATION_INPUT_ENERGY, MultiblockAbility.INPUT_LASER) .setMinGlobalLimited(1) - .setMaxGlobalLimited(2)); + .setMaxGlobalLimited(2) + .setPreviewCount(1)); } @Override