From 276b46e903b4d6dea4f6cf0a5bd22c79d8a55f48 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 5 May 2024 12:09:38 -0500 Subject: [PATCH] Update Paper --- build.gradle.kts | 6 +++--- gradle.properties | 2 +- patches/api/0003-Add-Scissors-configuration-file.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ef6de15..50141c3 100644 --- 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.6.3" + id("io.papermc.paperweight.patcher") version "1.7.0" } 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.1:fat") + decompiler("net.minecraftforge:forgeflower:2.0.674.2") paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT") } diff --git a/gradle.properties b/gradle.properties index 684e448..707fb2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.6-R0.1-SNAPSHOT mcVersion=1.20.6 -paperRef=544ce20e01820151d1984aecf3d9a7199071fb06 +paperRef=716dfd869822a2694fcc2e097ebe404862660853 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0003-Add-Scissors-configuration-file.patch b/patches/api/0003-Add-Scissors-configuration-file.patch index 730c474..7900fc2 100644 --- a/patches/api/0003-Add-Scissors-configuration-file.patch +++ b/patches/api/0003-Add-Scissors-configuration-file.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Scissors configuration file diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 27084402cf0e46dcd171074629b7c4156e48aa44..684e317c68e1be547bb4907222dbe47ead1c55e0 100644 +index 30cbe3bdc7142769019765b03cc4fe1f9ba1ddb4..d1f5766f2b021df282b929457a27d09f7c21a21e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2254,6 +2254,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2257,6 +2257,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end