Skip to content

Adjust the method names of some methods #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lostmyself8 merged 4 commits into from
Jan 1, 2026
Merged

Adjust the method names of some methods #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e947db8
fix a server crash
lostmyself8 Dec 31, 2025
8f8cedc
Fix a bug in the recycling factory
lostmyself8 Dec 31, 2025
37b9c3c
Add optional dependencies and complete the bin model file
lostmyself8 Dec 31, 2025
6d0e6b1
hotfix
lostmyself8 Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/forge.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mekanismcovers = "6071684"
igleelibrary = "7000755"
evolvedmekanism = "7321395"
immersiveengineering = "6733669"
mekmm = "7324317"
mekmm = "7392995"

## libs ##
jech = "4.5.22"
Expand Down
16 changes: 8 additions & 8 deletions ...main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraAFCatalystRegistryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ public static void register(IRecipeCatalystRegistration registry, RecipeType<?>
}
for (ExtraFactoryTier tier : ExtraEnumUtils.EXTRA_FACTORY_TIERS) {
if (workstation == MekanismBlocks.CHEMICAL_OXIDIZER) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.OXIDIZING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.OXIDIZING), recipeType);
} else if (workstation == MekanismBlocks.CHEMICAL_INFUSER) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.CHEMICAL_INFUSING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.CHEMICAL_INFUSING), recipeType);
} else if (workstation == MekanismBlocks.CHEMICAL_DISSOLUTION_CHAMBER) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.DISSOLVING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.DISSOLVING), recipeType);
} else if (workstation == MekanismBlocks.CHEMICAL_WASHER) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.WASHING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.WASHING), recipeType);
} else if (workstation == MekanismBlocks.CHEMICAL_CRYSTALLIZER) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.CRYSTALLIZING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.CRYSTALLIZING), recipeType);
} else if (workstation == MekanismBlocks.PRESSURIZED_REACTION_CHAMBER) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.PRESSURISED_REACTING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.PRESSURISED_REACTING), recipeType);
} else if (workstation == MekanismBlocks.ISOTOPIC_CENTRIFUGE) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.CENTRIFUGING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.CENTRIFUGING), recipeType);
} else if (workstation == MekanismBlocks.NUTRITIONAL_LIQUIFIER) {
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, AdvancedFactoryType.LIQUIFYING), recipeType);
registry.addRecipeCatalyst(ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, AdvancedFactoryType.LIQUIFYING), recipeType);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraMMCatalystRegistryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static void register(IRecipeCatalystRegistration registry, RecipeType<?>
MoreMachineAttributeFactoryType factoryType = Attribute.get(blockItem.getBlock(), MoreMachineAttributeFactoryType.class);
if (factoryType != null) {
for (ExtraFactoryTier tier : ExtraEnumUtils.EXTRA_FACTORY_TIERS) {
registry.addRecipeCatalyst(ExtraMoreMachineBlocks.getMoreMachineFactory(tier, factoryType.getMoreMachineFactoryType()), recipeType);
registry.addRecipeCatalyst(ExtraMoreMachineBlocks.getExtraMoreMachineFactory(tier, factoryType.getMoreMachineFactoryType()), recipeType);
}
}
}
Expand Down
28 changes: 16 additions & 12 deletions .../com/jerry/mekextras/common/integration/mekaf/content/blocktype/ExtraAdvancedFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public ExtraAdvancedFactory(Supplier<TileEntityTypeRegistryObject<TILE>> tileEnt
add(new AttributeGui(containerRegistrar, null), new ExtraAttributeTier<>(tier));

if (tier.ordinal() < ExtraEnumUtils.EXTRA_FACTORY_TIERS.length - 1) {
add(new ExtraAttributeUpgradeable(() -> ExtraAdvancedFactoryBlocks.getAdvancedFactory(ExtraEnumUtils.EXTRA_FACTORY_TIERS[tier.ordinal() + 1], origMachine.getAdvancedFactoryType())));
add(new ExtraAttributeUpgradeable(() -> ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(ExtraEnumUtils.EXTRA_FACTORY_TIERS[tier.ordinal() + 1], origMachine.getAdvancedFactoryType())));
}
}

