a couple spotless cleanups

GregTechCEu · Dec 7, 2023 · aa31104 · aa31104
1 parent 39be480
commit aa31104
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 41 deletions.
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java
@@ -220,40 +220,22 @@ protected BlockPattern createStructurePattern() {
                 .aisle(interiorSlice).setRepeatable(heightTop - 1)
                 .aisle(topSlice)
                 .where('S', selfPredicate())
-                .where('A', states(getFuelChannelState(), getControlRodChannelState(), getCoolantChannelState()))              // A
-                                                                                                                               // for
-                                                                                                                               // interior
-                                                                                                                               // components
+                // A for interior components
+                .where('A', states(getFuelChannelState(), getControlRodChannelState(), getCoolantChannelState()))
+                // I for the inputs on the top
                 .where('I',
                         states(getVesselState()).or(abilities(MultiblockAbility.IMPORT_COOLANT,
-                                MultiblockAbility.IMPORT_FUEL_ROD, MultiblockAbility.CONTROL_ROD_PORT)))           // I
-                                                                                                                   // for
-                                                                                                                   // the
-                                                                                                                   // inputs
-                                                                                                                   // on
-                                                                                                                   // the
-                                                                                                                   // top
+                                MultiblockAbility.IMPORT_FUEL_ROD, MultiblockAbility.CONTROL_ROD_PORT)))
+                // O for the outputs on the bottom
                 .where('O',
                         states(getVesselState())
-                                .or(abilities(MultiblockAbility.EXPORT_COOLANT, MultiblockAbility.EXPORT_FUEL_ROD)))        // O
-                                                                                                                            // for
-                                                                                                                            // the
-                                                                                                                            // outputs
-                                                                                                                            // on
-                                                                                                                            // the
-                                                                                                                            // bottom
+                                .or(abilities(MultiblockAbility.EXPORT_COOLANT, MultiblockAbility.EXPORT_FUEL_ROD)))
+                // B for the vessel blocks on the walls
                 .where('B',
                         states(getVesselState())
                                 .or(abilities(MultiblockAbility.MAINTENANCE_HATCH).setMinGlobalLimited(1)
                                         .setMaxGlobalLimited(1))
-                                .or(abilities(MultiblockAbility.EXPORT_FLUIDS).setMinGlobalLimited(1)))                   // B
-                                                                                                                          // for
-                                                                                                                          // the
-                                                                                                                          // vessel
-                                                                                                                          // blocks
-                                                                                                                          // on
-                                                                                                                          // the
-                                                                                                                          // walls
+                                .or(abilities(MultiblockAbility.EXPORT_FLUIDS).setMinGlobalLimited(1)))
                 .where(' ', any())
                 .build();
     }

diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntitySpentFuelPool.java
@@ -40,22 +40,14 @@ public boolean hasMaintenanceMechanics() {
     @Override
     protected BlockPattern createStructurePattern() {
         return FactoryBlockPattern.start(FRONT, UP, RIGHT)
-                .aisle("CIIIIIIIIC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC",
-                        "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC",
-                        "CCCCCCCCCC", "CCCCCCCCCC")
-                .aisle("SCCCCCCCCC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC",
-                        "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC",
-                        "CWWWWWWWWC", "CWWWWWWWWC")
-                .aisle("CCCCCCCCCC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWWWWWWWWC",
-                        "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC",
-                        "CWWWWWWWWC", "CWWWWWWWWC")
+                // spotless:off
+                .aisle("CIIIIIIIIC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC")
+                .aisle("SCCCCCCCCC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC")
+                .aisle("CCCCCCCCCC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWRRRRRRWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC")
                 .setRepeatable(1, 10)
-                .aisle("CCCCCCCCCC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC",
-                        "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC",
-                        "CWWWWWWWWC", "CWWWWWWWWC")
-                .aisle("COOOOOOOOC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC",
-                        "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC",
-                        "CCCCCCCCCC", "CCCCCCCCCC")
+                .aisle("CCCCCCCCCC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC", "CWWWWWWWWC")
+                .aisle("COOOOOOOOC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC", "CCCCCCCCCC")
+                //spotless:on
                 .where('S', selfPredicate())
                 .where('C', blocks(MetaBlocks.PANELLING))
                 .where('W', blocks(Blocks.WATER).or(blocks(Blocks.FLOWING_WATER)))