1

build.gradle

@@ -3,90 +3,156 @@ buildscript {
         maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
         maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
-        maven { url = 'https://maven.parchmentmc.org' }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath "org.spongepowered:mixingradle:${mixingradle_version}"
         classpath 'org.parchmentmc:librarian:1.+'
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'eclipse'
+plugins {
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+}
+
 apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 
 version = "${ll_version}"
-group = 'dev.xkmc.modulargolems' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'modulargolems'
+group = "dev.kxmc.${modid}"
+archivesBaseName = "${modid}"
+
+if (lljij.toBoolean()) jarJar.enable()
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    //mappings channel: 'official', version: "${minecraft_version}"
-    mappings channel: 'parchment', version: '2022.08.14-1.19.2'
+    //mappings channel: 'parchment', version: '1.19.3-2023.03.12-1.19.4'
+    mappings channel: 'official', version: "${minecraft_version}"
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     runs {
         client {
             workingDirectory project.file('run')
-            arg '-mixin.config=modulargolems.mixins.json'
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'info'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             mods {
-                modulargolems {
+                "${modid}" {
                     source sourceSets.main
                 }
             }
         }
 
         server {
             workingDirectory project.file('run')
-            arg '-mixin.config=modulargolems.mixins.json'
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'info'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             mods {
-                modulargolems {
+                "${modid}" {
                     source sourceSets.main
                 }
             }
         }
 
         data {
             workingDirectory project.file('run')
-            arg '-mixin.config=modulargolems.mixins.json'
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'info'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'modulargolems', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            args '--mod', "${modid}", '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
             mods {
-                modulargolems {
+                "${modid}" {
                     source sourceSets.main
                 }
             }
         }
     }
 }
 
-// Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 mixin {
-    add sourceSets.main, 'modulargolems.refmap.json'
-    config 'modulargolems.mixins.json'
+    add sourceSets.main, "${modid}.refmap.json"
+    config "${modid}.mixins.json"
+}
+
+jar {
+    manifest {
+        attributes([
+                "Specification-Title"     : "${modid}",
+                "Specification-Vendor"    : "xkmc",
+                "Specification-Version"   : "1", // We are version 1 of ourselves
+                "Implementation-Title"    : project.name,
+                "Implementation-Version"  : project.jar.archiveVersion,
+                "Implementation-Vendor"   : "xkmc",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+                'MixinConfigs'            : "${modid}.mixins.json"
+        ])
+    }
+}
+
+java {
+    withSourcesJar()
+}
+
+jar.finalizedBy('reobfJar')
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact jar
+        }
+    }
+    repositories {
+        maven {
+            url "file://${project.projectDir}/mcmodsrepo"
+        }
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+}
+
+if (lljij.toBoolean()) {
+
+    reobf {
+        jarJar {}
+    }
+
+    tasks.jarJar.finalizedBy('reobfJarJar')
+
+    tasks.jarJar.configure {
+        archiveClassifier.set('')
+    }
+
+    jar {
+        archiveClassifier.set('slim')
+    }
+}
+
+dependencies {
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    compileOnly(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${mixin_extras_version}"))
+    if (rootMod.toBoolean()) {
+        implementation(jarJar("com.github.llamalad7.mixinextras:mixinextras-forge:${mixin_extras_version}")) {
+            transitive = false
+            jarJar.ranged(it, "[${mixin_extras_version},)")
+        }
+    } else {
+        implementation("com.github.llamalad7.mixinextras:mixinextras-forge:${mixin_extras_version}")
+    }
+    annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
+    compileOnly fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
+    if (rootMod.toBoolean()) {
+        jarJar(group: 'com.tterrag.registrate', name: 'Registrate', version: "[MC1.20,MC1.21)")
+    }
 }
 
+
 repositories {
+    maven { url 'https://jitpack.io' }
     maven {
         // Location of the maven that hosts JEI files (and TiC)
         name 'Progwml6 maven'
@@ -108,86 +174,58 @@ repositories {
             includeGroup "curse.maven"
         }
     }
-    maven {
-        url "https://maven.architectury.dev/"
-    }
-    maven { url "https://maven.bai.lol" }
-    maven {
-        url "https://maven.saps.dev/minecraft"
-        content {
-            includeGroup "dev.latvian.mods"
-            includeGroup "dev.ftb.mods"
-        }
-    }
-    maven { url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' }
     flatDir {
         dirs 'libs'
     }
     maven {
         url = "https://maven.theillusivec4.top/"
     }
+    mavenLocal()
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
 
-    implementation fg.deobf("dev.xkmc.l2library:l2library:${l2library_version}")
-    implementation fg.deobf('dev.xkmc.l2complements:l2complements:1.3.0')
+    implementation fg.deobf("dev.xkmc.l2library:l2library:${l2library_version}-slim")
+    implementation fg.deobf("dev.xkmc.l2serial:l2serial:1.2.0")
+    runtimeOnly fg.deobf("dev.xkmc.l2modularblock:l2modularblock:1.1.0")
+    implementation fg.deobf("dev.xkmc.l2tabs:l2tabs:0.1.5")
+    implementation fg.deobf("dev.xkmc.l2screentracker:l2screentracker:0.1.2")
+    implementation fg.deobf("dev.xkmc.l2itemselector:l2itemselector:0.1.1")
+
+    implementation fg.deobf(jarJar("dev.xkmc.l2damagetracker:l2damagetracker:0.1.4")) {
+        transitive = false
+        jarJar.ranged(it, "[0.1.4,)")
+    }
+
+    runtimeOnly fg.deobf("dev.xkmc.l2backpack:l2backpack:2.4.5-slim")
+    implementation fg.deobf('dev.xkmc.l2complements:l2complements:2.4.11-slim')
+
     implementation fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}")
     implementation fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
-    implementation fg.deobf('dev.xkmc.l2backpack:l2backpack:1.8.3')
 
-    runtimeOnly fg.deobf('dev.xkmc.l2archery:l2archery:1.2.0')
-    runtimeOnly fg.deobf('dev.xkmc.l2weaponry:l2weaponry:1.1.3')
+    //runtimeOnly fg.deobf("dev.xkmc.l2artifacts:l2artifacts:2.2.0.pre4")
+    runtimeOnly fg.deobf("dev.xkmc.l2archery:l2archery:2.4.7")
+    runtimeOnly fg.deobf("dev.xkmc.l2weaponry:l2weaponry:2.4.8")
 
-    runtimeOnly fg.deobf('curse.maven:wthit-forge-455982:3947982')
-    runtimeOnly fg.deobf('curse.maven:badpackets-615134:3903799')
-    implementation fg.deobf('curse.maven:the-twilight-forest-227639:4075841')
-    implementation fg.deobf('curse.maven:create-328085:4371809')
-    implementation fg.deobf('curse.maven:create-enchantment-industry-688768:4504113')
-    implementation fg.deobf('zip.local.blazegear:blazegear:1.3.3')
+    //implementation fg.deobf('curse.maven:the-twilight-forest-227639:4539671')
+    //implementation fg.deobf('zip.local.blazegear:blazegear:1.3.5')
 
-    compileOnly fg.deobf("com.tterrag.registrate:Registrate:MC1.19-1.1.5")
+    runtimeOnly fg.deobf("curse.maven:badpackets-615134:4438956")
+    runtimeOnly fg.deobf("curse.maven:wthit-forge-455982:4596739")
+    runtimeOnly fg.deobf("curse.maven:attributefix-280510:4588114")
+    runtimeOnly fg.deobf("curse.maven:bookshelf-228525:4581675")
+    runtimeOnly fg.deobf("curse.maven:enchantment-descriptions-250419:4587429")
 
-    compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api")
-    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
+    //runtimeOnly fg.deobf('curse.maven:bookshelf-228525:4454755')
+    //runtimeOnly fg.deobf('curse.maven:enchantment-descriptions-250419:4445054')
+    //runtimeOnly fg.deobf('curse.maven:appleskin-248787:4440123')
 
-    //implementation fg.deobf('curse.maven:ic2-classic-242942:4441313')
+    implementation fg.deobf("curse.maven:create-328085:4626108")
+    implementation fg.deobf("curse.maven:the-twilight-forest-227639:4635921")
 
-}
+    runtimeOnly fg.deobf("curse.maven:patchouli-306770:4633797")
 
-// Example for how to get properties into the manifest for reading at runtime.
-jar {
-    manifest {
-        attributes([
-                "Specification-Title"     : "modulargolems",
-                "Specification-Vendor"    : "xkmc",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "xkmc",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-                'MixinConfigs'            : 'modulargolems.mixins.json'
-        ])
-    }
-}
-
-// Example configuration to allow publishing using the maven-publish plugin
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar')
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-// publish.dependsOn('reobfJar')
+    //implementation fg.deobf('curse.maven:ic2-classic-242942:4441313')
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact jar
-        }
-    }
-    repositories {
-        maven {
-            url "file://${project.projectDir}/mcmodsrepo"
-        }
-    }
 }
+

gradle.properties

@@ -1,23 +1,21 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-
-# mod version info
-ll_version = 1.9.5
-minecraft_version = 1.19.2
-forge_version = 43.2.0
-
-# build dependency versions
-forgegradle_version = 5.1.+
 mixingradle_version = 0.7-SNAPSHOT
 mixin_version = 0.8.5
-shadow_version = 7.1.0
 
-# dependency versions
-jei_minecraft_version = 1.19.2-forge
-jei_version = 11.4.0.285
-curios_version = 1.19.2-5.1.1.0
-l2library_version = 1.9.4
-patchouli_version = 1.19.2-76
+minecraft_version = 1.20.1
+forge_version = 47.0.49
+mixin_extras_version = 0.2.0-beta.8
+registrate_version = MC1.20-1.3.3
+jei_minecraft_version = 1.20.1-forge
+jei_version = 15.2.0.22
+curios_version = 5.2.0-beta.3+1.20.1
+
+modid = modulargolems
+ll_version = 2.4.7
+lljij = true
+rootMod = false
+
+l2library_version = 2.4.14
+patchouli_version = 1.20.1-80-FORGE-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

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