Merge pull request #343 from SymmetricDevs/catalytic-reforming-change

Swap titanium with stainless in catalytic reformer
SymmetricDevs · Dec 1, 2024 · 175310a · 175310a
2 parents a19575b + c4adc96
commit 175310a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCatalyticReformer.java b/...supersymmetry/common/metatileentities/multi/electric/MetaTileEntityCatalyticReformer.java
@@ -37,11 +37,13 @@ protected BlockPattern createStructurePattern() {
                 .aisle("     ", "XXXPX", "X###M", "XXXPX")
                 .aisle("F   F", "XXXPX", "XSXPX", "XXXPX")
                 .where('S', selfPredicate())
-                .where('X', states(MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.TITANIUM_STABLE))
+                .where('X', states(MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STAINLESS_CLEAN),
+                        MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.TITANIUM_STABLE))
                         .setMinGlobalLimited(24)
                         .or(autoAbilities(true, true, true, true, true, true, false)))
-                .where('P', states(MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.TITANIUM_PIPE)))
-                .where('F', frames(Materials.Titanium))
+                .where('P', states(MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.STEEL_PIPE),
+                        MetaBlocks.BOILER_CASING.getState(BlockBoilerCasing.BoilerCasingType.TITANIUM_PIPE)))
+                .where('F', frames(Materials.StainlessSteel, Materials.Titanium))
                 .where('M', abilities(MultiblockAbility.MUFFLER_HATCH))
                 .where(' ', any())
                 .where('#', air())
@@ -50,7 +52,7 @@ protected BlockPattern createStructurePattern() {
 
     @Override
     public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
-        return Textures.STABLE_TITANIUM_CASING;
+        return Textures.CLEAN_STAINLESS_STEEL_CASING;
     }
 
     @Nonnull

diff --git a/...symmetry/common/metatileentities/multi/electric/MetaTileEntitySieveDistillationTower.java b/...symmetry/common/metatileentities/multi/electric/MetaTileEntitySieveDistillationTower.java
@@ -13,6 +13,7 @@
 import gregtech.api.pattern.FactoryBlockPattern;
 import gregtech.api.pattern.PatternMatchContext;
 import gregtech.api.recipes.Recipe;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.util.GTTransferUtils;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.TextComponentUtil;
@@ -76,7 +77,7 @@ protected void addDisplayText(List<ITextComponent> textList) {
     protected @NotNull BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start(RIGHT, FRONT, UP)
                 .aisle("YSY", "YYY", "YYY")
-                .aisle("XXX", "X#X", "XXX").setRepeatable(1, 11)
+                .aisle("FXF", "X#X", "FXF").setRepeatable(1, 11)
                 .aisle("XXX", "XXX", "XXX")
                 .where('S', selfPredicate())
                 .where('Y', states(getCasingState())
@@ -87,6 +88,7 @@ protected void addDisplayText(List<ITextComponent> textList) {
                         .or(abilities(MultiblockAbility.EXPORT_FLUIDS).setMaxLayerLimited(1, 1))
                         .or(autoAbilities(true, false)))
                 .where('#', states(getSieveState()))
+                .where('F', frames(Materials.StainlessSteel))
                 .build();
     }