diff options
Diffstat (limited to 'src/main/kotlin')
| -rw-r--r-- | src/main/kotlin/events/BakeExtraModelsEvent.kt | 29 | ||||
| -rw-r--r-- | src/main/kotlin/repo/ReforgeStore.kt | 1 | ||||
| -rw-r--r-- | src/main/kotlin/util/skyblock/ItemType.kt | 2 |
3 files changed, 3 insertions, 29 deletions
diff --git a/src/main/kotlin/events/BakeExtraModelsEvent.kt b/src/main/kotlin/events/BakeExtraModelsEvent.kt deleted file mode 100644 index 35bfecb..0000000 --- a/src/main/kotlin/events/BakeExtraModelsEvent.kt +++ /dev/null @@ -1,29 +0,0 @@ -package moe.nea.firmament.events - -import java.util.function.BiConsumer -import net.minecraft.client.item.ItemAssetsLoader -import net.minecraft.client.render.model.ReferencedModelsCollector -import net.minecraft.client.util.ModelIdentifier -import net.minecraft.util.Identifier - -// TODO: This event may be removed now since ItemAssetsLoader seems to load all item models now (probably to cope with servers setting the item_model component). Check whether this also applies to blocks now. -//@Deprecated(level = DeprecationLevel.ERROR, message = "This is no longer needed, since ItemAssetsLoader loads all item models.") -class BakeExtraModelsEvent( - private val addAnyModel: BiConsumer<ModelIdentifier, Identifier>, -) : FirmamentEvent() { - - fun addNonItemModel(modelIdentifier: ModelIdentifier, identifier: Identifier) { - this.addAnyModel.accept(modelIdentifier, identifier) - } - - fun addItemModel(modelIdentifier: ModelIdentifier) { - // TODO: If this is still needed: ItemAssetsLoader.FINDER - // addNonItemModel( -// modelIdentifier, -// modelIdentifier.id.withPrefixedPath()) - } - -// @Deprecated(level = DeprecationLevel.ERROR, message = "This is no longer needed, since ItemAssetsLoader loads all item models.") - @Suppress("DEPRECATION") - companion object : FirmamentEventBus<BakeExtraModelsEvent>() -} diff --git a/src/main/kotlin/repo/ReforgeStore.kt b/src/main/kotlin/repo/ReforgeStore.kt index f03903b..4c01974 100644 --- a/src/main/kotlin/repo/ReforgeStore.kt +++ b/src/main/kotlin/repo/ReforgeStore.kt @@ -68,6 +68,7 @@ object ReforgeStore : ExtraRecipeProvider, IReloadable { val actualItemTypes = resolveItemType(eligibleItem.itemType) for (itemType in actualItemTypes) { byType.getOrPut(itemType, ::mutableListOf).add(reforge) + byType.getOrPut(itemType.dungeonVariant, ::mutableListOf).add(reforge) } } diff --git a/src/main/kotlin/util/skyblock/ItemType.kt b/src/main/kotlin/util/skyblock/ItemType.kt index 7149379..6c7096c 100644 --- a/src/main/kotlin/util/skyblock/ItemType.kt +++ b/src/main/kotlin/util/skyblock/ItemType.kt @@ -65,6 +65,8 @@ value class ItemType private constructor(val name: String) { val PET = ofName("PET") } + val dungeonVariant get() = ofName("DUNGEON $name") + override fun toString(): String { return name } |