diff --git a/build-data/mappings-patch.tiny b/build-data/mappings-patch.tiny deleted file mode 100644 index 14a2a3582..000000000 --- a/build-data/mappings-patch.tiny +++ /dev/null @@ -1,5 +0,0 @@ -tiny 2 0 spigot mojang+yarn - -# Originally DistanceManager, which also implements DistanceManager, so clashes since the implemented class -# is imported and not fully qualified. Easiest fix is to just change the name -c net/minecraft/server/level/PlayerChunkMap$a net/minecraft/server/level/ChunkMap$ChunkDistanceManager diff --git a/build-data/paper.at b/build-data/paper.at deleted file mode 100644 index 48a44de36..000000000 --- a/build-data/paper.at +++ /dev/null @@ -1,18 +0,0 @@ -# You can use this file to change the access modifiers on a member -# This line would make the field rollAmount public in Bee -#public net.minecraft.world.entity.animal.Bee rollAmount -# This line would make the field public and remove the final modifier -#public-f net.minecraft.network.protocol.game.ClientboundChatPacket sender -# Leave out the member and it will apply to the class itself -# More info, see here https://mcforge.readthedocs.io/en/latest/advanced/accesstransformers/#access-modifiers - -# Remap/Decompile fix (unclear why this is happening) -public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V - -# AT remap issue? todo 1.18 -public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch; -public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag; - -# TODO 1.20 remapSpigotAt.at doesn't remap the return type for this method for some reason -public net/minecraft/world/entity/Display$TextDisplay getText()Lnet/minecraft/network/chat/Component; -public net/minecraft/world/entity/Display$BlockDisplay getBlockState()Lnet/minecraft/world/level/block/state/BlockState; diff --git a/build-data/reobf-mappings-patch.tiny b/build-data/reobf-mappings-patch.tiny deleted file mode 100644 index 347b2b8fd..000000000 --- a/build-data/reobf-mappings-patch.tiny +++ /dev/null @@ -1,28 +0,0 @@ -# We would like for paperweight to generate 100% perfect reobf mappings (and deobf mappings for that matter). -# But unfortunately it's not quite there yet - and it may be some time before that happens. Generating perfect mappings -# from Spigot's mappings is extremely difficult due to Spigot's bad tooling and bad mappings. To add insult to injury -# we remap Spigot's _source code_ which is a lot more complex and error-prone than bytecode remapping. So with all that -# said, this file exists to help fill in the gap. -# -# We will continue to improve paperweight and will work on fixing these issues so they don't come up in the first place, -# but these mappings exist to prevent these issues from holding everything else in Paper up while we work through all -# of these issues. Due to the complex nature of mappings generation and the debugging difficulty involved it may take -# a significant amount of time for us to track down every possible issue, so this file will likely be around and in -# use - at least in some capacity - for a long time. - -tiny 2 0 mojang+yarn spigot - -# CraftBukkit changes type -c net/minecraft/server/level/ServerLevel net/minecraft/server/level/WorldServer - f Lnet/minecraft/world/level/storage/PrimaryLevelData; serverLevelData K - -c net/minecraft/world/level/chunk/LevelChunk net/minecraft/world/level/chunk/Chunk - f Lnet/minecraft/server/level/ServerLevel; level r - -# See mappings-patch.tiny -c net/minecraft/server/level/ChunkMap net/minecraft/server/level/PlayerChunkMap - f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager F - -# The method is made public by Spigot, which then causes accidental overrides -c net/minecraft/world/entity/Entity net/minecraft/world/entity/Entity - m ()Z isInRain isInRain0 diff --git a/gradle.properties b/gradle.properties index 4c862b087..d24a33b62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=com.lokamc.slice version=1.21.3-R0.1-SNAPSHOT mcVersion=1.21.3 -paperRef=c28d89d625c60243c52857e0c7e6398b73602156 +paperRef=817550c5204f752e0a5dc05ff26320560058a911 updatingMinecraft=false org.gradle.caching=true