inject loot pools better (v2)

build.gradle.kts

@@ -5,8 +5,6 @@ java.targetCompatibility = JavaVersion.VERSION_1_8
 
 fun p(name: String) = project.property(name).toString()
 
-val apiVersion = p("fabric_api")
-
 plugins {
 	id("fabric-loom")
 	kotlin("jvm")
@@ -17,7 +15,10 @@ dependencies {
 	mappings("net.fabricmc:yarn:${p("yarn")}:v2")
 
 	modImplementation("net.fabricmc:fabric-loader:${p("loader")}")
-	modImplementation(fabricApi.module("fabric-loot-tables-v1", apiVersion))
+
+	listOf("fabric-resource-loader-v0", "fabric-loot-tables-v1").forEach {
+		modImplementation(fabricApi.module(it, p("fabric_api")))
+	}
 
 	modImplementation("net.fabricmc:fabric-language-kotlin:${p("fabric_kotlin")}")
 }

gradle.properties

@@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx1G
 # Project
 id=disco
 name=Disco
-version=1.0.0
+version=2.0.0
 
 # Versions (https://modmuss50.me/fabric.html)
 minecraft=1.16.5
-yarn=1.16.5+build.3
+yarn=1.16.5+build.4
 loader=0.11.1
 
-fabric_api=0.29.4+1.16
-fabric_kotlin=1.4.21+build.1
+fabric_api=0.30.0+1.16
+fabric_kotlin=1.4.30

src/main/java/io/glossnyx/disco/mixin/LootTableAccessor.java

@@ -0,0 +1,12 @@
+package io.glossnyx.disco.mixin;
+
+import net.minecraft.loot.LootPool;
+import net.minecraft.loot.LootTable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(LootTable.class)
+public interface LootTableAccessor {
+	@Accessor("pools")
+	LootPool[] getPools();
+}

src/main/kotlin/io/glossnyx/disco/Addons.kt

@@ -1,20 +1,31 @@
 package io.glossnyx.disco
 
 import net.fabricmc.loader.api.FabricLoader
+import net.fabricmc.loader.api.metadata.CustomValue
 import net.fabricmc.loader.api.metadata.ModMetadata
 import net.minecraft.util.Identifier
 
 data class Addon(
 	val id: String,
 	val discs: List<Disc>,
-	val tables: List<Identifier>
+	val tables: Map<Identifier, List<Identifier>>
 )
 
+fun CustomValue.CvObject.toIdentifierMap() = map { (key, value) ->
+	Identifier(key) to value.asArray.toList().map { Identifier(it.asString) }
+}.toMap()
+
 fun ModMetadata.toAddon(): Addon {
 	val custom = getCustomValue("disco").asObject
 
 	val discs = custom.get("discs").asArray.toList().map { Disc(Identifier(id, it.asString)) }
-	val tables = custom.get("tables").asArray.toList().map { Identifier(it.asString) }
+
+	val tables = custom.get("tables").let {
+		when (it.type) {
+			CustomValue.CvType.OBJECT -> it.asObject.toIdentifierMap()
+			else -> mapOf()
+		}
+	}
 
 	return Addon(id, discs, tables)
 }

src/main/kotlin/io/glossnyx/disco/Entrypoint.kt

@@ -1,6 +1,40 @@
 package io.glossnyx.disco
 
+import io.glossnyx.disco.mixin.LootTableAccessor
+import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback
+import net.minecraft.item.Item
+import net.minecraft.item.ItemGroup
+import net.minecraft.item.ItemStack
+import net.minecraft.item.MusicDiscItem
+import net.minecraft.sound.SoundEvent
+import net.minecraft.text.Text
+import net.minecraft.text.TranslatableText
+import net.minecraft.util.Identifier
+import net.minecraft.util.Rarity
+import net.minecraft.util.registry.Registry
+
 fun init() {
-	registerDiscs()
-	modifyLootTables()
+	addons.flatMap { it.discs }.forEach {
+		Registry.register(Registry.ITEM, it.id, it)
+	}
+
+	LootTableLoadingCallback.EVENT.register { _, lootManager, id, supplier, _ ->
+		val tables = addons.mapNotNull { it.tables[id] }.flatten().distinct()
+
+		tables.forEach {
+			val table = lootManager.getTable(it) as LootTableAccessor
+			table.pools.forEach(supplier::withPool)
+		}
+	}
+}
+
+private val settings = Item.Settings()
+	.group(ItemGroup.MISC)
+	.rarity(Rarity.RARE)
+	.maxCount(1)
+
+class Disc(val id: Identifier) : MusicDiscItem(15, SoundEvent(id), settings) {
+	override fun getName(stack: ItemStack?): Text {
+		return TranslatableText("item.disco.all.name")
+	}
 }

src/main/resources/disco.mixins.json

@@ -0,0 +1,10 @@
+{
+	"required": true,
+	"minVersion": "0.8",
+	"package": "io.glossnyx.disco.mixin",
+	"compatibilityLevel": "JAVA_8",
+	"mixins": ["LootTableAccessor"],
+	"injectors": {
+		"defaultRequire": 1
+	}
+}

src/main/resources/fabric.mod.json

@@ -6,6 +6,7 @@
 	"description": "Modular music disc loader",
 	"authors": ["glossnyx"],
 	"contact": {
+		"homepage": "https://github.com/glossnyx/${id}",
 		"sources": "https://github.com/glossnyx/${id}"
 	},
 	"license": "MIT",
@@ -14,9 +15,11 @@
 	"entrypoints": {
 		"main": ["io.glossnyx.disco.EntrypointKt::init"]
 	},
+	"mixins": ["${id}.mixins.json"],
 	"depends": {
 		"minecraft": "1.16.x",
 		"fabricloader": ">=0.8.7",
+		"fabric-resource-loader-v0": "*",
 		"fabric-loot-tables-v1": "*",
 		"fabric-language-kotlin": "*"
 	}