fix: Dungeon swords not being recognized for reforges

nea89o · Dec 31, 2024 · bb124fe · bb124fe
1 parent a50de16
commit bb124fe
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 83 deletions.
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt
@@ -171,9 +171,10 @@ class SBReforgeRecipe(
 
 				is Reforge.ReforgeEligibilityFilter.AllowsItemType ->
 					ReforgeStore.resolveItemType(it.itemType)
-						.flatMap {
-							RepoItemTypeCache.byItemType[it] ?: listOf()
-						}
+						.flatMapTo(mutableSetOf()) {
+							(RepoItemTypeCache.byItemType[it] ?: listOf()) +
+								(RepoItemTypeCache.byItemType[it.dungeonVariant] ?: listOf())
+						}.toList()
 
 				is Reforge.ReforgeEligibilityFilter.AllowsVanillaItemType -> {
 					listOf() // TODO: add filter support for this and potentially rework this to search for the declared item type in repo, instead of remapped item type

diff --git a/src/main/kotlin/events/BakeExtraModelsEvent.kt b/src/main/kotlin/events/BakeExtraModelsEvent.kt
diff --git 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
@@ -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
 	}

diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt
@@ -30,7 +30,6 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.profiler.Profiler
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.annotations.Subscribe
-import moe.nea.firmament.events.BakeExtraModelsEvent
 import moe.nea.firmament.events.EarlyResourceReloadEvent
 import moe.nea.firmament.events.FinalizeResourceManagerEvent
 import moe.nea.firmament.events.SkyblockServerUpdateEvent
@@ -238,15 +237,6 @@ object CustomBlockTextures {
                 { prepare(event.resourceManager) }, event.preparationExecutor)
     }
 
-    @Subscribe
-    fun bakeExtraModels(event: BakeExtraModelsEvent) {
-        preparationFuture.join().data.values
-            .flatMap { it.lookup.values }
-            .flatten()
-            .mapTo(mutableSetOf()) { it.replacement.blockModelIdentifier }
-            .forEach { event.addNonItemModel(it, it.id) }
-    }
-
     private fun prepare(manager: ResourceManager): BakedReplacements {
         val resources = manager.findResources("overrides/blocks") {
             it.namespace == "firmskyblock" && it.path.endsWith(".json")

diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt
@@ -16,7 +16,6 @@ import net.minecraft.util.Identifier
 import net.minecraft.util.profiler.Profiler
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.annotations.Subscribe
-import moe.nea.firmament.events.BakeExtraModelsEvent
 import moe.nea.firmament.events.CustomItemModelEvent
 import moe.nea.firmament.events.EarlyResourceReloadEvent
 import moe.nea.firmament.events.FinalizeResourceManagerEvent
@@ -69,15 +68,6 @@ object CustomGlobalTextures : SinglePreparationResourceReloader<CustomGlobalText
 				}, event.preparationExecutor)
 	}
 
-	@Subscribe
-	fun onBakeModels(event: BakeExtraModelsEvent) {
-		for (guiClassOverride in preparationFuture.join().classes) {
-			for (override in guiClassOverride.overrides) {
-				event.addItemModel(ModelIdentifier(override.model, "inventory"))
-			}
-		}
-	}
-
 	@Volatile
 	var preparationFuture: CompletableFuture<CustomGuiTextureOverride> = CompletableFuture.completedFuture(
 		CustomGuiTextureOverride(listOf()))

diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReferenceCustomModelsPatch.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReferenceCustomModelsPatch.java