Update to 1.21

build.gradle.kts

···
 
 repositories {
     cloche {
-        mavenForge()
+        mavenNeoforged()
         mavenFabric()
         mavenParchment()
         librariesMinecraft()
         main()
     }
     mavenCentral()
+    maven("https://maven.neoforged.net/mojang-meta")
     maven("https://thedarkcolour.github.io/KotlinForForge/")
     maven("https://maven.theillusivec4.top/")
     maven("https://maven.teamresourceful.com/repository/maven-public/")
···
         author("Naomi Roberts")
     }
 
-    minecraftVersion = "1.20.1"
+    minecraftVersion = "1.21.1"
 
     fabric {
         loaderVersion = libs.versions.fabric.loader
···
             }
 
             entrypoint("main") {
-                value = "xyz.naomieow.angle_ring.fabric.AngleRingFabric"
+                value = "xyz.naomieow.angle_ring.AngleRingFabric"
                 adapter = "kotlin"
             }
         }
     }
 
-    forge {
-        loaderVersion = libs.versions.forge.loader
+    neoforge {
+        loaderVersion = libs.versions.neoforge.loader
 
         dependencies {
-            modImplementation(libs.forge.kotlin)
+            modImplementation(libs.neoforge.kotlin)
 
             // Curios
             // Probably a better way to do this but appending `:api` to the version didn't
             // work so we get this monstrosity
-            compileOnly("${libs.forge.curios.get().module}:${libs.forge.curios.get().version}:api")
-            runtimeOnly(libs.forge.curios)
+            modCompileOnlyApi("${libs.neoforge.curios.get().module}:${libs.neoforge.curios.get().version}:api")
+            modRuntimeOnly(libs.neoforge.curios)
         }
 
         runs {
···
                 dependency {
                     modId = "curios"
                     required = true
-                    version(libs.versions.forge.curios.get())
+                    version(libs.versions.neoforge.curios.get())
                 }
                 dependency {
                     modId = "kotlinforforge"
                     required = true
-                    version(libs.versions.forge.kotlin.get())
+                    version(libs.versions.neoforge.kotlin.get())
                 }
             }
 
-            loaderVersion("4")
+            loaderVersion("5")
             modLoader = "kotlinforforge"
         }
     }

libs.versions.toml

···
 # Common
 kotlin = "2.1.0"
 # Fabric
-fabric-loader = "0.16.13"
-fabric-api = "0.92.5"
-fabric-kotlin = "1.13.2+kotlin.2.1.20"
-fabric-trinkets = "3.7.1"
-fabric-modmenu = "7.2.2"
-# Forge
-forge-loader = "47.4.0"
-forge-kotlin = "4.11.0"
-forge-curios = "5.14.1+1.20.1"
+fabric-loader = "0.16.14"
+fabric-api = "0.116.1"
+fabric-kotlin = "1.13.3+kotlin.2.1.21"
+fabric-trinkets = "3.10.0"
+fabric-modmenu = "11.0.3"
+# Neoforge
+neoforge-loader = "21.1.176"
+neoforge-kotlin = "5.8.0"
+neoforge-curios = "9.2.0+1.21.1"
 
 [libraries]
 # Fabric
···
 fabric-modmenu = { module = "com.terraformersmc:modmenu", version.ref = "fabric-modmenu" }
 fabric-trinkets = { module = "dev.emi:trinkets", version.ref = "fabric-trinkets" }
 # Forge
-forge-kotlin = { module = "thedarkcolour:kotlinforforge", version.ref = "forge-kotlin" }
-forge-curios = { module = "top.theillusivec4.curios:curios-forge", version.ref = "forge-curios" }
+neoforge-kotlin = { module = "thedarkcolour:kotlinforforge-neoforge", version.ref = "neoforge-kotlin" }
+neoforge-curios = { module = "top.theillusivec4.curios:curios-neoforge", version.ref = "neoforge-curios" }
 
 [plugins]
 cloche = { id = "earth.terrarium.cloche", version = "0.9.24" }

src/common/main/kotlin/xyz/naomieow/angle_ring/AngleRing.kt

···
 
 object AngleRing {
     const val MOD_ID: String = "angle_ring"
+
     @JvmStatic
     val LOGGER: Logger = Logger.getLogger(MOD_ID)
 
     fun id(id: String): ResourceLocation {
-        return ResourceLocation(MOD_ID, id)
+        return ResourceLocation.tryBuild(MOD_ID, id)!!
     }
 }
 

src/fabric/main/kotlin/xyz/naomieow/angle_ring/fabric/AngleRingFabric.kt src/fabric/main/kotlin/xyz/naomieow/angle_ring/AngleRingFabric.kt

···
-package xyz.naomieow.angle_ring.fabric
+package xyz.naomieow.angle_ring
 
 import net.fabricmc.api.ModInitializer
