FriendlyByteBuf refactor

.gitignore

@@ -36,6 +36,7 @@
 logs/
 
 run/
+runs/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/

build.gradle

@@ -2,26 +2,14 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id "com.modrinth.minotaur" version "2.+"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
-    id 'net.neoforged.gradle.userdev' version '7.0.80'
+    id 'com.modrinth.minotaur' version '2.+'
+    id 'com.matthewprenger.cursegradle' version '1.4.0'
+    id 'net.neoforged.gradle.userdev' version "$neo_gradle_version"
 }
 
-repositories {
-    maven { url 'https://www.dogforce-games.com/maven/' }
-    maven { // JEI
-        url "https://dvs1.progwml6.com/files/maven"
-    }
-    maven { // Patchouli
-        url "https://maven.blamejared.com"
-    }
-    maven { // CompatLayer
-        url "https://maven.k-4u.nl"
-    }
-}
-
-group= "mcjty.theoneprobe" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-base.archivesName = "theoneprobe"
+version = mod_version
+group = 'mcjty.theoneprobe'
+base.archivesName = 'theoneprobe'
 
 if (System.getenv('BUILD_NUMBER') != null) {
     version += "-${System.getenv('BUILD_NUMBER')}"
@@ -39,57 +27,76 @@ runs {
     configureEach {
         systemProperty 'forge.logging.markers', 'REGISTRIES'
         systemProperty 'forge.logging.console.level', 'debug'
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
         modSource project.sourceSets.main
     }
 
     client {
-        // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
     }
 
     server {
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
         programArgument '--nogui'
     }
 
-    gameTestServer {
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
-    }
-
     data {
         programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
-jar {
-  duplicatesStrategy = DuplicatesStrategy.INCLUDE
+repositories {
+    maven {
+        name 'JEI/Patchouli'
+        url 'https://maven.blamejared.com'
+    }
 }
 
 dependencies {
-    implementation "net.neoforged:neoforge:${neo_version}"
+    implementation "net.neoforged:neoforge:$neo_version"
 
-    compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
-    compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
-    runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
+    compileOnly "mezz.jei:jei-$minecraft_version-common-api:$jei_version"
+    compileOnly "mezz.jei:jei-$minecraft_version-neoforge-api:$jei_version"
+    runtimeOnly "mezz.jei:jei-$minecraft_version-neoforge:$jei_version"
 }
 
-jar {
-    manifest {
-        attributes 'FMLAT': 'accesstransformer.cfg',
-        "Specification-Title": "theoneprobe",
-        "Specification-Vendor": "McJty",
-        "Specification-Version": "1",
-        "Implementation-Title": project.name,
-        "Implementation-Version": "${version}",
-        "Implementation-Vendor" :"McJty",
-        "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+    options.compilerArgs.addAll(['-Xmaxerrs', '100000'])
+}
+
+tasks.withType(ProcessResources).configureEach {
+    var replaceProperties = [
+        minecraft_version       : minecraft_version,
+        minecraft_version_range : minecraft_version_range,
+        neo_version             : neo_version,
+        neo_version_range       : neo_version_range,
+        loader_version_range    : loader_version_range,
+        mod_version             : mod_version,
+    ]
+    inputs.properties replaceProperties
+
+    filesMatching(['META-INF/mods.toml']) {
+        expand replaceProperties + [project: project]
     }
 }
 
-task apiJar(type: Jar) {
-    archiveClassifier = "api"
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes([
+            'Specification-Title'       : 'theoneprobe',
+            'Specification-Vendor'      : 'McJty',
+            'Specification-Version'     : '1',
+            'Implementation-Title'      : project.name,
+            'Implementation-Version'    : project.version,
+            'Implementation-Vendor'     : 'McJty',
+        ])
+    }
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+tasks.register('apiJar', Jar) {
+    archiveClassifier = 'api'
     from(sourceSets.main.output) {
-        include "mcjty/theoneprobe/api/**"
+        include 'mcjty/theoneprobe/api/**'
     }
 }
 
@@ -152,7 +159,7 @@ String getChangelogText() {
         if (it.size() > 1) {
             def temp = it
             if (lineCount == 0) {
-                temp = "${modname} ${version}"
+                temp = "${mod_name} ${mod_version}"
                 temp = "<h2>$temp</h2>"
             } else if (it.startsWith('-')) {
                 temp = "&nbsp;&nbsp;&nbsp;$temp"
@@ -185,12 +192,12 @@ curseforge {
         releaseType = project.curse_type
         addGameVersion project.minecraft_version
         mainArtifact(jar) {
-            displayName = "${modname} - ${version}"
+            displayName = "${mod_name} - ${mod_version}"
         }
         relations {
-            optionalLibrary 'baubles'
-            optionalLibrary 'tesla'
-            optionalLibrary 'redstone-flux'
+            optionalDependency 'baubles'
+            optionalDependency 'tesla'
+            optionalDependency 'redstone-flux'
         }
     }
 }
@@ -202,7 +209,7 @@ modrinth {
     }
     projectId = project.projectSlug
     versionType = project.curse_type
-    versionName = "${modname} - ${version}"
+    versionName = "${mod_name} - ${mod_version}"
     uploadFile = jar
     gameVersions = [project.minecraft_version]
     changelog = System.getenv('CHANGELOG') == null || System.getenv('CHANGELOG').equals('none') ? getChangelogText() : System.getenv('CHANGELOG')

gradle.properties

@@ -1,19 +1,24 @@
+# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
+#org.gradle.jvmargs=
+org.gradle.daemon=false
+org.gradle.debug=false
+
+neogradle.subsystems.parchment.minecraftVersion=1.20.4
+neogradle.subsystems.parchment.mappingsVersion=2024.02.25
+
+minecraft_version=1.20.4
+minecraft_version_range=[1.20.4,1.21)
+neo_version=20.4.190
+neo_gradle_version=7.0.96
+neo_version_range=[20.4,)
+loader_version_range=[2,)
+
 mod_id=theoneprobe
-modname=TheOneProbe
-version=1.20.4_neo-11.0.2
+mod_name=TheOneProbe
+mod_version=1.20.4_neo-11.0.2
+
+jei_version=17.3.0.48
 curse_type=beta
 projectSlug=the-one-probe
 projectId=245211
 github_project=McJtyMods/TheOneProbe
-
-minecraft_version=1.20.4
-neo_version=20.4.151-beta
-
-jei_version=17.3.0.48
-
-
-# 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
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 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
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists