Update to 1.19.4

gradle.properties

@@ -8,14 +8,14 @@ org.gradle.vfs.watch=false
 mcVersion=1.19
 
 # Toki info
-gameVersion=1.19.3
-tokiVersion=0.1.0
+gameVersion=1.19.4
+tokiVersion=0.1.1
 spigotMappingsRef=177811e1fa90f674897a302820f3ed84e4d65688
 mojangMappingsRef=bc44f6dd84cd2f3ad8c0caad850eaca9e82067e3
 
 # Server info
 group=net.tetratau.toki
-version=1.19.3-R0.1-SNAPSHOT
-paperRef=f2f9e8cc4dde8b2e754d193d553b99fa824515b1
-fabricloaderRef=f6d91ee3b3d32dffb5aa7763254ac98bcaa3ed23
-paperclipRef=2ad9096cef63480c181de3aad51928f329adda8a
+version=1.19.4-R0.1-SNAPSHOT
+paperRef=bcec5b11e6728f3eb3078aa4fcc8e87f3d545ec2
+fabricloaderRef=69fefcb72af0598524b1468028b3a93202dc517b
+paperclipRef=dce5d44d81c25081c349e97643724e73d1d9b3a7

gradle/wrapper/gradle-wrapper.properties

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

patches/fabricloader/0001-Buildscript-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Buildscript changes
 
 
 diff --git a/build.gradle b/build.gradle
-index 3229e092695e80db3a7090166a41fba2cd9f2669..01a9ec66c39162b0050118faf744f153f0cb2254 100644
+index 25584794fc1e1b4cc9631111be6282c7ba929bb2..cc17e2b64c534ba74b28301c78feb9ddeb1ed225 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -30,7 +30,7 @@ allprojects {
@@ -74,40 +74,125 @@ index 552e71512f9e1ffc9451b5eb3133571ae7daa686..6f33ca08d8b0f10ee7406a7636006e18
  	// log4j wrapper
  	compileOnly 'org.apache.logging.log4j:log4j-api:2.8.1'
 diff --git a/minecraft/minecraft-test/build.gradle b/minecraft/minecraft-test/build.gradle
-index 4cf7a4002f21a7ca1338eebb2b721676c3be3c6d..45b3b81355a81ce97bc8ccd7716bc88acc517450 100644
+deleted file mode 100644
+index bc524f4c17ef9d875eccab7a52c5cc9eeb473a61..0000000000000000000000000000000000000000
 --- a/minecraft/minecraft-test/build.gradle
-+++ b/minecraft/minecraft-test/build.gradle
-@@ -15,7 +15,7 @@ dependencies {
- 	minecraft "com.mojang:minecraft:${minecraft_version}"
- 	mappings "net.fabricmc:yarn:${minecraft_version}+build.3:v2"
-
++++ /dev/null
+@@ -1,116 +0,0 @@
+-apply plugin: "fabric-loom"
+-
+-sourceCompatibility = JavaVersion.VERSION_17
+-targetCompatibility = JavaVersion.VERSION_17
+-
+-loom {
+-	runConfigs.configureEach {
+-		ideConfigGenerated = true
+-	}
+-}
+-
+-def minecraft_version = "1.19.3";
+-
+-repositories {
+-	mavenCentral()
+-}
+-
+-dependencies {
+-	minecraft "com.mojang:minecraft:${minecraft_version}"
+-	mappings "net.fabricmc:yarn:${minecraft_version}+build.3:v2"
+-
 -	implementation project(":minecraft")
-+	implementation project(":fabric-loader:minecraft") // Toki
-
- 	// Required for mixin annotation processor
- 	annotationProcessor "org.ow2.asm:asm:${project.asm_version}"
-@@ -55,7 +55,7 @@ dependencies {
- 	productionRuntime "net.fabricmc:intermediary:${minecraft_version}"
-
- 	// Include the external libraries on the classpath
+-	implementation project(":minecraft").sourceSets.main.output
+-	implementation project(":").sourceSets.main.output
+-
+-	// Required for mixin annotation processor
+-	annotationProcessor "org.ow2.asm:asm:${project.asm_version}"
+-	annotationProcessor "org.ow2.asm:asm-analysis:${project.asm_version}"
+-	annotationProcessor "org.ow2.asm:asm-commons:${project.asm_version}"
+-	annotationProcessor "org.ow2.asm:asm-tree:${project.asm_version}"
+-	annotationProcessor "org.ow2.asm:asm-util:${project.asm_version}"
+-
+-	/**
+-	 * Ensure we are using the mixin version loader is built against to test the AP.
+-	 * Otherwise Loom will default to an older version (due to no mod loader on the mod* configs)
+-	 */
+-	annotationProcessor ("net.fabricmc:sponge-mixin:${project.mixin_version}") {
+-		exclude module: 'launchwrapper'
+-		exclude module: 'guava'
+-	}
+-
+-	testImplementation project(":junit")
+-}
+-
+-test {
+-	useJUnitPlatform()
+-}
+-
+-tasks.withType(JavaCompile).configureEach {
+-	it.options.encoding = "UTF-8"
+-	it.options.release = 17
+-}
+-
+-import net.fabricmc.loom.util.OperatingSystem
+-import groovy.json.JsonSlurper
+-
+-configurations {
+-	productionRuntime {
+-		extendsFrom configurations.minecraftLibraries
+-		extendsFrom configurations.loaderLibraries
+-		extendsFrom configurations.minecraftRuntimeOnlyLibraries
+-	}
+-	productionRuntimeMods
+-}
+-
+-dependencies {
+-	productionRuntime "net.fabricmc:intermediary:${minecraft_version}"
+-
+-	// Include the external libraries on the classpath
 -	def installerJson = new JsonSlurper().parse(rootProject.file("src/main/resources/fabric-installer.json"))
-+	def installerJson = new JsonSlurper().parse(project(":fabric-loader").file("src/main/resources/fabric-installer.json")) // Toki
- 	installerJson.libraries.common.each {
- 		productionRuntime it.name
- 	}
-@@ -65,7 +65,7 @@ dependencies {
- 	productionRuntimeMods "net.fabricmc.fabric-api:fabric-api:0.69.1+1.19.3:testmod"
- }
-
+-	installerJson.libraries.common.each {
+-		productionRuntime it.name
+-	}
+-
+-	// Use Fabric's auto client test
+-	productionRuntimeMods "net.fabricmc.fabric-api:fabric-api:0.69.1+1.19.3"
+-	productionRuntimeMods "net.fabricmc.fabric-api:fabric-api:0.69.1+1.19.3:testmod"
+-}
+-
 -def loaderJarTask = project(":").tasks.proguardJar
-+def loaderJarTask = project(":fabric-loader").tasks.proguardJar // Toki
-
- // This is very far beyond loom's API if you copy this, you're on your own.
- task runProductionAutoTestClient(type: JavaExec, dependsOn: [loaderJarTask]) {
-@@ -101,4 +101,4 @@ task runProductionAutoTestClient(type: JavaExec, dependsOn: [loaderJarTask]) {
- 			"-Dfabric.autoTest"
- 		)
- 	}
+-
+-// This is very far beyond loom's API if you copy this, you're on your own.
+-task runProductionAutoTestClient(type: JavaExec, dependsOn: [loaderJarTask]) {
+-	classpath.from configurations.productionRuntime
+-	classpath.from loaderJarTask
+-	mainClass = "net.fabricmc.loader.impl.launch.knot.KnotClient"
+-	workingDir = file("run")
+-
+-	afterEvaluate {
+-		dependsOn downloadAssets
+-	}
+-
+-	doFirst {
+-		classpath.from loom.minecraftProvider.minecraftClientJar
+-		workingDir.mkdirs()
+-
+-		args(
+-			"--assetIndex", loom.minecraftProvider.versionInfo.assetIndex().fabricId(loom.minecraftProvider.minecraftVersion()),
+-			"--assetsDir", new File(loom.files.userCache, "assets").absolutePath,
+-			"--gameDir", workingDir.absolutePath
+-		)
+-
+-		if (OperatingSystem.CURRENT_OS == OperatingSystem.MAC_OS) {
+-			jvmArgs(
+-				"-XstartOnFirstThread"
+-			)
+-		}
+-
+-		def mods = configurations.productionRuntimeMods.files.join(File.pathSeparator)
+-
+-		jvmArgs(
+-			"-Dfabric.addMods=${mods}",
+-			"-Dfabric.autoTest"
+-		)
+-	}
 -}
 \ No newline at end of file
-+}

patches/fabricloader/0002-Implement-Paper-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Paper support
 
 
 diff --git a/build.gradle b/build.gradle
-index 01a9ec66c39162b0050118faf744f153f0cb2254..5e0de6eaba8c2f7ea7d9e10e560c2499a95f27ad 100644
+index cc17e2b64c534ba74b28301c78feb9ddeb1ed225..d3b1e2208dc7c5202ec09b9e43349f91855fabb6 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -69,6 +69,9 @@ dependencies {
@@ -19,7 +19,7 @@ index 01a9ec66c39162b0050118faf744f153f0cb2254..5e0de6eaba8c2f7ea7d9e10e560c2499
  	api("net.fabricmc:sponge-mixin:${project.mixin_version}") {
  		exclude module: 'launchwrapper'
 diff --git a/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/MinecraftGameProvider.java b/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/MinecraftGameProvider.java
-index d51321551437bead68505a3c4f45a9af1e0c55e4..5fc3239f9e6f3b488f5804881331c9d4564a5bc5 100644
+index b3b4659f38248abb999b1057cf7d8a8dfa2cc198..048c484893f3d5e31548f44145dcf4b519688429 100644
 --- a/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/MinecraftGameProvider.java
 +++ b/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/MinecraftGameProvider.java
 @@ -33,6 +33,8 @@ import java.util.Locale;
@@ -40,7 +40,7 @@ index d51321551437bead68505a3c4f45a9af1e0c55e4..5fc3239f9e6f3b488f5804881331c9d4
  	}
 
  	@Override
-@@ -438,11 +440,17 @@ public class MinecraftGameProvider implements GameProvider {
+@@ -439,11 +441,17 @@ public class MinecraftGameProvider implements GameProvider {
  		for (Path lib : miscGameLibraries) {
  			launcher.addToClassPath(lib);
  		}
@@ -101,10 +101,10 @@ index 8858165dcc7a0cc6fabf0ddd61544f3a07295afc..ace57703416fd91dc1feaf3a66988f35
  						return false;
 diff --git a/settings.gradle b/settings.gradle
 deleted file mode 100644
-index 9c7c525d2c495a109c6fccf11bf6a4123d0e38c8..0000000000000000000000000000000000000000
+index 53ecb17d9c2084e03b1939e5fbf3b43753836464..0000000000000000000000000000000000000000
 --- a/settings.gradle
 +++ /dev/null
-@@ -1,18 +0,0 @@
+@@ -1,19 +0,0 @@
 -pluginManagement {
 -	repositories {
 -		maven {
@@ -117,6 +117,7 @@ index 9c7c525d2c495a109c6fccf11bf6a4123d0e38c8..00000000000000000000000000000000
 -rootProject.name='fabric-loader'
 -
 -include "minecraft"
+-include "junit"
 -
 -if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
 -	include "minecraft:minecraft-test"
@@ -125,10 +126,10 @@ index 9c7c525d2c495a109c6fccf11bf6a4123d0e38c8..00000000000000000000000000000000
 -}
 \ No newline at end of file
 diff --git a/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java b/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
-index ef918b9edad8c58bc9a77870de88cc73fc9904ef..7989133389f7cbb06c4537211dd61b896bc9b576 100644
+index 9ad8408db379e7a01b50cac95dd5bb8a217c204c..cdca3057c4f6744f4cd41a7c7d9a3adba2e36466 100644
 --- a/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
 +++ b/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
-@@ -195,7 +195,7 @@ public final class FabricLoaderImpl extends net.fabricmc.loader.FabricLoader {
+@@ -197,7 +197,7 @@ public final class FabricLoaderImpl extends net.fabricmc.loader.FabricLoader {
  	}
 
  	private void setup() throws ModResolutionException {
@@ -180,7 +181,7 @@ index 0000000000000000000000000000000000000000..00410e1bda684d22ed5bc8610b4ae07e
 +	}
 +}
 diff --git a/src/main/java/net/fabricmc/loader/impl/launch/knot/Knot.java b/src/main/java/net/fabricmc/loader/impl/launch/knot/Knot.java
-index c162461a107b74e8d3c8ad8430ac7fcb46202391..d6e84b3366e6171bdb243980aef91d5e7293586a 100644
+index 6c273f4ce30790d79400ea30adf030a8bf04447d..85919f88a5f9568af79f93296123039e4bf69271 100644
 --- a/src/main/java/net/fabricmc/loader/impl/launch/knot/Knot.java
 +++ b/src/main/java/net/fabricmc/loader/impl/launch/knot/Knot.java
 @@ -259,7 +259,7 @@ public final class Knot extends FabricLauncherBase {
@@ -193,7 +194,7 @@ index c162461a107b74e8d3c8ad8430ac7fcb46202391..d6e84b3366e6171bdb243980aef91d5e
 
  	@Override
 diff --git a/src/main/resources/fabric-installer.json b/src/main/resources/fabric-installer.json
-index 01d3601816b0d65ab4eec3f936de22b2868f0a0a..e0ff157c9af93575c81fa8ddee3379771593d1d2 100644
+index 49dac23e8453e78938338dfc61590fcefd1edc27..9aac60bc8fc731eb1a26942067d315d6a40dfebb 100644
 --- a/src/main/resources/fabric-installer.json
 +++ b/src/main/resources/fabric-installer.json
 @@ -39,6 +39,10 @@

settings.gradle.kts

@@ -1,11 +1,15 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://maven.fabricmc.net")
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+}
+
 rootProject.name = "toki"
 
 include(
@@ -15,6 +19,7 @@ include(
     "test-plugin",
     "fabric-loader",
     "fabric-loader:minecraft",
+    "fabric-loader:junit",
     "paperclip",
     "paperclip:java6",
     "paperclip:java17",