From 3d2c39fb651e240d4bf0b27d36cd1d7542da5c10 Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Wed, 11 Sep 2024 22:39:09 -0400 Subject: [PATCH] Whoops, normal multiblocks aren't supposed to use laser hatches! --- .../zbgt/api/pattern/TraceabilityPredicates.java | 13 ------------- .../multi/electric/quads/MetaTileEntityQuadEBF.java | 5 ++++- .../multi/electric/quads/MetaTileEntityQueezer.java | 8 ++++++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zorbatron/zbgt/api/pattern/TraceabilityPredicates.java b/src/main/java/com/zorbatron/zbgt/api/pattern/TraceabilityPredicates.java index f79be00e..a394b3ca 100644 --- a/src/main/java/com/zorbatron/zbgt/api/pattern/TraceabilityPredicates.java +++ b/src/main/java/com/zorbatron/zbgt/api/pattern/TraceabilityPredicates.java @@ -190,19 +190,6 @@ public static TraceabilityPredicate maintenanceOrParallel(MultiblockControllerBa return predicate; } - public static TraceabilityPredicate autoEnergyInputs(int min, int max, int previewCount) { - return new TraceabilityPredicate(abilities(MultiblockAbility.INPUT_ENERGY, MultiblockAbility.INPUT_LASER) - .setMinGlobalLimited(min).setMaxGlobalLimited(max).setPreviewCount(previewCount)); - } - - public static TraceabilityPredicate autoEnergyInputs(int min, int max) { - return autoEnergyInputs(min, max, 2); - } - - public static TraceabilityPredicate autoEnergyInputs() { - return autoEnergyInputs(1, 3); - } - public static Supplier getMaintenanceHatchMTE() { return () -> ConfigHolder.machines.enableMaintenance ? MetaTileEntities.MAINTENANCE_HATCH : MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.INVAR_HEATPROOF); diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQuadEBF.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQuadEBF.java index 6e0af1f6..413cb5fb 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQuadEBF.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQuadEBF.java @@ -79,7 +79,10 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { .where('C', heatingCoils()) .where('X', states(getCasingState()) .or(autoAbilities(false, true, true, true, true, true, false)) - .or(TraceabilityPredicates.autoEnergyInputs(1, 8))) + .or(abilities(MultiblockAbility.INPUT_ENERGY) + .setMinGlobalLimited(1) + .setMaxGlobalLimited(8) + .setPreviewCount(8))) .where('M', abilities(MultiblockAbility.MUFFLER_HATCH)) .where('#', air()) .build(); diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQueezer.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQueezer.java index 7cb91361..e3b0d71f 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQueezer.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quads/MetaTileEntityQueezer.java @@ -15,6 +15,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; +import gregtech.api.metatileentity.multiblock.MultiblockAbility; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; import gregtech.api.pattern.BlockPattern; import gregtech.api.pattern.FactoryBlockPattern; @@ -46,8 +47,11 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { .where('S', selfPredicate()) .where('X', states(getCasingState()) .or(TraceabilityPredicates.autoBusesAndHatches(getRecipeMap())) - .or(TraceabilityPredicates.autoEnergyInputs(1, 8)) - .or(TraceabilityPredicates.maintenanceOrParallel(this))) + .or(TraceabilityPredicates.maintenanceOrParallel(this)) + .or(abilities(MultiblockAbility.INPUT_ENERGY) + .setMinGlobalLimited(1) + .setMaxGlobalLimited(8) + .setPreviewCount(8))) .where('#', air()) .build(); }