Correct the slot coordinates of washing factory

gradle/forge.versions.toml

@@ -20,7 +20,7 @@ modernfix = "4SPHwiDB" # 5.24.3+mc1.21.1
 ## curseforge maven ##
 mekanismcovers = "6071684"
 igleelibrary = "7000755"
-evolvedmekanism = "7161187"
+evolvedmekanism = "7321395"
 immersiveengineering = "6733669"
 
 ## libs ##

src/main/java/com/jerry/datagen/common/recipe/imp/MoreMachineRecipeProvider.java

@@ -234,30 +234,32 @@ private void addMiscRecipes(RecipeOutput consumer) {
                 .build(consumer, Mekmm.rl("large_solar_neutron_activator"));
 
         // 大热力
-        MoreMachineDataShapedRecipeBuilder.shapedRecipe(LargeGeneratorBlocks.LARGE_HEAT_GENERATOR)
-                .pattern(RecipePattern.createPattern(
-                        RecipePattern.TripleLine.of(Pattern.BLOCK, 'S', Pattern.BLOCK),
-                        RecipePattern.TripleLine.of(Pattern.TANK, Pattern.ROBIT, Pattern.TANK),
-                        RecipePattern.TripleLine.of(Pattern.BLOCK, 'S', Pattern.BLOCK)))
-                .key(Pattern.BLOCK, MekanismTags.Items.STORAGE_BLOCKS_STEEL)
-                .key('S', MekanismBlocks.SUPERHEATING_ELEMENT)
-                .key(Pattern.TANK, MekanismBlocks.ULTIMATE_FLUID_TANK)
-                .key(Pattern.ROBIT, MekanismItems.ROBIT)
-                .addCondition(new ModLoadedCondition("mekanismgenerators"))
-                .build(consumer, Mekmm.rl("large_heat_generator"));
+        if (Mekmm.hooks.mekanismgenerators.isLoaded()) {
+            MoreMachineDataShapedRecipeBuilder.shapedRecipe(LargeGeneratorBlocks.LARGE_HEAT_GENERATOR)
+                    .pattern(RecipePattern.createPattern(
+                            RecipePattern.TripleLine.of(Pattern.BLOCK, 'S', Pattern.BLOCK),
+                            RecipePattern.TripleLine.of(Pattern.TANK, Pattern.ROBIT, Pattern.TANK),
+                            RecipePattern.TripleLine.of(Pattern.BLOCK, 'S', Pattern.BLOCK)))
+                    .key(Pattern.BLOCK, MekanismTags.Items.STORAGE_BLOCKS_STEEL)
+                    .key('S', MekanismBlocks.SUPERHEATING_ELEMENT)
+                    .key(Pattern.TANK, MekanismBlocks.ULTIMATE_FLUID_TANK)
+                    .key(Pattern.ROBIT, MekanismItems.ROBIT)
+                    .addCondition(new ModLoadedCondition("mekanismgenerators"))
+                    .build(consumer, Mekmm.rl("large_heat_generator"));
 
-        // 大燃气
-        MoreMachineDataShapedRecipeBuilder.shapedRecipe(LargeGeneratorBlocks.LARGE_GAS_BURNING_GENERATOR)
-                .pattern(RecipePattern.createPattern(
-                        RecipePattern.TripleLine.of(Pattern.TANK, 'E', Pattern.TANK),
-                        RecipePattern.TripleLine.of(Pattern.BLOCK, Pattern.ROBIT, Pattern.BLOCK),
-                        RecipePattern.TripleLine.of(Pattern.TANK, 'E', Pattern.TANK)))
-                .key(Pattern.TANK, LargeMachineBlocks.ULTIMATE_MAX_CHEMICAL_TANK)
-                .key('E', MoreMachineItems.ADVANCED_ELECTROLYSIS_CORE)
-                .key(Pattern.BLOCK, MekanismTags.Items.STORAGE_BLOCKS_STEEL)
-                .key(Pattern.ROBIT, MekanismItems.ROBIT)
-                .addCondition(new ModLoadedCondition("mekanismgenerators"))
-                .build(consumer, Mekmm.rl("large_gas_burning_generator"));
+            // 大燃气
+            MoreMachineDataShapedRecipeBuilder.shapedRecipe(LargeGeneratorBlocks.LARGE_GAS_BURNING_GENERATOR)
+                    .pattern(RecipePattern.createPattern(
+                            RecipePattern.TripleLine.of(Pattern.TANK, 'E', Pattern.TANK),
+                            RecipePattern.TripleLine.of(Pattern.BLOCK, Pattern.ROBIT, Pattern.BLOCK),
+                            RecipePattern.TripleLine.of(Pattern.TANK, 'E', Pattern.TANK)))
+                    .key(Pattern.TANK, LargeMachineBlocks.ULTIMATE_MAX_CHEMICAL_TANK)
+                    .key('E', MoreMachineItems.ADVANCED_ELECTROLYSIS_CORE)
+                    .key(Pattern.BLOCK, MekanismTags.Items.STORAGE_BLOCKS_STEEL)
+                    .key(Pattern.ROBIT, MekanismItems.ROBIT)
+                    .addCondition(new ModLoadedCondition("mekanismgenerators"))
+                    .build(consumer, Mekmm.rl("large_gas_burning_generator"));
+        }
     }
 
     private void addGearModuleRecipes(RecipeOutput consumer) {}

