diff --git a/gradle/forge.versions.toml b/gradle/forge.versions.toml index 1d87553e..af2d4195 100644 --- a/gradle/forge.versions.toml +++ b/gradle/forge.versions.toml @@ -22,7 +22,7 @@ mekanismcovers = "6071684" igleelibrary = "7000755" evolvedmekanism = "7321395" immersiveengineering = "6733669" -mekmm = "7324317" +mekmm = "7392995" ## libs ## jech = "4.5.22" diff --git a/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraAFCatalystRegistryHelper.java b/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraAFCatalystRegistryHelper.java index ac477fe3..fecced74 100644 --- a/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraAFCatalystRegistryHelper.java +++ b/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraAFCatalystRegistryHelper.java @@ -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); } } } diff --git a/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraMMCatalystRegistryHelper.java b/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraMMCatalystRegistryHelper.java index 5bef42d9..32e9bf72 100644 --- a/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraMMCatalystRegistryHelper.java +++ b/src/main/java/com/jerry/mekextras/client/recipe_viewer/jei/ExtraMMCatalystRegistryHelper.java @@ -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); } } } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekaf/content/blocktype/ExtraAdvancedFactory.java b/src/main/java/com/jerry/mekextras/common/integration/mekaf/content/blocktype/ExtraAdvancedFactory.java index 15046afa..a9556584 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekaf/content/blocktype/ExtraAdvancedFactory.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekaf/content/blocktype/ExtraAdvancedFactory.java @@ -41,7 +41,7 @@ public ExtraAdvancedFactory(Supplier> 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()))); } } @@ -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( @@ -89,18 +89,22 @@ protected ExtraAdvancedFactoryBuilder(FACTORY holder) { private static > @NotNull ExtraAdvancedFactoryBuilder, TILE, ?> getExtraAdvancedFactoryTILEAdvancedFactoryBuilder(Supplier> tileEntityRegistrar, AdvancedFactoryType type, ExtraFactoryTier tier) { ExtraAdvancedFactoryBuilder, 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; + }; + } } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlockTypes.java b/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlockTypes.java index ea6f85cd..e660872a 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlockTypes.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlockTypes.java @@ -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()); } } } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlocks.java b/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlocks.java index ff15253e..db1976e7 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlocks.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryBlocks.java @@ -185,12 +185,12 @@ private static BlockRegistryObject * @param type - recipe type to add to the Factory * @return factory with defined tier and recipe type */ - public static BlockRegistryObject, ItemBlockExtraAdvancedFactory> getAdvancedFactory(@NotNull ExtraFactoryTier tier, @NotNull AdvancedFactoryType type) { + public static BlockRegistryObject, ItemBlockExtraAdvancedFactory> getExtraAdvancedFactory(@NotNull ExtraFactoryTier tier, @NotNull AdvancedFactoryType type) { return AF_FACTORIES.get(tier, type); } @SuppressWarnings("unchecked") - public static BlockRegistryObject, ItemBlockExtraAdvancedFactory>[] getAdvancedFactoryBlocks() { + public static BlockRegistryObject, ItemBlockExtraAdvancedFactory>[] getExtraAdvancedFactoryBlocks() { return AF_FACTORIES.values().toArray(new BlockRegistryObject[0]); } } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryTileEntityTypes.java b/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryTileEntityTypes.java index 438a1da3..4fe7998b 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryTileEntityTypes.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekaf/registries/ExtraAdvancedFactoryTileEntityTypes.java @@ -45,7 +45,7 @@ private ExtraAdvancedFactoryTileEntityTypes() {} } private static void registerFactory(ExtraFactoryTier tier, AdvancedFactoryType type, ExtraAdvancedBlockEntityFactory> factoryConstructor) { - BlockRegistryObject, ItemBlockExtraAdvancedFactory> block = ExtraAdvancedFactoryBlocks.getAdvancedFactory(tier, type); + BlockRegistryObject, ItemBlockExtraAdvancedFactory> block = ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(tier, type); TileEntityTypeRegistryObject> tileRO = AF_TILE_ENTITY_TYPES.mekBuilder(block, (pos, state) -> factoryConstructor.create(block, pos, state)) .clientTicker(TileEntityMekanism::tickClient) .serverTicker(TileEntityMekanism::tickServer) @@ -54,12 +54,12 @@ private static void registerFactory(ExtraFactoryTier tier, AdvancedFactoryType t AF_FACTORIES.put(tier, type, tileRO); } - public static TileEntityTypeRegistryObject> getAdvancedFactoryTile(ExtraFactoryTier tier, AdvancedFactoryType type) { + public static TileEntityTypeRegistryObject> getExtraAdvancedFactoryTile(ExtraFactoryTier tier, AdvancedFactoryType type) { return AF_FACTORIES.get(tier, type); } @SuppressWarnings("unchecked") - public static TileEntityTypeRegistryObject>[] getFactoryTiles() { + public static TileEntityTypeRegistryObject>[] getExtraAdvancedFactoryTiles() { return AF_FACTORIES.values().toArray(new TileEntityTypeRegistryObject[0]); } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekmm/content/blocktype/ExtraMoreMachineFactory.java b/src/main/java/com/jerry/mekextras/common/integration/mekmm/content/blocktype/ExtraMoreMachineFactory.java index 39eb8c2e..c9381cb8 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekmm/content/blocktype/ExtraMoreMachineFactory.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekmm/content/blocktype/ExtraMoreMachineFactory.java @@ -40,7 +40,7 @@ public ExtraMoreMachineFactory(Supplier> 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()))); } } @@ -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( @@ -83,17 +83,21 @@ protected ExtraMoreMachineFactoryBuilder(FACTORY holder) { private static > @NotNull ExtraMoreMachineFactoryBuilder, TILE, ?> getExtraMoreMachineFactoryTILEMoreMachineFactoryBuilder(Supplier> tileEntityRegistrar, MoreMachineFactoryType type, ExtraFactoryTier tier) { ExtraMoreMachineFactoryBuilder, 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; + }; + } } } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlockTypes.java b/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlockTypes.java index 80168c96..d934de38 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlockTypes.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlockTypes.java @@ -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 @@ -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); } } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlocks.java b/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlocks.java index 9e9532aa..ed41306b 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlocks.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineBlocks.java @@ -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))); } } } @@ -114,7 +114,12 @@ private static BlockRegistryObject * @param type - recipe type to add to the Factory * @return factory with defined tier and recipe type */ - public static BlockRegistryObject, ItemBlockExtraMoreMachineFactory> getMoreMachineFactory(@NotNull ExtraFactoryTier tier, @NotNull MoreMachineFactoryType type) { + public static BlockRegistryObject, ItemBlockExtraMoreMachineFactory> getExtraMoreMachineFactory(@NotNull ExtraFactoryTier tier, @NotNull MoreMachineFactoryType type) { return MM_FACTORIES.get(tier, type); } + + @SuppressWarnings("unchecked") + public static BlockRegistryObject, ItemBlockExtraMoreMachineFactory>[] getExtraMoreMachineFactoryBlocks() { + return MM_FACTORIES.values().toArray(new BlockRegistryObject[0]); + } } diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineTileEntityTypes.java b/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineTileEntityTypes.java index 82366c88..ee5f7de9 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineTileEntityTypes.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekmm/registries/ExtraMoreMachineTileEntityTypes.java @@ -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 { @@ -43,7 +44,7 @@ private ExtraMoreMachineTileEntityTypes() {} } private static void registerFactory(ExtraFactoryTier tier, MoreMachineFactoryType type, MMBlockEntityFactory> factoryConstructor) { - BlockRegistryObject, ItemBlockExtraMoreMachineFactory> block = ExtraMoreMachineBlocks.getMoreMachineFactory(tier, type); + BlockRegistryObject, ItemBlockExtraMoreMachineFactory> block = ExtraMoreMachineBlocks.getExtraMoreMachineFactory(tier, type); TileEntityTypeRegistryObject> tileRO = MM_TILE_ENTITY_TYPES.mekBuilder(block, (pos, state) -> factoryConstructor.create(block, pos, state)) .clientTicker(TileEntityMekanism::tickClient) .serverTicker(TileEntityMekanism::tickServer) @@ -52,10 +53,15 @@ private static void registerFactory(ExtraFactoryTier tier, MoreMachineFactoryTyp MM_FACTORIES.put(tier, type, tileRO); } - public static TileEntityTypeRegistryObject> getMoreMachineFactoryTile(ExtraFactoryTier tier, MoreMachineFactoryType type) { + public static TileEntityTypeRegistryObject> getExtraMoreMachineFactoryTile(ExtraFactoryTier tier, MoreMachineFactoryType type) { return MM_FACTORIES.get(tier, type); } + @SuppressWarnings("unchecked") + public static TileEntityTypeRegistryObject>[] getExtraMoreMachineFactoryTiles() { + return MM_FACTORIES.values().toArray(new TileEntityTypeRegistryObject[0]); + } + @FunctionalInterface private interface MMBlockEntityFactory { diff --git a/src/main/java/com/jerry/mekextras/common/integration/mekmm/tile/factory/TileEntityExtraRecyclingFactory.java b/src/main/java/com/jerry/mekextras/common/integration/mekmm/tile/factory/TileEntityExtraRecyclingFactory.java index d2090090..a67a093d 100644 --- a/src/main/java/com/jerry/mekextras/common/integration/mekmm/tile/factory/TileEntityExtraRecyclingFactory.java +++ b/src/main/java/com/jerry/mekextras/common/integration/mekmm/tile/factory/TileEntityExtraRecyclingFactory.java @@ -134,7 +134,8 @@ public IRecipeViewerRecipeType recipeViewerType() { .setEnergyRequirements(energyContainer::getEnergyPerTick, energyContainer) .setRequiredTicks(this::getTicksRequired) .setOnFinish(this::markForSave) - .setOperatingTicksChanged(operatingTicks -> progress[cacheIndex] = operatingTicks); + .setOperatingTicksChanged(operatingTicks -> progress[cacheIndex] = operatingTicks) + .setBaselineMaxOperations(this::getOperationsPerTick); } @NotNull diff --git a/src/main/java/com/jerry/mekextras/mixin/integration/mekaf/MixinAdvancedFactory.java b/src/main/java/com/jerry/mekextras/mixin/integration/mekaf/MixinAdvancedFactory.java index b29fe7db..7b477c4b 100644 --- a/src/main/java/com/jerry/mekextras/mixin/integration/mekaf/MixinAdvancedFactory.java +++ b/src/main/java/com/jerry/mekextras/mixin/integration/mekaf/MixinAdvancedFactory.java @@ -27,7 +27,7 @@ public MixinAdvancedFactory(ILangEntry description) { @Inject(method = "", at = @At("RETURN")) private void injectFactoryUltimateToAbsolute(Supplier tileEntityRegistrar, Supplier containerRegistrar, MoreMachineFactoryMachine origMachine, FactoryTier tier, CallbackInfo ci) { if (tier == FactoryTier.ULTIMATE) { - add(new ExtraAttributeUpgradeable(() -> ExtraAdvancedFactoryBlocks.getAdvancedFactory(ExtraFactoryTier.ABSOLUTE, origMachine.getAdvancedFactoryType()))); + add(new ExtraAttributeUpgradeable(() -> ExtraAdvancedFactoryBlocks.getExtraAdvancedFactory(ExtraFactoryTier.ABSOLUTE, origMachine.getAdvancedFactoryType()))); } } } diff --git a/src/main/java/com/jerry/mekextras/mixin/integration/mekmm/MixinMoreMachineFactory.java b/src/main/java/com/jerry/mekextras/mixin/integration/mekmm/MixinMoreMachineFactory.java index d537a440..3979c391 100644 --- a/src/main/java/com/jerry/mekextras/mixin/integration/mekmm/MixinMoreMachineFactory.java +++ b/src/main/java/com/jerry/mekextras/mixin/integration/mekmm/MixinMoreMachineFactory.java @@ -27,7 +27,7 @@ public MixinMoreMachineFactory(ILangEntry description) { @Inject(method = "", at = @At("RETURN")) private void injectFactoryUltimateToAbsolute(Supplier tileEntityRegistrar, Supplier containerRegistrar, MoreMachineFactoryMachine origMachine, FactoryTier tier, CallbackInfo ci) { if (tier == FactoryTier.ULTIMATE) { - add(new ExtraAttributeUpgradeable(() -> ExtraMoreMachineBlocks.getMoreMachineFactory(ExtraFactoryTier.ABSOLUTE, origMachine.getMoreMachineFactoryType()))); + add(new ExtraAttributeUpgradeable(() -> ExtraMoreMachineBlocks.getExtraMoreMachineFactory(ExtraFactoryTier.ABSOLUTE, origMachine.getMoreMachineFactoryType()))); } } } diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/absolute.json b/src/main/resources/assets/mekanism_extras/models/block/bin/absolute.json new file mode 100644 index 00000000..e9065d81 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/absolute.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/base", + "textures":{ + "led":"mekanism_extras:block/bin/absolute_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/absolute_side", + "top":"mekanism_extras:block/bin/absolute_top", + "back":"mekanism_extras:block/bin/absolute_back", + "bottom":"mekanism_extras:block/bin/bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/active/absolute.json b/src/main/resources/assets/mekanism_extras/models/block/bin/active/absolute.json new file mode 100644 index 00000000..572ce06b --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/active/absolute.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/active/base", + "textures":{ + "led":"mekanism_extras:block/bin/absolute_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/absolute_side", + "top":"mekanism_extras:block/bin/absolute_top_active", + "back":"mekanism_extras:block/bin/absolute_back", + "bottom":"mekanism_extras:block/bin/bottom_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/active/cosmic.json b/src/main/resources/assets/mekanism_extras/models/block/bin/active/cosmic.json new file mode 100644 index 00000000..9a8e9a13 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/active/cosmic.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/active/base", + "textures":{ + "led":"mekanism_extras:block/bin/cosmic_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/cosmic_side", + "top":"mekanism_extras:block/bin/cosmic_top_active", + "back":"mekanism_extras:block/bin/cosmic_back", + "bottom":"mekanism_extras:block/bin/bottom_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/active/infinite.json b/src/main/resources/assets/mekanism_extras/models/block/bin/active/infinite.json new file mode 100644 index 00000000..f534f877 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/active/infinite.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/active/base", + "textures":{ + "led":"mekanism_extras:block/bin/infinite_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/infinite_side", + "top":"mekanism_extras:block/bin/infinite_top_active", + "back":"mekanism_extras:block/bin/infinite_back", + "bottom":"mekanism_extras:block/bin/bottom_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/active/supreme.json b/src/main/resources/assets/mekanism_extras/models/block/bin/active/supreme.json new file mode 100644 index 00000000..74b3869e --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/active/supreme.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/active/base", + "textures":{ + "led":"mekanism_extras:block/bin/supreme_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/supreme_side", + "top":"mekanism_extras:block/bin/supreme_top_active", + "back":"mekanism_extras:block/bin/supreme_back", + "bottom":"mekanism_extras:block/bin/bottom_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/cosmic.json b/src/main/resources/assets/mekanism_extras/models/block/bin/cosmic.json new file mode 100644 index 00000000..9bc6bf19 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/cosmic.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/base", + "textures":{ + "led":"mekanism_extras:block/bin/cosmic_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/cosmic_side", + "top":"mekanism_extras:block/bin/cosmic_top", + "back":"mekanism_extras:block/bin/cosmic_back", + "bottom":"mekanism_extras:block/bin/bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/infinite.json b/src/main/resources/assets/mekanism_extras/models/block/bin/infinite.json new file mode 100644 index 00000000..ca7ec72f --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/infinite.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/base", + "textures":{ + "led":"mekanism_extras:block/bin/infinite_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/infinite_side", + "top":"mekanism_extras:block/bin/infinite_top", + "back":"mekanism_extras:block/bin/infinite_back", + "bottom":"mekanism_extras:block/bin/bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/models/block/bin/supreme.json b/src/main/resources/assets/mekanism_extras/models/block/bin/supreme.json new file mode 100644 index 00000000..b9972544 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/models/block/bin/supreme.json @@ -0,0 +1,11 @@ +{ + "parent":"mekanism:block/bin/base", + "textures":{ + "led":"mekanism_extras:block/bin/supreme_led", + "front":"mekanism_extras:block/bin/front", + "side":"mekanism_extras:block/bin/supreme_side", + "top":"mekanism_extras:block/bin/supreme_top", + "back":"mekanism_extras:block/bin/supreme_back", + "bottom":"mekanism_extras:block/bin/bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_back.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_back.png new file mode 100644 index 00000000..03446734 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_back.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_led.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_led.png new file mode 100644 index 00000000..127a73a0 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_led.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_side.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_side.png new file mode 100644 index 00000000..03446734 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_side.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_top.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_top.png new file mode 100644 index 00000000..b0f3336c Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_top.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_top_active.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_top_active.png new file mode 100644 index 00000000..daddd49e Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/absolute_top_active.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/back.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/back.png new file mode 100644 index 00000000..dcc603f4 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/back.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/bottom.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/bottom.png new file mode 100644 index 00000000..2126b8c6 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/bottom.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/bottom_active.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/bottom_active.png new file mode 100644 index 00000000..d3cf22ea Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/bottom_active.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_back.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_back.png new file mode 100644 index 00000000..ec2e8816 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_back.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_back.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_back.png.mcmeta new file mode 100644 index 00000000..ab4f026a --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_back.png.mcmeta @@ -0,0 +1,16 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4}, + {"index": 3}, + {"index": 2}, + {"index": 1} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_led.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_led.png new file mode 100644 index 00000000..f6836d32 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_led.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_led.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_led.png.mcmeta new file mode 100644 index 00000000..c9ea3c79 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_led.png.mcmeta @@ -0,0 +1,12 @@ +{ + "animation": { + "frametime": 5, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_side.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_side.png new file mode 100644 index 00000000..ec2e8816 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_side.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_side.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_side.png.mcmeta new file mode 100644 index 00000000..ab4f026a --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_side.png.mcmeta @@ -0,0 +1,16 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4}, + {"index": 3}, + {"index": 2}, + {"index": 1} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top.png new file mode 100644 index 00000000..fecbb765 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top.png.mcmeta new file mode 100644 index 00000000..ab4f026a --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top.png.mcmeta @@ -0,0 +1,16 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4}, + {"index": 3}, + {"index": 2}, + {"index": 1} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top_active.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top_active.png new file mode 100644 index 00000000..6752736f Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top_active.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top_active.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top_active.png.mcmeta new file mode 100644 index 00000000..ab4f026a --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/cosmic_top_active.png.mcmeta @@ -0,0 +1,16 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4}, + {"index": 3}, + {"index": 2}, + {"index": 1} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/front.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/front.png new file mode 100644 index 00000000..16b993b0 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/front.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_back.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_back.png new file mode 100644 index 00000000..a494db20 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_back.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_back.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_back.png.mcmeta new file mode 100644 index 00000000..0207af65 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_back.png.mcmeta @@ -0,0 +1,13 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_led.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_led.png new file mode 100644 index 00000000..adbe9335 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_led.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_led.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_led.png.mcmeta new file mode 100644 index 00000000..69d8dc89 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_led.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4}, + {"index": 5}, + {"index": 6}, + {"index": 7}, + {"index": 8}, + {"index": 9} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_side.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_side.png new file mode 100644 index 00000000..a494db20 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_side.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_side.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_side.png.mcmeta new file mode 100644 index 00000000..0207af65 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_side.png.mcmeta @@ -0,0 +1,13 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top.png new file mode 100644 index 00000000..cebe6109 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top.png.mcmeta new file mode 100644 index 00000000..0207af65 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top.png.mcmeta @@ -0,0 +1,13 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top_active.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top_active.png new file mode 100644 index 00000000..8b4dc7a6 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top_active.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top_active.png.mcmeta b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top_active.png.mcmeta new file mode 100644 index 00000000..0207af65 --- /dev/null +++ b/src/main/resources/assets/mekanism_extras/textures/block/bin/infinite_top_active.png.mcmeta @@ -0,0 +1,13 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + {"index": 0}, + {"index": 1}, + {"index": 2}, + {"index": 3}, + {"index": 4} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/side.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/side.png new file mode 100644 index 00000000..dcc603f4 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/side.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_back.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_back.png new file mode 100644 index 00000000..8492a8f9 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_back.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_led.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_led.png new file mode 100644 index 00000000..f0b65019 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_led.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_side.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_side.png new file mode 100644 index 00000000..8492a8f9 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_side.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_top.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_top.png new file mode 100644 index 00000000..fdcedb58 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_top.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_top_active.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_top_active.png new file mode 100644 index 00000000..4315f15c Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_top_active.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_up.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_up.png new file mode 100644 index 00000000..c36df702 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/supreme_up.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/top.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/top.png new file mode 100644 index 00000000..4b3fecd5 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/top.png differ diff --git a/src/main/resources/assets/mekanism_extras/textures/block/bin/top_active.png b/src/main/resources/assets/mekanism_extras/textures/block/bin/top_active.png new file mode 100644 index 00000000..72fda349 Binary files /dev/null and b/src/main/resources/assets/mekanism_extras/textures/block/bin/top_active.png differ diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index f7f47718..2035486b 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -38,3 +38,10 @@ credits="Thank you to all those who have made any contributions to this mod" versionRange = "[10.7.17]" ordering = "AFTER" side = "BOTH" + +[[dependencies.${mod_id}]] + modId = "mekmm" + type = "optional" + versionRange = "[1.2.2,)" + ordering = "AFTER" + side = "BOTH"