fabric 1.20.1 functional port

build.gradle

@@ -1,7 +1,6 @@
 //file:noinspection GradlePackageVersionRange
 plugins {
-    id "fabric-loom" version "1.3.+"
-    id "io.github.juuxel.loom-vineflower" version "1.+"
+    id "fabric-loom" version "1.6-SNAPSHOT"
     id "maven-publish"
 }
 
@@ -30,7 +29,7 @@ repositories {
     maven { url = "https://maven.wispforest.io" } // TOP
     maven { url = "https://storage.googleapis.com/devan-maven/" }
     maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu, Trinkets, EMI
-    maven { url = "https://mvn.devos.one/snapshots/" } // Porting Lib, Forge Tags, Tinkers, Mantle
+    maven { url = "https://mvn.devos.one/releases/" } // Porting Lib, Forge Tags, Tinkers, Mantle
     maven { url = "https://maven.ladysnake.org/releases" } // Cardinal Components API
     maven { url = "https://maven.parchmentmc.net/" } // Parchment
     maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
@@ -80,12 +79,12 @@ dependencies {
     // compat
     modImplementation("dev.emi:trinkets:${project.trinkets_version}")
     // EMI
-    modCompileOnly("dev.emi:emi:${project.emi_version}") { transitive = false }
+    modCompileOnly("dev.emi:emi-fabric:${project.emi_version}") { transitive = false }
     // JEI
     // FIXME remapping issues with API jar
 //    deps.modCompileOnly("mezz.jei:jei-${project.minecraft_version}-common-api:${project.jei_version}") { transitive = false }
 //    deps.modCompileOnly("mezz.jei:jei-${project.minecraft_version}-fabric-api:${project.jei_version}") { transitive = false }
-    modCompileOnly("mezz.jei:jei-1.19.3-fabric:${project.jei_version}") { transitive = false }
+    modCompileOnly("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}") { transitive = false }
     // REI
     modCompileOnly("me.shedaniel.cloth:basic-math:0.6.0") { transitive = false }
     modCompileOnly("dev.architectury:architectury-fabric:${project.architectury_version}") { transitive = false }
@@ -94,11 +93,12 @@ dependencies {
     // Jade
     modImplementation("curse.maven:jade-324717:${jade_id}")
     // TOP
-    modCompileOnly("mcjty.theoneprobe:theoneprobe-fabric:${top_version}")
+    // No longer update
+//    modCompileOnly("mcjty.theoneprobe:theoneprobe-fabric:${top_version}")
 
     String recipeViewer = project.recipe_viewer
     if (recipeViewer == "emi") {
-        modLocalRuntime("dev.emi:emi:${project.emi_version}") { transitive = false }
+        modLocalRuntime("dev.emi:emi-fabric:${project.emi_version}") { transitive = false }
     } else if (recipeViewer == "jei") {
         modLocalRuntime("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}") { transitive = false }
     } else if (recipeViewer == "rei") {

gradle.properties

@@ -12,7 +12,7 @@ group_name=com.github.teamtwilight.twilightforest
 minecraft_version=1.20.1
 # https://fabricmc.net/develop/
 fabric_version=0.86.0+1.20.1
-loader_version=0.14.21
+loader_version=0.15.11
 
 # setup
 # https://lambdaurora.dev/tools/import_quilt.html
@@ -22,37 +22,38 @@ parchment_version = 2023.07.23
 # https://www.curseforge.com/minecraft/mc-mods/forge-config-api-port-fabric
 config_api_version = 8.0.0
 # https://modrinth.com/mod/cardinal-components-api
-cca_version = 5.2.1
+cca_version = 5.2.2
 
 # https://github.com/Fabricators-of-Create/Porting-Lib
-port_lib_version = 2.1.1087+1.20
-port_lib_modules = accessors,base,data,entity,extensions,lazy_registration,models,networking,tags,transfer,utility,model_generators,model_builders,loot
+port_lib_version = 2.3.4+1.20.1
+port_lib_modules = accessors,base,data,entity,extensions,lazy_registration,models,networking,tags,transfer,utility,model_generators,model_builders,model_loader,loot,registries
 
 # compat
 # https://github.com/emilyploszaj/trinkets/releases
 trinkets_version = 3.7.1
 
 # dev env mods
 # https://modrinth.com/mod/modmenu
-modmenu_version = 6.1.0-rc.4
+modmenu_version = 7.2.2
 # https://modrinth.com/mod/suggestion-tweaker
-suggestion_tweaker_version = 1.19.1-1.3.1
+suggestion_tweaker_version = 1.20-1.5.2
 # for REI and suggestion tweaker - https://modrinth.com/mod/cloth-config
-cloth_config_version = 9.0.94
+cloth_config_version = 11.1.118
 
 # https://www.curseforge.com/minecraft/mc-mods/jade/files/all
-jade_id = 4438356
+jade_id = 5530010
 # https://www.curseforge.com/minecraft/mc-mods/the-one-probe-fabric/files
-top_version = 1.19-6.0.0
+# No longer update
+#top_version = 1.19-6.0.0
 
 # for REI - https://www.curseforge.com/minecraft/mc-mods/architectury-api
-architectury_version = 8.1.75
+architectury_version = 9.2.14
 # https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items
-rei_version=11.0.597
+rei_version=12.1.740
 # https://github.com/emilyploszaj/emi/releases/
-emi_version = 0.7.2+1.19.4
+emi_version = 1.1.10+1.20.1
 # https://www.curseforge.com/minecraft/mc-mods/jei/files/all
-jei_version = 12.0.2.2
+jei_version = 15.8.2.25
 
 # What recipe viewer to use ('emi', 'rei', or 'jei'. if you change it, don't push it)
-recipe_viewer = rei
+recipe_viewer = emi

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/generated/README.txt

@@ -1,5 +1,5 @@
 The files under this directory should **not** be edited by hand, and any PR's trying to do so
 will be closed without warning. Please see the twilightforest.data package and edit the appropriate datagenerator,
-then run the `runData` gradle task to regenerate these files.
+then run the `runDatagen` gradle task to regenerate these files.
 
-Basically: src/main/resources = hand-edited, src/generated/resources = `runData`-generated.
+Basically: src/main/resources = hand-edited, src/generated/resources = `runDatagen`-generated.

src/generated/resources/.cache/1301fe2bfed6631fc9725a19a7110fde9c21ce7b

@@ -1,2 +1,2 @@
-// 1.19.3	2023-02-14T15:39:27.659959759	The Twilight Forest/Twilight Forest Enchantment Tags
-f7b3dc52882c97677d74a0dc930bba865c49332d data/twilightforest/tags/enchantment/phantom_armor_banned_enchants.json
+// 1.20.1	2024-11-05T17:26:03.868804	The Twilight Forest/Twilight Forest Enchantment Tags
+f7b3dc52882c97677d74a0dc930bba865c49332d data\twilightforest\tags\enchantment\phantom_armor_banned_enchants.json

src/generated/resources/.cache/15ceda4792fd1cea724ad1f5aef0f9573f4fb64e

@@ -0,0 +1,7 @@
+// 1.20.1	2024-11-05T17:26:03.8648032	The Twilight Forest/Twilight Forest Wood Palette Tags
+1e4fe824eee9b2cde9a98423265a11e9f80eb4eb data\twilightforest\tags\wood_palettes\well_swizzle_mask.json
+b10e3c1ec45b721b1dee81e0d5c0ad9d72a95eb9 data\twilightforest\tags\wood_palettes\druid_hut_swizzle_mask.json
+265731121ea72d3fb96f83b5f3d69695ff1d6d80 data\twilightforest\tags\wood_palettes\common.json
+1a4da23eca76fbea0f617b87e0005b98dfc57f85 data\twilightforest\tags\wood_palettes\treasure.json
+106d8bd858b683432b07ff45a62c5f5651a1ba67 data\twilightforest\tags\wood_palettes\uncommon.json
+b2b124b96881ce4886e055e8ee4089362f98e845 data\twilightforest\tags\wood_palettes\rare.json

src/generated/resources/.cache/1b3dd519894ba69dc4765dee17b09a8228017482

@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-28T19:12:48.9842738	Global Loot Modifiers : twilightforest
-d18971f5e2ac4ddbfba3cc790e9817c20548a830 data/forge/loot_modifiers/global_loot_modifiers.json
-8fbe9976345cfe808e7a57b9690d227491492fb9 data/twilightforest/loot_modifiers/fiery_pick_smelting.json
-7110d07feb8fa62ed414ad72b2f0644a5cda469f data/twilightforest/loot_modifiers/giant_pick_grouping.json
+// 1.20.1	2024-11-05T17:26:03.8588013	The Twilight Forest/Global Loot Modifiers : twilightforest
+8fbe9976345cfe808e7a57b9690d227491492fb9 data\twilightforest\loot_modifiers\fiery_pick_smelting.json
+7110d07feb8fa62ed414ad72b2f0644a5cda469f data\twilightforest\loot_modifiers\giant_pick_grouping.json
+d18971f5e2ac4ddbfba3cc790e9817c20548a830 data\forge\loot_modifiers\global_loot_modifiers.json