Remove remaining usages of modelId

The modelId property was functionally replaced with the new custom model data component

Author: NichtStudioCode

nova/src/main/kotlin/xyz/xenondevs/nova/world/item/legacy/ItemStackLegacyConversion.kt

@@ -51,7 +51,6 @@ internal object ItemStackLegacyConversion {
             NamespacedKey("nova", "damage"),
         ))
 
-        registerConverter(ItemStackSubIdToModelIdConverter)
         registerConverter(ItemStackNovaDamageConverter)
         registerConverter(ItemStackEnchantmentsConverter)
     }

nova/src/main/kotlin/xyz/xenondevs/nova/world/item/legacy/ItemStackLegacyConverter.kt

@@ -13,7 +13,6 @@ import org.bukkit.NamespacedKey
 import xyz.xenondevs.cbf.CBF
 import xyz.xenondevs.nova.serialization.cbf.NamespacedCompound
 import xyz.xenondevs.nova.util.data.getByteArrayOrNull
-import xyz.xenondevs.nova.util.data.getIntOrNull
 import xyz.xenondevs.nova.util.data.getOrNull
 import xyz.xenondevs.nova.util.getOrThrow
 import kotlin.jvm.optionals.getOrNull
@@ -80,20 +79,6 @@ internal class ItemStackPersistentDataConverter(
 
 }
 
-internal data object ItemStackSubIdToModelIdConverter : ItemStackTagLegacyConverter() {
-    
-    override fun convert(tag: CompoundTag) {
-        val novaTag = tag.getOrNull<CompoundTag>("nova")
-            ?: return
-        val subId = novaTag.getIntOrNull("subId")
-        if (subId == null || subId == 0) {
-            novaTag.remove("subId")
-            novaTag.putString("modelId", "default")
-        }
-    }
-    
-}
-
 internal data object ItemStackNovaDamageConverter : ItemStackLegacyConverter {
 
     @Suppress("DEPRECATION")

nova/src/main/kotlin/xyz/xenondevs/nova/world/item/logic/PacketItems.kt

@@ -86,8 +86,7 @@ import xyz.xenondevs.nova.util.unwrap
 import xyz.xenondevs.nova.world.item.NovaItem
 import java.lang.invoke.MethodHandles
 import java.lang.invoke.MethodType
-import java.util.Optional
-import kotlin.collections.map
+import java.util.*
 import com.mojang.datafixers.util.Pair as MojangPair
 import net.minecraft.world.item.ItemStack as MojangStack
 
@@ -404,13 +403,11 @@ internal object PacketItems : Listener, PacketListener {
         return type == DataComponents.CUSTOM_DATA
     }
 
-    private fun getUnknownItem(itemStack: MojangStack, id: String?, modelId: String = "default"): MojangStack {
+    private fun getUnknownItem(itemStack: MojangStack, id: String?): MojangStack {
         return MojangStack(Items.BARRIER).apply {
             set(
                 DataComponents.ITEM_NAME,
-                Component.literal(
-                    "Unknown item: $id" + if (modelId != "default") ":$modelId" else ""
-                ).withStyle(ChatFormatting.RED)
+                Component.literal("Unknown item: $id").withStyle(ChatFormatting.RED)
             )
             storeServerSideTag(this, itemStack)
         }