start 1.20.6 update

AtlasMediaGroup · May 10, 2024 · 94a7500 · 94a7500
1 parent 0870033
commit 94a7500
Show file tree

Hide file tree

Showing 62 changed files with 1,716 additions and 3,898 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.15"
+    id("io.papermc.paperweight.patcher") version "1.7.1-SNAPSHOT"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -15,8 +15,8 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.11:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.629.1")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
+    decompiler("net.minecraftforge:forgeflower:2.0.674.3")
     paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
 }
 
@@ -26,15 +26,15 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
 }
 
 subprojects {
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
+        options.release.set(21)
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 group=me.totalfreedom.scissors
-version=1.20.4-R0.1-SNAPSHOT
+version=1.20.6-R0.1-SNAPSHOT
 
-mcVersion=1.20.4
-paperRef=f4c7d373e4a1aff23539fe099745bf29a28559b9
+mcVersion=1.20.6
+paperRef=1b67e023851f406c68789fd5f187cebdac04ce65
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/api/0001-Add-MasterBlockFireEvent.patch b/patches/api/0001-Add-MasterBlockFireEvent.patch