src/main/java/com/jerry/mekaf/common/content/blocktype/AdvancedFactory.java

@@ -47,7 +47,7 @@ private void setMachineData(FactoryTier tier) {
         }
     }
 
-    public static class AdvancedFactoryBuilder<FACTORY extends AdvancedFactory<TILE>, TILE extends TileEntityAdvancedFactoryBase<?>, T extends MMMachineBuilder<FACTORY, TILE, T>>
+    public static class AdvancedFactoryBuilder<FACTORY extends AdvancedFactory<TILE>, TILE extends TileEntityAdvancedFactoryBase<?>, T extends MoreMachineMachineBuilder<FACTORY, TILE, T>>
                                               extends BlockTileBuilder<FACTORY, TILE, T> {
 
         protected AdvancedFactoryBuilder(FACTORY holder) {

src/main/java/com/jerry/mekaf/common/registries/AdvancedFactoryBlockTypes.java

@@ -30,7 +30,7 @@ private AdvancedFactoryBlockTypes() {}
     private static final Table<FactoryTier, AdvancedFactoryType, AdvancedFactory<?>> AF_FACTORIES = HashBasedTable.create();
 
     // Chemical Oxidizer
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalOxidizer> CHEMICAL_OXIDIZER = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalOxidizer> CHEMICAL_OXIDIZER = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.CHEMICAL_OXIDIZER, MekanismLang.DESCRIPTION_CHEMICAL_OXIDIZER, AdvancedFactoryType.OXIDIZING)
             .withGui(() -> MekanismContainerTypes.CHEMICAL_OXIDIZER)
             .withSound(MekanismSounds.CHEMICAL_OXIDIZER)
@@ -41,7 +41,7 @@ private AdvancedFactoryBlockTypes() {}
             .build();
 
     // Chemical Dissolution Chamber
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalDissolutionChamber> CHEMICAL_DISSOLUTION_CHAMBER = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalDissolutionChamber> CHEMICAL_DISSOLUTION_CHAMBER = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.CHEMICAL_DISSOLUTION_CHAMBER, MekanismLang.DESCRIPTION_CHEMICAL_DISSOLUTION_CHAMBER, AdvancedFactoryType.DISSOLVING)
             .withGui(() -> MekanismContainerTypes.CHEMICAL_DISSOLUTION_CHAMBER)
             .withSound(MekanismSounds.CHEMICAL_DISSOLUTION_CHAMBER)
@@ -53,7 +53,7 @@ private AdvancedFactoryBlockTypes() {}
             .build();
 
     // Chemical Infuser
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalInfuser> CHEMICAL_INFUSER = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalInfuser> CHEMICAL_INFUSER = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.CHEMICAL_INFUSER, MekanismLang.DESCRIPTION_CHEMICAL_INFUSER, AdvancedFactoryType.CHEMICAL_INFUSING)
             .withGui(() -> MekanismContainerTypes.CHEMICAL_INFUSER)
             .withSound(MekanismSounds.CHEMICAL_INFUSER)
@@ -64,7 +64,7 @@ private AdvancedFactoryBlockTypes() {}
             .build();
 
     // Chemical Washer
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalWasher> CHEMICAL_WASHER = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalWasher> CHEMICAL_WASHER = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.CHEMICAL_WASHER, MekanismLang.DESCRIPTION_CHEMICAL_WASHER, AdvancedFactoryType.WASHING)
             .withGui(() -> MekanismContainerTypes.CHEMICAL_WASHER)
             .withSound(MekanismSounds.CHEMICAL_WASHER)
@@ -75,7 +75,7 @@ private AdvancedFactoryBlockTypes() {}
             .build();
 
     // Pressurized Reaction Chamber
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityPressurizedReactionChamber> PRESSURIZED_REACTION_CHAMBER = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityPressurizedReactionChamber> PRESSURIZED_REACTION_CHAMBER = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.PRESSURIZED_REACTION_CHAMBER, MekanismLang.DESCRIPTION_PRESSURIZED_REACTION_CHAMBER, AdvancedFactoryType.PRESSURISED_REACTING)
             .withGui(() -> MekanismContainerTypes.PRESSURIZED_REACTION_CHAMBER)
             .withSound(MekanismSounds.PRESSURIZED_REACTION_CHAMBER)
