Oneconfig, Kotlin, Pathfind lines

.gitignore

@@ -20,3 +20,4 @@ build
 # other
 eclipse
 run
+/$buildDir/

build.gradle

@@ -1,66 +1,137 @@
-// For those who want the bleeding edge
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+plugins {
+    id 'idea'
+    id 'java'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'dev.architectury.architectury-pack200' version '0.1.3'
+    id 'gg.essential.loom' version '0.10.0.+'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.21'
+    id 'net.kyori.blossom' version '1.3.0'
+}
+
+tasks.wrapper {
+    gradleVersion = '7.4'
+    // You can either download the binary-only version of Gradle (BIN) or
+    // the full version (with sources and documentation) of Gradle (ALL)
+    distributionType = Wrapper.DistributionType.ALL
+}
+version = '4.0.0'
+group = 'io.github.quantizr.DungeonRooms'
+archivesBaseName = 'Dungeon_Rooms'
+var mod_name = 'DRM'
+var mod_id = 'dungeonrooms'
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
+blossom {
+    replaceToken("@VER@", version)
+    replaceToken("@NAME@", mod_name)
+    replaceToken("@ID@", mod_id)
+}
+
+loom {
+    launchConfigs {
+        client {
+            arg('--tweakClass', 'cc.polyfrost.oneconfigwrapper.OneConfigWrapper')
         }
     }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+    runs {
+        'client' {
+            property('devauth.enabled','true')
+            client()
+        }
+    }
+    forge {
+        pack200Provider.set(new dev.architectury.pack200.java.Pack200Adapter())
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "3.3.2"
-group= "io.github.quantizr.DungeonRooms" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "Dungeon_Rooms"
 
-sourceCompatibility = targetCompatibility = 1.8
+sourceSets.main {
+    output.setResourcesDir(file('$buildDir/classes/java/main'))
+}
 
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
+
+repositories {
+    mavenCentral()
+    maven { url 'https://repo.polyfrost.cc/releases' }
+    maven { url 'https://jitpack.io' }
+    maven {url 'https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1'}
 }
 
+configurations {
+    implementation.extendsFrom shadowImpl
+}
 
-sourceSets {
-    main {
-        output.resourcesDir = java.outputDir
-    }
+
+test {
+    useJUnitPlatform()
 }
 
 
-minecraft {
-    version = "1.8.9-11.15.1.2318-1.8.9"
-    runDir = "run"
+dependencies {
+    minecraft('com.mojang:minecraft:1.8.9')
+    mappings('de.oceanlabs.mcp:mcp_stable:22-1.8.9')
+    forge('net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9')
+
+    implementation 'org.jetbrains:annotations-java5:23.0.0'
+    implementation 'org.joml:joml:1.10.5'
+    implementation 'com.github.ben-manes.caffeine:caffeine:2.9.3'
 
-    mappings = "stable_22"
+    modRuntimeOnly('me.djtheredstoner:DevAuth-forge-legacy:1.1.0')
+
+    compileOnly 'cc.polyfrost:oneconfig-1.8.9-forge:0.1.0-alpha+' // Should not be included in jar
+    implementation 'cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-alpha+' // Should be included in jar
 }
 
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
 
-jar {
-    manifest.attributes(
-            'Main-Class': 'DungeonRoomsInstallerFrame'
-    )
+tasks.withType(Jar) {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    archivesBaseName = 'drm'
+    manifest {
+        attributes['ModSide'] = 'CLIENT'
+        attributes['TweakOrder'] = '0'
+        attributes['TweakClass'] = 'cc.polyfrost.oneconfigwrapper.OneConfigWrapper'
+        attributes['ForceLoadAsMod'] = 'true'
+        attributes['FMLCorePluginContainsFMLMod'] = 'true'
+//        this['TweakClass'] = 'org.spongepowered.asm.launch.MixinTweaker'
+//        this['MixinConfigs'] = 'mixins.examplemod.json'
+    }
 }
 
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
 
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
+tasks.shadowJar {
 
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
+    archiveFileName = jar.archiveFileName
+    relocate 'org.joml', 'io.github.quantizr.org.joml'
+    relocate 'com.github.benmanes.caffeine', 'io.github.quantizr.com.github.benmanes.caffeine'
+
+    dependencies {
+        include(dependency('org.joml:joml:..*'))
+        include(dependency('cc.polyfrost:oneconfig-wrapper-launchwrapper:..*'))
+        include(dependency('com.github.ben-manes.caffeine:caffeine:..*'))
     }
+}
+
+
+tasks.named('remapJar') {
+    archiveClassifier = 'all'
+    from(tasks.shadowJar)
+    input = tasks.shadowJar.archiveFile
+}
+
 
-    // copy everything else, thats not the mcmod.info
+tasks.assemble.dependsOn tasks.remapJar
+
+processResources {
+    inputs.property 'version', project.version
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+        duplicatesStrategy = 'include'
+        include 'mcmod.info'
+        expand 'version': project.version
     }
-}
+}

gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx2G
+loom.platform=forge

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jan 26 23:06:02 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

settings.gradle

@@ -0,0 +1,21 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven{ url "https://oss.sonatype.org/content/repositories/snapshots"}
+        maven{ url "https://maven.architectury.dev/"}
+        maven{ url "https://maven.fabricmc.net"}
+        maven{ url "https://maven.minecraftforge.net/"}
+        maven{ url "https://repo.spongepowered.org/maven/"}
+        maven{ url "https://repo.sk1er.club/repository/maven-releases/"}
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "gg.essential.loom") {
+                useModule("gg.essential:architectury-loom:${requested.version}")
+            }
+        }
+    }
+}
+
+rootProject.name = "Dungeon Rooms"