9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-29 03:49:21 +00:00

Update spigot mapping to remap reobf mapping to mojamp for plugins

This commit is contained in:
Dreeam
2025-06-19 07:27:21 +08:00
parent 1cabe0fef5
commit 060cc7390e
2 changed files with 31 additions and 3 deletions

View File

@@ -13,7 +13,7 @@
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
@@ -24,6 +_,19 @@
@@ -24,11 +_,25 @@
minecraftVersion = providers.gradleProperty("mcVersion")
gitFilePatches = false
@@ -30,9 +30,18 @@
+ activeFork = leaf
+ // Leaf end - project setup
+
+ // Leaf start - Update spigot mapping to compat spigot reobf mapping plugins
spigot {
enabled = false
buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc"
- enabled = false
- buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc"
- packageVersion = "v1_21_R4" // also needs to be updated in MappingEnvironment
+ buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d"
+ packageVersion = "v1_21_R5" // also needs to be updated in MappingEnvironment
}
+ // Leaf end - Update spigot mapping to compat spigot reobf mapping plugins
reobfPackagesToFix.addAll(
"co.aikar.timings",
@@ -47,6 +_,7 @@
libraryRepositories.addAll(
"https://repo.maven.apache.org/maven2/",

View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Thu, 19 Jun 2025 07:37:19 +0800
Subject: [PATCH] Update spigot mapping to compat spigot reobf mapping plugins
diff --git a/src/main/java/io/papermc/paper/util/MappingEnvironment.java b/src/main/java/io/papermc/paper/util/MappingEnvironment.java
index d22e477e3b1cebb3ffc5b96261b8d4fb4ef5b240..b9d5ee2f72993f1a9d65a55988f512b6e9c5f1d8 100644
--- a/src/main/java/io/papermc/paper/util/MappingEnvironment.java
+++ b/src/main/java/io/papermc/paper/util/MappingEnvironment.java
@@ -11,7 +11,7 @@ import org.checkerframework.framework.qual.DefaultQualifier;
@DefaultQualifier(NonNull.class)
public final class MappingEnvironment {
public static final boolean DISABLE_PLUGIN_REMAPPING = Boolean.getBoolean("paper.disablePluginRemapping");
- public static final String LEGACY_CB_VERSION = "v1_21_R4";
+ public static final String LEGACY_CB_VERSION = "v1_21_R5"; // Leaf - Update spigot mapping to compat spigot reobf mapping plugins
private static final @Nullable String MAPPINGS_HASH = readMappingsHash();
private static final boolean REOBF = checkReobf();