@@ -86,7 +86,7 @@ private AdvancedFactoryBlockTypes() {}
             .build();
 
     // Chemical Crystallizer
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalCrystallizer> CHEMICAL_CRYSTALLIZER = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityChemicalCrystallizer> CHEMICAL_CRYSTALLIZER = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.CHEMICAL_CRYSTALLIZER, MekanismLang.DESCRIPTION_CHEMICAL_CRYSTALLIZER, AdvancedFactoryType.CRYSTALLIZING)
             .withGui(() -> MekanismContainerTypes.CHEMICAL_CRYSTALLIZER)
             .withSound(MekanismSounds.CHEMICAL_CRYSTALLIZER)
@@ -97,7 +97,7 @@ private AdvancedFactoryBlockTypes() {}
             .build();
 
     // Isotopic Centrifuge
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityIsotopicCentrifuge> ISOTOPIC_CENTRIFUGE = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityIsotopicCentrifuge> ISOTOPIC_CENTRIFUGE = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.ISOTOPIC_CENTRIFUGE, MekanismLang.DESCRIPTION_ISOTOPIC_CENTRIFUGE, AdvancedFactoryType.CENTRIFUGING)
             .withGui(() -> MekanismContainerTypes.ISOTOPIC_CENTRIFUGE)
             .withEnergyConfig(MekanismConfig.usage.isotopicCentrifuge, MekanismConfig.storage.isotopicCentrifuge)
@@ -109,7 +109,7 @@ private AdvancedFactoryBlockTypes() {}
             .build();
 
     // Nutritional Liquifier
-    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityNutritionalLiquifier> NUTRITIONAL_LIQUIFIER = MoreMachineMachine.MMMachineBuilder
+    public static final MoreMachineMachine.MoreMachineFactoryMachine<TileEntityNutritionalLiquifier> NUTRITIONAL_LIQUIFIER = MoreMachineMachine.MoreMachineMachineBuilder
             .createAdvancedFactoryMachine(() -> MekanismTileEntityTypes.NUTRITIONAL_LIQUIFIER, MekanismLang.DESCRIPTION_NUTRITIONAL_LIQUIFIER, AdvancedFactoryType.LIQUIFYING)
             .withGui(() -> MekanismContainerTypes.NUTRITIONAL_LIQUIFIER)
             .withEnergyConfig(MekanismConfig.usage.nutritionalLiquifier, MekanismConfig.storage.nutritionalLiquifier)

src/main/java/com/jerry/mekaf/common/tile/factory/TileEntityWashingFactory.java

