diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityBlender.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityBlender.java index d9cdcb9fe..3450e4fe6 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityBlender.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityBlender.java @@ -63,7 +63,7 @@ protected BlockPattern createStructurePattern() { .where('X', casing.or(abilities)) .where('P', states(getPipeCasingState())) .where('D', states(MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STAINLESS_CLEAN))) - .where('E', states(MetaBlocks.FRAMES.get(Materials.StainlessSteel).getBlock(Materials.StainlessSteel))) + .where('E', frames(Materials.StainlessSteel)) .where('C', states(MetaBlocks.TURBINE_CASING.getState(TurbineCasingType.STAINLESS_STEEL_GEARBOX))) .where(' ', any()) .build(); @@ -75,11 +75,11 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.INERT_PTFE_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.PTFE_INERT_CASING); } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.POLYTETRAFLUOROETHYLENE_PIPE); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCatalyticReformer.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCatalyticReformer.java index ada50c376..047b1befd 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCatalyticReformer.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCatalyticReformer.java @@ -41,7 +41,7 @@ protected BlockPattern createStructurePattern() { .setMinGlobalLimited(24) .or(autoAbilities(true, true, true, true, true, true, false))) .where('P', states(MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.TITANIUM_PIPE))) - .where('F', states(MetaBlocks.FRAMES.get(Materials.Titanium).getBlock(Materials.Titanium))) + .where('F', frames(Materials.Titanium)) .where('M', abilities(MultiblockAbility.MUFFLER_HATCH)) .where(' ', any()) .where('#', air()) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityClarifier.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityClarifier.java index b913299bb..4f3a3b654 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityClarifier.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityClarifier.java @@ -64,7 +64,7 @@ protected BlockPattern createStructurePattern() { .where('C', states(MetaBlocks.BOILER_CASING.getState((BoilerCasingType.STEEL_PIPE)))) .where('D', states(SuSyBlocks.MULTIBLOCK_TANK.getState(BlockMultiblockTank.MultiblockTankType.CLARIFIER))) .where('E', states(MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.STEEL_GEARBOX))) - .where('F', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('F', frames(Materials.Steel)) .where(' ', any()) .build(); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCokingTower.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCokingTower.java index 83ad0ccfc..c5ed5c099 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCokingTower.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCokingTower.java @@ -53,7 +53,7 @@ protected BlockPattern createStructurePattern() { .aisle(" FF FF", " ") .where('S', this.selfPredicate()) .where('P', states(this.getPipeCasingState())) - .where('F', states(this.getFrameState())) + .where('F', frames(Materials.Steel)) .where('C', states(this.getCasingState()).setMinGlobalLimited(20) .or(this.autoAbilities())) .build(); @@ -61,13 +61,11 @@ protected BlockPattern createStructurePattern() { public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.SOLID_STEEL_CASING; } - protected IBlockState getFrameState() { - return MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel); - } - protected IBlockState getCasingState() { + + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID); } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCoolingUnit.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCoolingUnit.java index c12c13776..f9543856e 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCoolingUnit.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCoolingUnit.java @@ -51,8 +51,8 @@ protected BlockPattern createStructurePattern() { .where('S', selfPredicate()) .where('A', casingPredicate .or(autoAbilities(true, true, true, true, true, true, false))) - .where('B', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) - .where('C', states(MetaBlocks.FRAMES.get(Materials.StainlessSteel).getBlock(Materials.StainlessSteel))) + .where('B', frames(Materials.Steel)) + .where('C', frames(Materials.StainlessSteel)) .where('D', states(MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE))) .where('E', casingPredicate) .where(' ', any()) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityDumper.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityDumper.java index fd1607085..c8ae7c286 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityDumper.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityDumper.java @@ -64,7 +64,7 @@ protected BlockPattern createStructurePattern() { .aisle("BBBB", "C##A", "BBBB") .aisle("A A", "BSBB", "A A") .where('S', selfPredicate()) - .where('A', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('A', frames(Materials.Steel)) .where('B', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))) .where('C', abilities(MultiblockAbility.IMPORT_FLUIDS).setExactLimit(1)) .where(' ', any()) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityElectrolyticCell.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityElectrolyticCell.java index ebc4466fb..264605bcb 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityElectrolyticCell.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityElectrolyticCell.java @@ -54,10 +54,10 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.SOLID_STEEL_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID); } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFermentationVat.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFermentationVat.java index ceb3d34b1..1f8281e09 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFermentationVat.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFermentationVat.java @@ -40,7 +40,7 @@ protected BlockPattern createStructurePattern() { .where('X', states(MetaBlocks.MACHINE_CASING.getState(MachineCasingType.ULV)) .setMinGlobalLimited(40) .or(autoAbilities(true, true, true, true, true, true, false))) - .where('F', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('F', frames(Materials.Steel)) .where('M', abilities(MultiblockAbility.MUFFLER_HATCH)) .where(' ', any()) .where('#', air()) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFlareStack.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFlareStack.java index 8692afd01..5405d75a5 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFlareStack.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFlareStack.java @@ -213,7 +213,7 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.SOLID_STEEL_CASING; } - protected IBlockState getFireboxCasingState() { + protected static IBlockState getFireboxCasingState() { return MetaBlocks.BOILER_FIREBOX_CASING.getState(BlockFireboxCasing.FireboxCasingType.STEEL_FIREBOX); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFluidizedBedReactor.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFluidizedBedReactor.java index 661f13acc..46993e983 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFluidizedBedReactor.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityFluidizedBedReactor.java @@ -42,7 +42,7 @@ protected BlockPattern createStructurePattern() { .aisle(" ", "XPX", "XPX", "XPX", "XPX") .aisle("F F", "XSX", "XXX", "XXX", "XXX") .where('S', this.selfPredicate()) - .where('F', states(this.getFrameState())) + .where('F', frames(Materials.Steel)) .where('P', states(this.getPipeCasingState())) .where('X', states(this.getCasingState()).setMinGlobalLimited(18) .or(this.autoAbilities(true, true, true, true, true, true, false))) @@ -52,14 +52,11 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.INERT_PTFE_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.PTFE_INERT_CASING); } - protected IBlockState getFrameState() { - return MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel); - } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BoilerCasingType.POLYTETRAFLUOROETHYLENE_PIPE); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHeatExchanger.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHeatExchanger.java index 051103cfe..58a3d526e 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHeatExchanger.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHeatExchanger.java @@ -45,7 +45,7 @@ protected BlockPattern createStructurePattern() { .aisle("CCC", "CDC", "ACA") .aisle("CCC", "BSB", "ACA") .where('S', selfPredicate()) - .where('A', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('A', frames(Materials.Steel)) .where('B', autoAbilities(false, false, false, false, false, true, false).setMinGlobalLimited(2) .or(autoAbilities(false, false, false, false, true, false, false).setMinGlobalLimited(2))) .where('C', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID)) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighPressureCryogenicDistillationPlant.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighPressureCryogenicDistillationPlant.java index 6c92417df..349f1850e 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighPressureCryogenicDistillationPlant.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighPressureCryogenicDistillationPlant.java @@ -64,7 +64,7 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.FROST_PROOF_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.ALUMINIUM_FROSTPROOF); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighTemperatureDistillationTower.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighTemperatureDistillationTower.java index b2672edd9..749e594c7 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighTemperatureDistillationTower.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityHighTemperatureDistillationTower.java @@ -70,7 +70,7 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return SusyTextures.SILICON_CARBIDE_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return SuSyBlocks.MULTIBLOCK_CASING.getState(BlockSuSyMultiblockCasing.CasingType.SILICON_CARBIDE_CASING); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLargeWeaponsFactory.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLargeWeaponsFactory.java index 634c1544f..540b9bbec 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLargeWeaponsFactory.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLargeWeaponsFactory.java @@ -48,7 +48,7 @@ protected BlockPattern createStructurePattern() { .where('S', selfPredicate()) .where('A', casingPredicate) .where('B', states(MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.STEEL_GEARBOX))) - .where('C', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel)) + .where('C', frames(Materials.Steel) .or(autoAbilities(false, true, false, false, false, false, false).setExactLimit(1))) .where('D', casingPredicate .or(autoAbilities(false, false, true, false, true, false, false))) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLowPressureCryogenicDistillationPlant.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLowPressureCryogenicDistillationPlant.java index c82cd8761..5fd9cdb59 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLowPressureCryogenicDistillationPlant.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityLowPressureCryogenicDistillationPlant.java @@ -83,7 +83,7 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.FROST_PROOF_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.ALUMINIUM_FROSTPROOF); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMiningDrill.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMiningDrill.java index 47e993213..cae61d131 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMiningDrill.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMiningDrill.java @@ -5,6 +5,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; @@ -65,7 +66,7 @@ protected BlockPattern createStructurePattern() { .aisle(" ", " DDDDD ", " DDDDD ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ") .where('S', selfPredicate()) .where('A', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))) - .where('B', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel)).setMinGlobalLimited(275) + .where('B', frames(Materials.Steel) .or(autoAbilities(true, true, true, true, true, true, false))) .where('C', states(MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.STEEL_GEARBOX))) .where('D', states(MetaBlocks.STONE_BLOCKS.get(StoneVariantBlock.StoneVariant.SMOOTH).getState(StoneVariantBlock.StoneType.CONCRETE_LIGHT))) @@ -77,6 +78,33 @@ protected BlockPattern createStructurePattern() { .build(); } + @Override + public TraceabilityPredicate autoAbilities(boolean checkEnergyIn, boolean checkMaintenance, boolean checkItemIn, boolean checkItemOut, boolean checkFluidIn, boolean checkFluidOut, boolean checkMuffler) { + TraceabilityPredicate predicate = super.autoAbilities(checkMaintenance, checkMuffler); + if (checkEnergyIn) { + predicate = predicate.or(abilities(MultiblockAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)); + } + + if (checkItemIn && this.recipeMap.getMaxInputs() > 0) { + predicate = predicate.or(abilities(MultiblockAbility.IMPORT_ITEMS).setMaxGlobalLimited(2).setPreviewCount(1)); + } + + if (checkItemOut && this.recipeMap.getMaxOutputs() > 0) { + predicate = predicate.or(abilities(MultiblockAbility.EXPORT_ITEMS).setMaxGlobalLimited(2).setPreviewCount(1)); + } + + if (checkFluidIn && this.recipeMap.getMaxFluidInputs() > 0) { + predicate = predicate.or(abilities(MultiblockAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)); + } + + if (checkFluidOut && this.recipeMap.getMaxFluidOutputs() > 0) { + predicate = predicate.or(abilities(MultiblockAbility.EXPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)); + } + + return predicate; + } + + @Override public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) { return Textures.SOLID_STEEL_CASING; @@ -172,4 +200,9 @@ protected boolean setupAndConsumeRecipeInputs(Recipe recipe, IItemHandlerModifia public boolean allowsExtendedFacing() { return false; } + + @Override + public boolean allowsFlip() { + return true; + } } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMultiStageFlashDistiller.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMultiStageFlashDistiller.java index fc8e08d42..8c9c3b242 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMultiStageFlashDistiller.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityMultiStageFlashDistiller.java @@ -59,7 +59,7 @@ protected BlockPattern createStructurePattern() { .aisle(" FFF ", " FSF ", " FFF ", " FFF ", " B ") .where('S', selfPredicate()) .where('B', states(MetaBlocks.BOILER_CASING.getState((BlockBoilerCasing.BoilerCasingType.STEEL_PIPE)))) - .where('C', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('C', frames(Materials.Steel)) .where('A', casingPredicate .or(maintenanceEnergy)) .where('D', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STAINLESS_CLEAN)) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOceanPumper.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOceanPumper.java index 12ed7491e..1982bc84b 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOceanPumper.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOceanPumper.java @@ -307,19 +307,19 @@ protected ICubeRenderer getFrontOverlay() { return SusyTextures.OCEANIC_DRILL_OVERLAY; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STEEL_SOLID); } - protected IBlockState getGrateState() { + protected static IBlockState getGrateState() { return MetaBlocks.MULTIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.GRATE_CASING); } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.STEEL_PIPE); } - protected IBlockState getConcreteState() { + protected static IBlockState getConcreteState() { return MetaBlocks.STONE_BLOCKS.get(StoneVariantBlock.StoneVariant.SMOOTH).getState(StoneVariantBlock.StoneType.CONCRETE_LIGHT); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOreSorter.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOreSorter.java index 0660f4262..1ad28d50f 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOreSorter.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityOreSorter.java @@ -39,7 +39,7 @@ protected BlockPattern createStructurePattern() { .aisle("ABBBA", "B###B", "ABBBA", " D D ") .aisle("ABSBA", "ABBBA", "ABBBA", " D D ") .where('S', selfPredicate()) - .where('A', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('A', frames(Materials.Steel)) .where('B', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID)) .setMinGlobalLimited(16) .or(autoAbilities(true, true, true, true, false, false, false))) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityPolmyerizationTank.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityPolmyerizationTank.java index 6607eee74..8c6a1bfa3 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityPolmyerizationTank.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityPolmyerizationTank.java @@ -41,7 +41,7 @@ protected BlockPattern createStructurePattern() { .aisle(" ", "XPX", "XPX", "XPX", "XPX") .aisle("F F", "XSX", "XXX", "XXX", "XXX") .where('S', this.selfPredicate()) - .where('F', states(this.getFrameState())) + .where('F', frames(Materials.Steel)) .where('P', states(this.getPipeCasingState())) .where('X', states(this.getCasingState()).setMinGlobalLimited(18) .or(this.autoAbilities(true, true, true, true, true, true, false))) @@ -51,14 +51,11 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.SOLID_STEEL_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID); } - protected IBlockState getFrameState() { - return MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel); - } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityQuencher.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityQuencher.java index bff568d41..a53b265b0 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityQuencher.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityQuencher.java @@ -47,7 +47,7 @@ protected BlockPattern createStructurePattern() { .where('A', casingPredicate) .where('B', states(MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE))) .where('C', states(MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.STAINLESS_STEEL_GEARBOX))) - .where('D', states(MetaBlocks.FRAMES.get(Materials.StainlessSteel).getBlock(Materials.StainlessSteel))) + .where('D', frames(Materials.StainlessSteel)) .where('F', autoAbilities(false, false, false, false, false, true, false).setExactLimit(1) .or(autoAbilities(false, false, false, false, true, false, false).setExactLimit(1))) .where('G', casingPredicate diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRailroadEngineeringStation.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRailroadEngineeringStation.java index 3e73bc409..88512b7d0 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRailroadEngineeringStation.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRailroadEngineeringStation.java @@ -129,7 +129,7 @@ protected BlockPattern createStructurePattern() { .aisle(" ", " ", " ", " ", " ", " ", " ", " ", " F F ", " ") .aisle(" ", " ", " ", " ", " ", " ", " ", " ", " F F ", " ") .where('S', selfPredicate()) - .where('F', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('F', frames(Materials.Steel)) .where('M', states(MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID))) .where('G', states(MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.STEEL_GEARBOX))) .where('C', states(MetaBlocks.STONE_BLOCKS.get(StoneVariantBlock.StoneVariant.SMOOTH).getState(StoneVariantBlock.StoneType.CONCRETE_LIGHT))) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityReactionFurnace.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityReactionFurnace.java index 0f9b64ee0..056fb7825 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityReactionFurnace.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityReactionFurnace.java @@ -49,7 +49,7 @@ protected BlockPattern createStructurePattern() { .where('X', states(MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.INVAR_HEATPROOF)).setMinGlobalLimited(13) .or(autoAbilities(true, true, true, true, true, true, false))) .where('P', states(MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.STEEL_PIPE))) - .where('F', states(MetaBlocks.FRAMES.get(Materials.Invar).getBlock(Materials.Invar))) + .where('F', frames(Materials.Invar)) .where('M', abilities(MultiblockAbility.MUFFLER_HATCH)) .where('B', states(MetaBlocks.BOILER_FIREBOX_CASING.getState(BlockFireboxCasing.FireboxCasingType.STEEL_FIREBOX))) .where('#', air()) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRotaryKiln.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRotaryKiln.java index 413b1df19..ce4671c1e 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRotaryKiln.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityRotaryKiln.java @@ -59,7 +59,7 @@ protected BlockPattern createStructurePattern() { .aisle("A A A", "A A A", "LCCCCMCCCCR", "L#########R", "LCCCCMCCCCR") .aisle("A A A", "A A A", "L A R", "LCCCCSCCCCR", "L A R") .where('S', selfPredicate()) - .where('A', states(MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel))) + .where('A', frames(Materials.Steel)) .where('C', states(MetaBlocks.STONE_BLOCKS.get(StoneVariantBlock.StoneVariant.SMOOTH).getState(StoneVariantBlock.StoneType.CONCRETE_LIGHT))) .where('L', casingPredicate .or(autoAbilities(false, false, true, false, false, true, false)) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySingleColumnCryogenicDistillationPlant.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySingleColumnCryogenicDistillationPlant.java index 63aad6bf5..74d9b98b3 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySingleColumnCryogenicDistillationPlant.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySingleColumnCryogenicDistillationPlant.java @@ -84,7 +84,7 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.FROST_PROOF_CASING; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.ALUMINIUM_FROSTPROOF); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySinteringOven.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySinteringOven.java index a321a7e6f..153310623 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySinteringOven.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySinteringOven.java @@ -12,9 +12,6 @@ import gregtech.api.recipes.Recipe; import gregtech.api.unification.material.Materials; import gregtech.client.renderer.ICubeRenderer; -import gregtech.client.renderer.texture.Textures; -import gregtech.common.blocks.BlockMachineCasing; -import gregtech.common.blocks.MetaBlocks; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; @@ -68,14 +65,10 @@ protected ICubeRenderer getFrontOverlay() { return SusyTextures.SINTERING_OVERLAY; } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return SuSyBlocks.MULTIBLOCK_CASING.getState(BlockSuSyMultiblockCasing.CasingType.ULV_STRUCTURAL_CASING); } - protected IBlockState getFrameState() { - return MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel); - } - @NotNull @Override public BlockPattern createStructurePattern() { @@ -99,7 +92,7 @@ public BlockPattern createStructurePattern() { .or(autoAbilities(true, true, false, true, true, false, false))) .where('C', casingPredicate .or(autoAbilities(false, false, true, false, false, true, false))) - .where('F', states(getFrameState())) + .where('F', frames(Materials.Steel)) .where('B', SuSyPredicates.sinteringBricks()) .where('#', air()) .where(' ', any()) diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySmokeStack.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySmokeStack.java index 18e9dcd8a..f06819641 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySmokeStack.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntitySmokeStack.java @@ -194,7 +194,7 @@ public void addInformation(ItemStack stack, @Nullable World world, @NotNull List public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.SOLID_STEEL_CASING; } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE); } diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityVacuumDistillationTower.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityVacuumDistillationTower.java index 6635ccef9..c61446e6d 100644 --- a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityVacuumDistillationTower.java +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityVacuumDistillationTower.java @@ -51,7 +51,7 @@ protected BlockPattern createStructurePattern() { .where('S', this.selfPredicate()) .where('G', states(this.getGlassState())) .where('P', states(this.getPipeCasingState())) - .where('F', states(this.getFrameState())) + .where('F', frames(Materials.Steel)) .where('C', states(this.getCasingState()) .or(abilities(MultiblockAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(3)) .or(abilities(MultiblockAbility.IMPORT_FLUIDS).setMaxGlobalLimited(1)) @@ -70,16 +70,14 @@ protected BlockPattern createStructurePattern() { public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { return Textures.SOLID_STEEL_CASING; } - protected IBlockState getFrameState() { - return MetaBlocks.FRAMES.get(Materials.Steel).getBlock(Materials.Steel); - } - protected IBlockState getGlassState() { + + protected static IBlockState getGlassState() { return MetaBlocks.TRANSPARENT_CASING.getState(BlockGlassCasing.CasingType.TEMPERED_GLASS); } - protected IBlockState getCasingState() { + protected static IBlockState getCasingState() { return MetaBlocks.METAL_CASING.getState(MetalCasingType.STEEL_SOLID); } - protected IBlockState getPipeCasingState() { + protected static IBlockState getPipeCasingState() { return MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE); }