diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 8de978077..d54669d2f 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -31,7 +31,6 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.ITEM_MONITOR) provider.block(MItems.PHANTOM_ATTRACTOR) provider.block(MItems.HOLO_SIGN) - provider.generated(MItems.FLUID_CAPSULE) MRegistry.VENT.allItems.values.forEach(provider::block) MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index 2457b71f8..130956113 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -18,6 +18,8 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.properties.NoteBlockInstrument import net.minecraft.world.level.material.MapColor import net.minecraftforge.api.distmarker.Dist +import net.minecraftforge.client.event.RegisterColorHandlersEvent +import net.minecraftforge.client.model.DynamicFluidContainerModel import net.minecraftforge.eventbus.api.IEventBus import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent @@ -253,6 +255,7 @@ object MRegistry { bus.addListener(this::initializeCommon) bus.addListener(MStats::registerVanilla) bus.addListener(this::registerEvent) + bus.addListener(this::registerItemColorHandlers) MCreativeTabs.initialize(bus) @@ -338,4 +341,8 @@ object MRegistry { } } } + + private fun registerItemColorHandlers(event: RegisterColorHandlersEvent.Item) { + event.register(DynamicFluidContainerModel.Colors(), MItems.FLUID_CAPSULE) + } } diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json b/src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json new file mode 100644 index 000000000..312408e50 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json @@ -0,0 +1,9 @@ +{ + "parent": "forge:item/default", + "loader": "forge:fluid_container", + "fluid": "minecraft:empty", + "textures": { + "base": "overdrive_that_matters:item/fluid_capsule", + "fluid": "overdrive_that_matters:item/fluid_capsule_liquid_mask" + } +} \ No newline at end of file