@@ -119,7 +119,7 @@ protected void addSlots(InventorySlotHelper builder, IContentsListener listener,
 
     private int slotX() {
         if (Mekmm.hooks.evolvedMekanism.isLoaded() && tier.ordinal() >= EMFactoryTier.OVERCLOCKED.ordinal()) {
-            return 214 + 8 * tier.ordinal();
+            return 214 + 38 * (tier.ordinal() - 3);
         }
         return tier == FactoryTier.ULTIMATE ? 214 : 180;
     }

src/main/java/com/jerry/mekmm/client/recipe_viewer/jei/MMCatalystRegistryHelper.java

@@ -23,8 +23,8 @@ public class MMCatalystRegistryHelper {
     private MMCatalystRegistryHelper() {}
 
     /**
-     * 用于往“ENERGY_CONVERSION”或“CHEMICAL_CONVERSION”添加新机器，与Mekanism的CatalystRegistryHelper中的register方法
-     * 功能是一致的，只是多了一个需否需要基础机器的参数，平常使用可以直接填true，对于“ENERGY_CONVERSION”或“CHEMICAL_CONVERSION”
+     * 与Mekanism的CatalystRegistryHelper中的register方法功能是一致的，只是多了一个需否需要基础机器的参数，
+     * 平常使用可以直接填true，对于“ENERGY_CONVERSION”或“CHEMICAL_CONVERSION”
      * 可能得填写false。
      *
      * @param needOrdinary 是否需要注册最基础的机器

src/main/java/com/jerry/mekmm/common/content/blocktype/MoreMachineFactory.java

@@ -1,6 +1,7 @@
 package com.jerry.mekmm.common.content.blocktype;
 
 import com.jerry.mekmm.common.block.attribute.MoreMachineAttributeFactoryType;
+import com.jerry.mekmm.common.content.blocktype.MoreMachineMachine.MoreMachineFactoryMachine;
 import com.jerry.mekmm.common.registries.MoreMachineBlocks;
 import com.jerry.mekmm.common.registries.MoreMachineContainerTypes;
 import com.jerry.mekmm.common.tile.factory.TileEntityMoreMachineFactory;
@@ -19,7 +20,7 @@
 
 import java.util.function.Supplier;
 
-public class MoreMachineFactory<TILE extends TileEntityMoreMachineFactory<?>> extends MoreMachineMachine.MoreMachineFactoryMachine<TILE> {
+public class MoreMachineFactory<TILE extends TileEntityMoreMachineFactory<?>> extends MoreMachineFactoryMachine<TILE> {
 
     private final MoreMachineFactoryMachine<?> origMachine;
 
@@ -41,7 +42,7 @@ private void setMachineData(FactoryTier tier) {
         add(new AttributeEnergy(origEnergy::getUsage, () -> MathUtils.clampToLong(Math.max(origEnergy.getConfigStorage() * 0.5, origEnergy.getUsage()) * tier.processes)));
     }
 
-    public static class MoreMachineFactoryBuilder<FACTORY extends MoreMachineFactory<TILE>, TILE extends TileEntityMoreMachineFactory<?>, T extends MMMachineBuilder<FACTORY, TILE, T>>
+    public static class MoreMachineFactoryBuilder<FACTORY extends MoreMachineFactory<TILE>, TILE extends TileEntityMoreMachineFactory<?>, T extends MoreMachineMachineBuilder<FACTORY, TILE, T>>
                                                  extends BlockTileBuilder<FACTORY, TILE, T> {
 
         protected MoreMachineFactoryBuilder(FACTORY holder) {

src/main/java/com/jerry/mekmm/common/content/blocktype/MoreMachineMachine.java

@@ -53,25 +53,25 @@ public AdvancedFactoryType getAdvancedFactoryType() {
         }
     }
 
-    public static class MMMachineBuilder<MACHINE extends MoreMachineMachine<TILE>, TILE extends TileEntityMekanism, T extends MMMachineBuilder<MACHINE, TILE, T>> extends BlockTileBuilder<MACHINE, TILE, T> {
+    public static class MoreMachineMachineBuilder<MACHINE extends MoreMachineMachine<TILE>, TILE extends TileEntityMekanism, T extends MoreMachineMachineBuilder<MACHINE, TILE, T>> extends BlockTileBuilder<MACHINE, TILE, T> {
 
-        protected MMMachineBuilder(MACHINE holder) {
+        protected MoreMachineMachineBuilder(MACHINE holder) {
             super(holder);
         }
 
-        public static <TILE extends TileEntityMekanism> MMMachineBuilder<MoreMachineMachine<TILE>, TILE, ?> createMMMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
-                                                                                                                            ILangEntry description) {
-            return new MMMachineBuilder<>(new MoreMachineMachine<>(tileEntityRegistrar, description));
+        public static <TILE extends TileEntityMekanism> MoreMachineMachineBuilder<MoreMachineMachine<TILE>, TILE, ?> createMoreMachineMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
+                                                                                                                                              ILangEntry description) {
+            return new MoreMachineMachineBuilder<>(new MoreMachineMachine<>(tileEntityRegistrar, description));
         }
 
-        public static <TILE extends TileEntityMekanism> MMMachineBuilder<MoreMachineFactoryMachine<TILE>, TILE, ?> createMMFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
-                                                                                                                                          ILangEntry description, MoreMachineFactoryType factoryType) {
-            return new MMMachineBuilder<>(new MoreMachineFactoryMachine<>(tileEntityRegistrar, description, factoryType));
+        public static <TILE extends TileEntityMekanism> MoreMachineMachineBuilder<MoreMachineFactoryMachine<TILE>, TILE, ?> createMoreMachineFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
+                                                                                                                                                            ILangEntry description, MoreMachineFactoryType factoryType) {
+            return new MoreMachineMachineBuilder<>(new MoreMachineFactoryMachine<>(tileEntityRegistrar, description, factoryType));
         }
 
-        public static <TILE extends TileEntityMekanism> MMMachineBuilder<MoreMachineFactoryMachine<TILE>, TILE, ?> createAdvancedFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
-                                                                                                                                                ILangEntry description, AdvancedFactoryType factoryType) {
-            return new MMMachineBuilder<>(new MoreMachineFactoryMachine<>(tileEntityRegistrar, description, factoryType));
+        public static <TILE extends TileEntityMekanism> MoreMachineMachineBuilder<MoreMachineFactoryMachine<TILE>, TILE, ?> createAdvancedFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
+                                                                                                                                                         ILangEntry description, AdvancedFactoryType factoryType) {
+            return new MoreMachineMachineBuilder<>(new MoreMachineFactoryMachine<>(tileEntityRegistrar, description, factoryType));
         }
     }
 }