-import xyz.naomieow.angle_ring.AngleRing
-import xyz.naomieow.angle_ring.fabric.registry.AngleRingItems
+import xyz.naomieow.angle_ring.registry.AngleRingItems
 
 class AngleRingFabric: ModInitializer {
     override fun onInitialize() {

src/fabric/main/kotlin/xyz/naomieow/angle_ring/fabric/item/AngleRingItem.kt src/fabric/main/kotlin/xyz/naomieow/angle_ring/item/AngleRingItem.kt

···
-package xyz.naomieow.angle_ring.fabric.item
+package xyz.naomieow.angle_ring.item
 
 import dev.emi.trinkets.api.SlotReference
 import dev.emi.trinkets.api.TrinketItem
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.item.ItemStack
-import xyz.naomieow.angle_ring.item.IAngleRingItem
 
 class AngleRingItem(properties: Properties): TrinketItem(properties), IAngleRingItem {
     override fun onEquip(stack: ItemStack?, slot: SlotReference?, entity: LivingEntity?) {

src/fabric/main/kotlin/xyz/naomieow/angle_ring/fabric/registry/AngleRingItems.kt src/fabric/main/kotlin/xyz/naomieow/angle_ring/registry/AngleRingItems.kt

···
-package xyz.naomieow.angle_ring.fabric.registry
+package xyz.naomieow.angle_ring.registry
 
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.Rarity
 import xyz.naomieow.angle_ring.AngleRing
-import xyz.naomieow.angle_ring.fabric.item.AngleRingItem
+import xyz.naomieow.angle_ring.item.AngleRingItem
 
 object AngleRingItems {
     fun registerAll() {
···
                 .stacksTo(1)
                 .rarity(Rarity.EPIC)
                 .fireResistant()
-            )
+        )
         )
     }
 

src/forge/main/kotlin/xyz/naomieow/angle_ring/forge/AngleRingForge.kt

···
-package xyz.naomieow.angle_ring.forge
-
-import net.minecraftforge.fml.common.Mod
-import thedarkcolour.kotlinforforge.forge.MOD_BUS
-import xyz.naomieow.angle_ring.AngleRing
-import xyz.naomieow.angle_ring.forge.registry.AngleRingItems
-
-@Mod(AngleRing.MOD_ID)
-class AngleRingForge {
-    init {
-        AngleRingItems.ITEMS.register(MOD_BUS)
-    }
-}

src/forge/main/kotlin/xyz/naomieow/angle_ring/forge/item/AngleRingItem.kt src/neoforge/main/kotlin/xyz/naomieow/angle_ring/item/AngleRingItem.kt

···
-package xyz.naomieow.angle_ring.forge.item
+package xyz.naomieow.angle_ring.item
 
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import top.theillusivec4.curios.api.SlotContext
 import top.theillusivec4.curios.api.type.capability.ICurioItem
-import xyz.naomieow.angle_ring.item.IAngleRingItem
 
 class AngleRingItem(properties: Properties): Item(properties), ICurioItem, IAngleRingItem {
     override fun onEquip(slotContext: SlotContext?, prevStack: ItemStack?, stack: ItemStack?) {

src/forge/main/kotlin/xyz/naomieow/angle_ring/forge/registry/AngleRingItems.kt

···
-package xyz.naomieow.angle_ring.forge.registry
-
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.Rarity
-import net.minecraftforge.registries.DeferredRegister
-import net.minecraftforge.registries.ForgeRegistries
-import net.minecraftforge.registries.RegistryObject
-import xyz.naomieow.angle_ring.AngleRing
-import xyz.naomieow.angle_ring.forge.item.AngleRingItem
-
-object AngleRingItems {
-    @JvmStatic
-    var ITEMS: DeferredRegister<Item> = DeferredRegister.create(ForgeRegistries.ITEMS, AngleRing.MOD_ID)
-    @JvmStatic
-    var ANGLE_RING: RegistryObject<Item> = ITEMS.register("angle_ring") {
-        AngleRingItem(
-            Item.Properties()
-                .stacksTo(1)
-                .rarity(Rarity.EPIC)
-                .fireResistant()
-        )
-    }
-}

src/neoforge/main/kotlin/xyz/naomieow/angle_ring/AngleRingNeoforge.kt

···
+package xyz.naomieow.angle_ring
+
+import net.neoforged.fml.common.Mod
+import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS
+import xyz.naomieow.angle_ring.registry.AngleRingItems
+
+@Mod(AngleRing.MOD_ID)
+class AngleRingNeoforge {
+    init {
+        AngleRingItems.REGISTRY.register(MOD_BUS)
+    }
+}

src/neoforge/main/kotlin/xyz/naomieow/angle_ring/registry/AngleRingItems.kt

···
+package xyz.naomieow.angle_ring.registry
+
+import net.minecraft.world.item.Item
+import net.minecraft.world.item.Rarity
+import net.neoforged.neoforge.registries.DeferredItem
+import net.neoforged.neoforge.registries.DeferredRegister
+import xyz.naomieow.angle_ring.AngleRing
+import xyz.naomieow.angle_ring.item.AngleRingItem
+
+object AngleRingItems {
+    @JvmStatic
+    val REGISTRY: DeferredRegister.Items = DeferredRegister.createItems(AngleRing.MOD_ID)
+    @JvmStatic
+    var ANGLE_RING: DeferredItem<Item> = REGISTRY.register("angle_ring") { ->
+        AngleRingItem(Item.Properties()
+            .stacksTo(1)
+            .rarity(Rarity.EPIC)
+            .fireResistant()
+        )
+
+    }
+}