Expand Down Expand Up @@ -75,7 +75,7 @@ protected ExtraAdvancedFactoryBuilder(FACTORY holder) {
case LIQUIFYING -> AttributeSideConfig.create(TransmissionType.FLUID, TransmissionType.ITEM, TransmissionType.ENERGY);
});
// 如果有Bounding属性就添加，但或许会有更复杂的形状
if (type.getBaseMachine().has(AttributeHasBounding.class)) {
if (getBaseMachine(type).has(AttributeHasBounding.class)) {
builder.with(AttributeHasBounding.ABOVE_ONLY);
}
builder.replace(new AttributeParticleFX().addDense(ParticleTypes.SMOKE, 5, rand -> new Pos3D(
Expand All @@ -89,18 +89,22 @@ protected ExtraAdvancedFactoryBuilder(FACTORY holder) {
private static <TILE extends TileEntityExtraAdvancedBase<?>> @NotNull ExtraAdvancedFactoryBuilder<ExtraAdvancedFactory<TILE>, TILE, ?> getExtraAdvancedFactoryTILEAdvancedFactoryBuilder(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar, AdvancedFactoryType type, ExtraFactoryTier tier) {
ExtraAdvancedFactoryBuilder<ExtraAdvancedFactory<TILE>, TILE, ?> builder = new ExtraAdvancedFactoryBuilder<>(new ExtraAdvancedFactory<>(tileEntityRegistrar,
() -> ExtraAdvancedFactoryContainerTypes.ADVANCED_FACTORY,
switch (type) {
case OXIDIZING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_OXIDIZER;
case CHEMICAL_INFUSING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_INFUSER;
case DISSOLVING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_DISSOLUTION_CHAMBER;
case WASHING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_WASHER;
case CRYSTALLIZING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_CRYSTALLIZER;
case PRESSURISED_REACTING -> ExtraAdvancedFactoryBlockTypes.PRESSURIZED_REACTION_CHAMBER;
case CENTRIFUGING -> ExtraAdvancedFactoryBlockTypes.ISOTOPIC_CENTRIFUGE;
case LIQUIFYING -> ExtraAdvancedFactoryBlockTypes.NUTRITIONAL_LIQUIFIER;
},
getBaseMachine(type),
tier));
builder.withComputerSupport(tier.getAdvanceTier().getLowerName() + type.getRegistryNameComponentCapitalized() + "Factory");
return builder;
}

private static ExtraFactoryMachine<?> getBaseMachine(AdvancedFactoryType type) {
return switch (type) {
case OXIDIZING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_OXIDIZER;
case CHEMICAL_INFUSING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_INFUSER;
case DISSOLVING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_DISSOLUTION_CHAMBER;
case WASHING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_WASHER;
case CRYSTALLIZING -> ExtraAdvancedFactoryBlockTypes.CHEMICAL_CRYSTALLIZER;
case PRESSURISED_REACTING -> ExtraAdvancedFactoryBlockTypes.PRESSURIZED_REACTION_CHAMBER;
case CENTRIFUGING -> ExtraAdvancedFactoryBlockTypes.ISOTOPIC_CENTRIFUGE;
case LIQUIFYING -> ExtraAdvancedFactoryBlockTypes.NUTRITIONAL_LIQUIFIER;
};
}
}
2 changes: 1 addition & 1 deletion ...m/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlockTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private ExtraAdvancedFactoryBlockTypes() {}
static {
for (ExtraFactoryTier tier : ExtraEnumUtils.EXTRA_FACTORY_TIERS) {
for (AdvancedFactoryType type : MoreMachineEnumUtils.ADVANCED_FACTORY_TYPES) {
AF_FACTORIES.put(tier, type, ExtraAdvancedFactoryBuilder.createAdvancedFactory(() -> ExtraAdvancedFactoryTileEntityTypes.getAdvancedFactoryTile(tier, type), type, tier).build());
AF_FACTORIES.put(tier, type, ExtraAdvancedFactoryBuilder.createAdvancedFactory(() -> ExtraAdvancedFactoryTileEntityTypes.getExtraAdvancedFactoryTile(tier, type), type, tier).build());
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...a/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@ private static <BLOCK extends Block, ITEM extends BlockItem> BlockRegistryObject
* @param type - recipe type to add to the Factory
* @return factory with defined tier and recipe type
*/
public static BlockRegistryObject<BlockExtraAdvancedFactory<?>, ItemBlockExtraAdvancedFactory> getAdvancedFactory(@NotNull ExtraFactoryTier tier, @NotNull AdvancedFactoryType type) {
public static BlockRegistryObject<BlockExtraAdvancedFactory<?>, ItemBlockExtraAdvancedFactory> getExtraAdvancedFactory(@NotNull ExtraFactoryTier tier, @NotNull AdvancedFactoryType type) {
return AF_FACTORIES.get(tier, type);
}

@SuppressWarnings("unchecked")
public static BlockRegistryObject<BlockExtraAdvancedFactory<?>, ItemBlockExtraAdvancedFactory>[] getAdvancedFactoryBlocks() {
public static BlockRegistryObject<BlockExtraAdvancedFactory<?>, ItemBlockExtraAdvancedFactory>[] getExtraAdvancedFactoryBlocks() {
return AF_FACTORIES.values().toArray(new BlockRegistryObject[0]);
}
}
6 changes: 3 additions & 3 deletions ...ry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryTileEntityTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private ExtraAdvancedFactoryTileEntityTypes() {}
}

private static void registerFactory(ExtraFactoryTier tier, AdvancedFactoryType type, ExtraAdvancedBlockEntityFactory<? extends TileEntityExtraAdvancedBase<?>> factoryConstructor) {
BlockRegistryObject<BlockExtraAdvancedFactory<?>, ItemBlockExtraAdvancedFactory> block = ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, type);
BlockRegistryObject<BlockExtraAdvancedFactory<?>, ItemBlockExtraAdvancedFactory> block = ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, type);
TileEntityTypeRegistryObject<? extends TileEntityExtraAdvancedBase<?>> tileRO = AF_TILE_ENTITY_TYPES.mekBuilder(block, (pos, state) -> factoryConstructor.create(block, pos, state))
.clientTicker(TileEntityMekanism::tickClient)
.serverTicker(TileEntityMekanism::tickServer)
Expand All @@ -54,12 +54,12 @@ private static void registerFactory(ExtraFactoryTier tier, AdvancedFactoryType t
AF_FACTORIES.put(tier, type, tileRO);
}

public static TileEntityTypeRegistryObject<? extends TileEntityExtraAdvancedBase<?>> getAdvancedFactoryTile(ExtraFactoryTier tier, AdvancedFactoryType type) {
public static TileEntityTypeRegistryObject<? extends TileEntityExtraAdvancedBase<?>> getExtraAdvancedFactoryTile(ExtraFactoryTier tier, AdvancedFactoryType type) {
return AF_FACTORIES.get(tier, type);
}

@SuppressWarnings("unchecked")
public static TileEntityTypeRegistryObject<? extends TileEntityExtraAdvancedBase<?>>[] getFactoryTiles() {
public static TileEntityTypeRegistryObject<? extends TileEntityExtraAdvancedBase<?>>[] getExtraAdvancedFactoryTiles() {
return AF_FACTORIES.values().toArray(new TileEntityTypeRegistryObject[0]);
}

Expand Down
24 changes: 14 additions & 10 deletions ...m/jerry/mekextras/common/integration/mekmm/content/blocktype/ExtraMoreMachineFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public ExtraMoreMachineFactory(Supplier<TileEntityTypeRegistryObject<TILE>> tile
add(new AttributeGui(containerRegistrar, null), new ExtraAttributeTier<>(tier));

if (tier.ordinal() < ExtraEnumUtils.EXTRA_FACTORY_TIERS.length - 1) {
add(new ExtraAttributeUpgradeable(() -> ExtraMoreMachineBlocks.getMoreMachineFactory(ExtraEnumUtils.EXTRA_FACTORY_TIERS[tier.ordinal() + 1], origMachine.getMoreMachineFactoryType())));
add(new ExtraAttributeUpgradeable(() -> ExtraMoreMachineBlocks.getExtraMoreMachineFactory(ExtraEnumUtils.EXTRA_FACTORY_TIERS[tier.ordinal() + 1], origMachine.getMoreMachineFactoryType())));
}
}

Expand Down Expand Up @@ -70,7 +70,7 @@ protected ExtraMoreMachineFactoryBuilder(FACTORY holder) {
case PLANTING_STATION, REPLICATING -> AttributeSideConfig.ADVANCED_ELECTRIC_MACHINE;
});
// 如果有Bounding属性就添加，但或许会有更复杂的形状
if (type.getBaseMachine().has(AttributeHasBounding.class)) {
if (getBaseMachine(type).has(AttributeHasBounding.class)) {
builder.with(AttributeHasBounding.ABOVE_ONLY);
}
builder.replace(new AttributeParticleFX().addDense(ParticleTypes.SMOKE, 5, rand -> new Pos3D(
Expand All @@ -83,17 +83,21 @@ protected ExtraMoreMachineFactoryBuilder(FACTORY holder) {
private static <TILE extends TileEntityExtraMoreMachineFactory<?>> @NotNull ExtraMoreMachineFactoryBuilder<ExtraMoreMachineFactory<TILE>, TILE, ?> getExtraMoreMachineFactoryTILEMoreMachineFactoryBuilder(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar, MoreMachineFactoryType type, ExtraFactoryTier tier) {
ExtraMoreMachineFactoryBuilder<ExtraMoreMachineFactory<TILE>, TILE, ?> builder = new ExtraMoreMachineFactoryBuilder<>(new ExtraMoreMachineFactory<>(tileEntityRegistrar,
() -> ExtraMoreMachineContainerTypes.MORE_MACHINE_FACTORY,
switch (type) {
case RECYCLING -> ExtraMoreMachineBlockTypes.RECYCLER;
case PLANTING_STATION -> ExtraMoreMachineBlockTypes.PLANTING_STATION;
case CNC_STAMPING -> ExtraMoreMachineBlockTypes.CNC_STAMPER;
case CNC_LATHING -> ExtraMoreMachineBlockTypes.CNC_LATHE;
case CNC_ROLLING_MILL -> ExtraMoreMachineBlockTypes.CNC_ROLLING_MILL;
case REPLICATING -> ExtraMoreMachineBlockTypes.REPLICATOR;
},
getBaseMachine(type),
tier));
builder.withComputerSupport(tier.getAdvanceTier().getLowerName() + type.getRegistryNameComponentCapitalized() + "Factory");
return builder;
}

private static ExtraFactoryMachine<?> getBaseMachine(MoreMachineFactoryType type) {
return switch (type) {
case RECYCLING -> ExtraMoreMachineBlockTypes.RECYCLER;
case PLANTING_STATION -> ExtraMoreMachineBlockTypes.PLANTING_STATION;
case CNC_STAMPING -> ExtraMoreMachineBlockTypes.CNC_STAMPER;
case CNC_LATHING -> ExtraMoreMachineBlockTypes.CNC_LATHE;
case CNC_ROLLING_MILL -> ExtraMoreMachineBlockTypes.CNC_ROLLING_MILL;
case REPLICATING -> ExtraMoreMachineBlockTypes.REPLICATOR;
};
}
}
}
6 changes: 3 additions & 3 deletions ...a/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlockTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private ExtraMoreMachineBlockTypes() {}
.withGui(() -> MoreMachineContainerTypes.RECYCLER)
.withSound(MekanismSounds.PRECISION_SAWMILL)
.withEnergyConfig(MoreMachineConfig.usage.recycler, MoreMachineConfig.storage.recycler)
.with(ExtraAttributeUpgradeSupport.EXTRA_MACHINE_UPGRADES)
.with(ExtraAttributeUpgradeSupport.EXTRA_MACHINE_NO_STACK_UPGRADES)
.build();

// Planting Station
Expand Down Expand Up @@ -85,12 +85,12 @@ private ExtraMoreMachineBlockTypes() {}
static {
for (ExtraFactoryTier tier : ExtraEnumUtils.EXTRA_FACTORY_TIERS) {
for (MoreMachineFactoryType type : MoreMachineEnumUtils.MM_FACTORY_TYPES) {
MM_FACTORIES.put(tier, type, ExtraMoreMachineFactoryBuilder.createMoreMachineFactory(() -> ExtraMoreMachineTileEntityTypes.getMoreMachineFactoryTile(tier, type), type, tier).build());
MM_FACTORIES.put(tier, type, ExtraMoreMachineFactoryBuilder.createMoreMachineFactory(() -> ExtraMoreMachineTileEntityTypes.getExtraMoreMachineFactoryTile(tier, type), type, tier).build());
}
}
}

public static ExtraMoreMachineFactory<?> getMoreMachineFactory(ExtraFactoryTier tier, MoreMachineFactoryType type) {
public static ExtraMoreMachineFactory<?> getExtraMoreMachineFactory(ExtraFactoryTier tier, MoreMachineFactoryType type) {
return MM_FACTORIES.get(tier, type);
}
}
9 changes: 7 additions & 2 deletions .../java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private ExtraMoreMachineBlocks() {}
// factories
for (ExtraFactoryTier tier : ExtraEnumUtils.EXTRA_FACTORY_TIERS) {
for (MoreMachineFactoryType type : MoreMachineEnumUtils.MM_FACTORY_TYPES) {
MM_FACTORIES.put(tier, type, registerMoreMachineFactory(ExtraMoreMachineBlockTypes.getMoreMachineFactory(tier, type)));
MM_FACTORIES.put(tier, type, registerMoreMachineFactory(ExtraMoreMachineBlockTypes.getExtraMoreMachineFactory(tier, type)));
}
}
}
Expand Down Expand Up @@ -114,7 +114,12 @@ private static <BLOCK extends Block, ITEM extends BlockItem> BlockRegistryObject
* @param type - recipe type to add to the Factory
* @return factory with defined tier and recipe type
*/
public static BlockRegistryObject<BlockExtraMoreMachineFactory<?>, ItemBlockExtraMoreMachineFactory> getMoreMachineFactory(@NotNull ExtraFactoryTier tier, @NotNull MoreMachineFactoryType type) {
public static BlockRegistryObject<BlockExtraMoreMachineFactory<?>, ItemBlockExtraMoreMachineFactory> getExtraMoreMachineFactory(@NotNull ExtraFactoryTier tier, @NotNull MoreMachineFactoryType type) {
return MM_FACTORIES.get(tier, type);
}

@SuppressWarnings("unchecked")
public static BlockRegistryObject<BlockExtraMoreMachineFactory<?>, ItemBlockExtraMoreMachineFactory>[] getExtraMoreMachineFactoryBlocks() {
return MM_FACTORIES.values().toArray(new BlockRegistryObject[0]);
}
}
10 changes: 8 additions & 2 deletions .../jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineTileEntityTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
import com.jerry.mekmm.common.content.blocktype.MoreMachineFactoryType;
import com.jerry.mekmm.common.tile.factory.TileEntityMoreMachineFactory;

public class ExtraMoreMachineTileEntityTypes {

Expand All @@ -43,7 +44,7 @@ private ExtraMoreMachineTileEntityTypes() {}
}

private static void registerFactory(ExtraFactoryTier tier, MoreMachineFactoryType type, MMBlockEntityFactory<? extends TileEntityExtraMoreMachineFactory<?>> factoryConstructor) {
BlockRegistryObject<BlockExtraMoreMachineFactory<?>, ItemBlockExtraMoreMachineFactory> block = ExtraMoreMachineBlocks.getMoreMachineFactory(tier, type);
BlockRegistryObject<BlockExtraMoreMachineFactory<?>, ItemBlockExtraMoreMachineFactory> block = ExtraMoreMachineBlocks.getExtraMoreMachineFactory(tier, type);
TileEntityTypeRegistryObject<? extends TileEntityExtraMoreMachineFactory<?>> tileRO = MM_TILE_ENTITY_TYPES.mekBuilder(block, (pos, state) -> factoryConstructor.create(block, pos, state))
.clientTicker(TileEntityMekanism::tickClient)
.serverTicker(TileEntityMekanism::tickServer)
Expand All @@ -52,10 +53,15 @@ private static void registerFactory(ExtraFactoryTier tier, MoreMachineFactoryTyp
MM_FACTORIES.put(tier, type, tileRO);
}

public static TileEntityTypeRegistryObject<? extends TileEntityExtraMoreMachineFactory<?>> getMoreMachineFactoryTile(ExtraFactoryTier tier, MoreMachineFactoryType type) {
public static TileEntityTypeRegistryObject<? extends TileEntityExtraMoreMachineFactory<?>> getExtraMoreMachineFactoryTile(ExtraFactoryTier tier, MoreMachineFactoryType type) {
return MM_FACTORIES.get(tier, type);
}

@SuppressWarnings("unchecked")
public static TileEntityTypeRegistryObject<? extends TileEntityMoreMachineFactory<?>>[] getExtraMoreMachineFactoryTiles() {
return MM_FACTORIES.values().toArray(new TileEntityTypeRegistryObject[0]);
}

@FunctionalInterface
private interface MMBlockEntityFactory<BE extends BlockEntity> {

Expand Down
Loading
Loading