Total Rewrite + MC Update

.gitignore

@@ -24,4 +24,6 @@ run
 *.un~
 libs
 
-changelog.md
+changelog.md
+
+/src/main/generated/

build.gradle

@@ -1,14 +1,13 @@
 plugins {
-    id 'fabric-loom' version '0.11-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'io.github.juuxel.loom-quiltflower' version '1.6.0'
     id 'maven-publish'
-    id "org.jetbrains.kotlin.jvm"
     id 'com.matthewprenger.cursegradle' version '1.4.0'
     id "com.modrinth.minotaur" version "2.+"
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -43,9 +42,9 @@ repositories {
     }
     maven {
         name = "Ladysnake Libs"
-        url = 'https://ladysnake.jfrog.io/artifactory/mods'
+        url = 'https://maven.ladysnake.org/releases/'
         content {
-            includeGroup "io.github.ladysnake"
+            includeGroup "org.ladysnake"
             includeGroupByRegex "io\\.github\\.onyxstudios.*"
             includeGroupByRegex "dev\\.onyxstudios.*"
         }
@@ -138,6 +137,20 @@ repositories {
             includeGroup 'squeek.appleskin'
         }
     }
+    maven {
+        name = "Nucleoid"
+        url = "https://maven.nucleoid.xyz"
+        content {
+            includeGroup 'xyz.nucleoid'
+        }
+    }
+    maven {
+        name = "SmartBrainLib (SBL) Maven Repo"
+        url = "https://dl.cloudsmith.io/public/tslat/sbl/maven/"
+        content {
+            includeGroup "net.tslat.smartbrainlib"
+        }
+    }
     maven {
         name = "CurseMaven"
         url "https://www.cursemaven.com"
@@ -155,7 +168,7 @@ repositories {
 
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    mappings loom.officialMojangMappings()
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     ///
@@ -166,117 +179,94 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}") {
     }
 
-    // Fabric Language Kotlin
-    modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
-
-    // GeckoLib
-    modImplementation("software.bernie.geckolib:geckolib-fabric-1.19.3:${project.geckolib_version}") {
-        exclude group: "com.eliotlash.mclib"
-        exclude group: "com.eliotlash.molang"
-        exclude group: "net.fabricmc.fabric-api"
-    }
-
     ///
     /// INCLUDED
     ///
 
-    // Satin
-    modImplementation include("io.github.ladysnake:satin:${project.satin_version}") {
+    // Apoli
+    /*modCompileOnly ("com.github.apace100:apoli:${project.apoli_version}") {
         exclude group: "net.fabricmc.fabric-api"
-    }
+    }*/
 
-    // Reach Entity Attributes
-    modImplementation include("com.jamieswhiteshirt:reach-entity-attributes:${project.rea_version}") {
+    // Cardinal Components
+    modImplementation include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cc_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
-
-    // Patchouli
-    modImplementation include("vazkii.patchouli:Patchouli:${project.patchouli_version}") {
+    modImplementation include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cc_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
 
-    // Cloth Config
-    modImplementation include("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
+    // Data Functions
+    modImplementation include("com.williambl.dfunc:data-functions:${project.dfunc_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
 
-    // CCA
-    modApi include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cc_version}") {
+    // Actions
+    modImplementation include("com.williambl.actions:actions:${project.actions_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
-    modApi include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cc_version}") {
-        exclude group: "net.fabricmc.fabric-api"
-    }
-
-    // LibCD
-    //include "io.github.cottonmc:LibCD:${project.libcd_version}"
-    //modRuntime "io.github.cottonmc:LibCD:${project.libcd_version}"
 
-    // Fabric Permissions API
-    modImplementation include("me.lucko:fabric-permissions-api:${project.fpa_version}") {
+    // Reach Entity Attributes
+    include modImplementation("com.jamieswhiteshirt:reach-entity-attributes:${project.rea_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
 
-    // Pehkui
-    modImplementation include("com.github.Virtuoel:Pehkui:${project.pehkui_version}") {
+    // Satin
+    modImplementation include("org.ladysnake:satin:${project.satin_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
 
-    ///
-    /// SOFT DEPS
-    ///
-
-    // REI
-    modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}") {
+    // More codecs
+    modImplementation include("xyz.nucleoid:more-codecs:${project.morecodecs_version}") {
         exclude group: "net.fabricmc.fabric-api"
-        transitive = false
     }
 
-    // EMI
-    modCompileOnly("dev.emi:emi:${project.emi_version}") {
-        exclude group: "net.fabricmc.fabric_api"
-        exclude group: "null"
-        transitive = false
-    }
-
-    // Origins
-    modCompileOnly("com.github.apace100:origins-fabric:${project.origins_version}") {
-        exclude module: "modmenu"
-        exclude group: "io.github.OnyxStudios.Cardinal-Components-API"
+    // Smart Brain Lib
+    modImplementation include("net.tslat.smartbrainlib:SmartBrainLib-fabric-${project.minecraft_version}:${project.sbl_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
-
-    // Rat's Mischief
-    modCompileOnly("io.github.ladysnake:Rats-Mischief:${project.rats_version}") {
-        exclude group: "com.eliotlash.mclib"
-        exclude group: "com.eliotlash.molang"
+    modImplementation include("net.tslat.smartbrainlib:SmartBrainLib-common-${project.minecraft_version}:${project.sbl_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
+}
 
-    // Bewitchment
-    modCompileOnly("curse.maven:bewitchment-394915:${project.bewitchment_version}") {
-        exclude group: "net.fabricmc.fabric-api"
-        transitive = false
-    }
+loom {
+    splitEnvironmentSourceSets()
 
-    // Flan
-    modCompileOnly("io.github.flemmli97:flan:${project.flan_version}:fabric-api") {
-        exclude group: "net.fabricmc.fabric-api"
-        transitive = false
+    mods {
+        modid {
+            sourceSet sourceSets.main
+            sourceSet sourceSets.client
+        }
     }
+    runs {
+        // This adds a new gradle task that runs the datagen API: "gradlew runDatagen"
+        datagen {
+            inherit server
+            name "Data Generation"
+            vmArg "-Dfabric-api.datagen"
+            vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
+            vmArg "-Dfabric-api.datagen.modid=haema"
 
-    // Appleskin
-    modCompileOnly("squeek.appleskin:appleskin-fabric:${project.appleskin_version}:api") {
-        exclude group: "net.fabricmc.fabric-api"
-        transitive = false
+            runDir "build/datagen"
+        }
     }
 
-    // ModMenu
-    modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") {
-        exclude group: "net.fabricmc.fabric-api"
+    accessWidenerPath = file("src/main/resources/haema.accesswidener")
+}
+
+// Add the generated resources to the main source set
+sourceSets {
+    main {
+        resources {
+            srcDirs += [
+                    'src/main/generated'
+            ]
+        }
     }
 }
 
+
 processResources {
     inputs.property "version", project.version
 
@@ -285,21 +275,19 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 17
 }
 
 java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
 
 jar {
     from("LICENSE") {
-        // Make filename unique
         rename { "${it}_${project.archivesBaseName}"}
     }
 }
@@ -323,17 +311,6 @@ publishing {
     }
 }
 
-compileKotlin.kotlinOptions.jvmTarget = "16"
-
-/**
- * https://dev.to/williambl/mixins-kotlin-and-default-methods-why-they-don-t-work-together-417d
- */
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        freeCompilerArgs += '-Xjvm-default=all'
-    }
-}
-
 curseforge {
     apiKey = project.hasProperty('curseforge_api_key') ? project.property('curseforge_api_key') : ''
     //noinspection GroovyAssignabilityCheck

gradle.properties

@@ -4,74 +4,45 @@ kotlin.stdlib.default.dependency=false
 
 # Fabric Properties
 # Check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.5
-loader_version=0.14.18
+minecraft_version=1.20.4
+loader_version=0.15.6
 
-loom_version=1.1-SNAPSHOT
+loom_version=1.3-SNAPSHOT
 
 # Mod Properties
-mod_version = 1.10.4+1.19.3
+mod_version = 2.0.0+1.20.1
 maven_group = com.williambl.haema
 archives_base_name = haema
 
 curseforge_project_id = 391257
 modrinth_project_id = haema
 
 # Fabric API
-fabric_version=0.76.0+1.19.3
-
-# Fabric Language Kotlin
-kotlin_version=1.8.10
-fabric_kotlin_version=1.9.2+kotlin.1.8.10
+fabric_version=0.95.3+1.20.4
 
 # GeckoLib (For Rats)
-geckolib_version=4.0.6
+geckolib_version=4.2.1
 
 # Satin
-satin_version=1.10.0
-
-# Reach Entity Attributes
-rea_version=2.3.1
-
-# Patchouli
-patchouli_version=1.19.3-78-FABRIC
-
-# Cloth Config
-cloth_config_version=9.0.94
+satin_version=1.16.0
 
 # Cardinal Components API
-cc_version=5.1.0
-
-# LibCD
-libcd_version=3.0.3+1.16.3
+cc_version=5.4.0
 
-# Fabric Permissions API
-fpa_version=0.1-SNAPSHOT
+# Apoli
+apoli_version=v2.9.0
 
-# Pehkui
-pehkui_version=3.7.0
+# DFunc
+dfunc_version=0.7.25
 
-# Roughly Enough Items
-rei_version=10.0.596
+# Actions
+actions_version=1.0.6
 
-# EMI
-emi_version=0.7.2+1.19.3
-
-# Origins
-origins_version=1.6.2
-
-# Rats
-rats_version=1.3.9
-
-# Bewitchment
-bewitchment_version=3882386
-
-# FLan
-flan_version=1.19-1.7.10
+# Reach Entity Attributes
+rea_version = 2.4.1+haema
 
-# Appleskin
-appleskin_version=mc1.19.3-2.4.2
+# More Codecs
+morecodecs_version=0.3.3+1.20.2
 
-# Mod Menu
-modmenu_version=5.1.0-beta.4
+# Smart Brain Lib
+sbl_version=1.13

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -10,10 +10,4 @@ pluginManagement {
         }
         gradlePluginPortal()
     }
-
-    plugins {
-        id 'fabric-loom' version loom_version
-        id "org.jetbrains.kotlin.jvm" version kotlin_version
-    }
-
 }