mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Enable spigot obfuscation support (#12695)

Browse source
This commit is contained in:
Bjarne Koll 2025-06-20 23:11:33 +02:00 • committed by GitHub
parent 4b3f967e49
commit a7dd263566
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build-data/reobf-mappings-patch.tiny
View file

@ -21,7 +21,7 @@ c net/minecraft/world/level/chunk/LevelChunk net/minecraft/world/level/chunk/Chu
# See mappings-patch.tiny # See mappings-patch.tiny
c net/minecraft/server/level/ChunkMap net/minecraft/server/level/PlayerChunkMap c net/minecraft/server/level/ChunkMap net/minecraft/server/level/PlayerChunkMap
f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager G f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager H
# The method is made public by Spigot, which then causes accidental overrides # The method is made public by Spigot, which then causes accidental overrides
c net/minecraft/world/entity/Entity net/minecraft/world/entity/Entity c net/minecraft/world/entity/Entity net/minecraft/world/entity/Entity

6
paper-server/build.gradle.kts
View file

@ -25,9 +25,9 @@ paperweight {
gitFilePatches = false gitFilePatches = false
spigot { spigot {
enabled = false enabled = true
buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc" buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d"
packageVersion = "v1_21_R4" // also needs to be updated in MappingEnvironment packageVersion = "v1_21_R5" // also needs to be updated in MappingEnvironment
} }
reobfPackagesToFix.addAll( reobfPackagesToFix.addAll(

2
paper-server/src/main/java/io/papermc/paper/util/MappingEnvironment.java
View file

@ -11,7 +11,7 @@ import org.checkerframework.framework.qual.DefaultQualifier;
@DefaultQualifier(NonNull.class) @DefaultQualifier(NonNull.class)
public final class MappingEnvironment { public final class MappingEnvironment {
public static final boolean DISABLE_PLUGIN_REMAPPING = Boolean.getBoolean("paper.disablePluginRemapping"); 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";
private static final @Nullable String MAPPINGS_HASH = readMappingsHash(); private static final @Nullable String MAPPINGS_HASH = readMappingsHash();
private static final boolean REOBF = checkReobf(); private static final boolean REOBF = checkReobf();