more work

PlazmaMC · May 9, 2024 · ecfd978 · ecfd978
1 parent 146668b
commit ecfd978
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 265 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,6 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java
+    `kotlin-dsl`
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
     id("io.papermc.paperweight.patcher") version "1.6.3"
@@ -24,6 +25,8 @@ val projectRepo = property("projectRepo").toString()
 val upstreamRef = property("plazmaRef").toString()
 val upstreamCommitValue = property("plazmaCommit").toString()
 
+kotlin.jvmToolchain(jdkVersion)
+
 dependencies {
     remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
@@ -191,6 +194,8 @@ tasks {
                     it.replace("plazmaCommit = .*".toRegex(), "plazmaCommit = $latestCommit")
                 }
             }
+
+            project.setProperty("plazmaCommit", latestCommit)
         }
 
         doLast {

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ plazmaRef = dev/1.20.6
 jdkVersion = 21
 
 # Volt - Use ./gradlew updateUpstream to update this value
-plazmaCommit = 0a8bd76ac334956e89ef1291aebbedc57a79ba2c
+plazmaCommit = 7c8614f897928057075daecdaf0348d7a7760bc0
diff --git a/patches/api/0001-Volt-configuration-file.patch b/patches/api/0001-Volt-configuration-file.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Volt configuration file
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2b3786560d8fb93b9899ebc1e0a7c96a808268d0..70685d2d6fe869e1338e74518a252adf70099c4f 100644
+index f1b39968788f90ffc785b9dd434b2a3671553a14..94cff47c2e585881cd4d70b1c02ab43ee6090282 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2233,6 +2233,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2276,6 +2276,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Plazma end