Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2022-05-31 07:02:13 +00:00
parent c3085f82b4
commit 35a0558bdf
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -13,7 +13,7 @@ repositories {
dependencies {
remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.29")
decompiler("net.minecraftforge:forgeflower:1.5.605.7")
paperclip("io.papermc:paperclip:3.0.2")
}

2
gradle.properties
View File

@@ -4,4 +4,4 @@ version = 1.18.2-R0.1-SNAPSHOT
mcVersion = 1.18.2
packageVersion = 1_18_R2
org.gradle.jvmargs=-Xmx2G
paperRef=b6a6544ad128a5ed5579342ea673edf48b51c46f
paperRef=f210f67c4ad1560685e4354dfa242c120e42efe3

8
patches/server/0001-Build-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index dd8f449dddbe0838835ae8f8d5033aa422db403d..129c2b6609b18228813691e5eae419698f74ef63 100644
index 0282e3b75470e1a68ea1fc228082483514ba432e..8e4d7a1a5828450a3f3bb77c84929f40c909476d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,12 @@ plugins {
@@ -23,7 +23,7 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..129c2b6609b18228813691e5eae41969
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -53,13 +57,13 @@ tasks.jar {
@@ -54,13 +58,13 @@ tasks.jar {
manifest {
val git = Git(rootProject.layout.projectDirectory.path)
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
@@ -39,7 +39,7 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..129c2b6609b18228813691e5eae41969
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -147,7 +151,7 @@ fun TaskContainer.registerRunTask(
@@ -148,7 +152,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -84,7 +84,7 @@ index c8d56947305c981a3268ce4ae3e975db350ceff2..0706891d8b042675eb67b367324925c5
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ba4578fb4a2d861a6ffbb0ec022db31d9d7cc2be..ddeeddfe252c405913864af3ec1aaec333f65ded 100644
index ab843069ac0653d03cf3f925f49555016cad84fa..4ddbfab9c3992e044215cd2b5936893189ab13cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper

4
patches/server/0013-Redstone-Shears-Wrench.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Redstone Shears Wrench
diff --git a/src/main/java/net/minecraft/world/item/ShearsItem.java b/src/main/java/net/minecraft/world/item/ShearsItem.java
index 78243f6defda3fd495dfb088df63075586c8a46f..c143e3a205e86e92d4b43692a0ac3081a76e5dd1 100644
index e77af779c77de6d5580c13699df3e7d890fe7aba..8dee591de6358e577d4c78063cd86191c4f71cd1 100644
--- a/src/main/java/net/minecraft/world/item/ShearsItem.java
+++ b/src/main/java/net/minecraft/world/item/ShearsItem.java
@@ -1,7 +1,11 @@
@@ -39,7 +39,7 @@ index 78243f6defda3fd495dfb088df63075586c8a46f..c143e3a205e86e92d4b43692a0ac3081
public class ShearsItem extends Item {
public ShearsItem(Item.Properties settings) {
@@ -78,6 +92,59 @@ public class ShearsItem extends Item {
@@ -77,6 +91,59 @@ public class ShearsItem extends Item {
}
}