Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Remove no longer needed mapping patches

Browse Source 
Spigot uses mojang method names now
This commit is contained in:
Jason Penilla 2021-11-23 15:09:11 -08:00
parent 82ac70466e
commit 44ee55cf7a
1 changed files with 3 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
build-data/mappings-patch.tiny
View File

@ -6,108 +6,8 @@ tiny 2 0 spigot mojang+yarn
# is imported and not fully qualified. Easiest fix is to just change the name # 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 c net/minecraft/server/level/PlayerChunkMap$a net/minecraft/server/level/ChunkMap$ChunkDistanceManager
#c net/minecraft/server/network/PlayerConnection net/minecraft/server/network/ServerGamePacketListenerImpl # We add the getLevel method back to Hopper since mojang removed it - we need the method for hooper optimization
# # CB adds getPlayer()CraftPlayer, conflicts with getPlayer()ServerPlayer # We add the method with this name to match the mojmap method of the same name in BlockEntity
# m ()Lorg/bukkit/craftbukkit/entity/CraftPlayer; getPlayer getCraftPlayer # Since we add the method we need to add the mapping for it so reobf works as expected
# m (DDDFFLorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)V a teleport
# # CB adds int, ItemStack to end of params
# m (Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/world/item/ItemStack;ILnet/minecraft/world/item/ItemStack;)V a updateBookPages
#
## CraftBukkit adds the getType() method, clashes with a Mojang method
#c net/minecraft/world/entity/EntityAreaEffectCloud net/minecraft/world/entity/AreaEffectCloud
# m ()Ljava/lang/String; getType getPotionType
#
## CraftBukkit adds the getType() method, clashes with a Mojang method
#c net/minecraft/world/entity/projectile/EntityTippedArrow net/minecraft/world/entity/projectile/Arrow
# m ()Ljava/lang/String; getType getPotionType
#
## CraftBukkit adds a new `a` method which allows passing the Entity parameter
## It uses `a` to match the original method (with just 1 param), so this patch makes them match
#c net/minecraft/server/level/WorldServer net/minecraft/server/level/ServerLevel
# m (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/entity/Entity;)V a makeObsidianPlatform
#
## CraftBukkit adds limit param
#c net/minecraft/world/level/SpawnerCreature$d net/minecraft/world/level/NaturalSpawner$SpawnState
# m (Lnet/minecraft/world/entity/EnumCreatureType;I)Z a canSpawnForCategory
#
## CraftBukkit adds a TeleportCause to methods in ServerPLayer
#c net/minecraft/server/level/EntityPlayer net/minecraft/server/level/ServerPlayer
# m (Lnet/minecraft/server/level/WorldServer;Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)Lnet/minecraft/world/entity/Entity; b changeDimension
# m (Lnet/minecraft/server/level/WorldServer;DDDFFLorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)V a teleportTo
# p 0 targetWorld
# p 1 x
# p 2 y
# p 3 z
# p 4 yaw
# p 5 pitch
#
## We add the getLevel method back to Hopper since mojang removed it - we need the method for hooper optimization
## We add the method with this name to match the mojmap method of the same name in BlockEntity
## Since we add the method we need to add the mapping for it so reobf works as expected
#c net/minecraft/world/level/block/entity/IHopper net/minecraft/world/level/block/entity/Hopper #c net/minecraft/world/level/block/entity/IHopper net/minecraft/world/level/block/entity/Hopper
# m ()Lnet/minecraft/world/level/World; getWorld getLevel # m ()Lnet/minecraft/world/level/World; getWorld getLevel
#
## Commands performCommand adds a stripSlash boolean
#c net/minecraft/commands/CommandDispatcher net/minecraft/commands/Commands
# m (Lnet/minecraft/commands/CommandListenerWrapper;Ljava/lang/String;Ljava/lang/String;Z)I a performCommand
#
## CraftBukkit overloads equipItemIfPossible in Mob adding an ItemEntity parameter
#c net/minecraft/world/entity/EntityInsentient net/minecraft/world/entity/Mob
# m (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/item/EntityItem;)Z j equipItemIfPossible
#
## CraftBukkit overloads convertTo in Mob adding various API reasons
#c net/minecraft/world/entity/EntityInsentient net/minecraft/world/entity/Mob
# m (Lnet/minecraft/world/entity/EntityTypes;ZLorg/bukkit/event/entity/EntityTransformEvent$TransformReason;Lorg/bukkit/event/entity/CreatureSpawnEvent$SpawnReason;)Lnet/minecraft/world/entity/EntityInsentient; a convertTo
#
## CraftBukkit changes the signature of DefaultDispenseItemBehavior#spawnItem
#c net/minecraft/core/dispenser/DispenseBehaviorItem net/minecraft/core/dispenser/DefaultDispenseItemBehavior
# m (Lnet/minecraft/world/level/World;Lnet/minecraft/world/item/ItemStack;ILnet/minecraft/core/EnumDirection;Lnet/minecraft/core/ISourceBlock;)Z a spawnItem
#
## Craftbukkit adds args to ShearsDispenseItemBehavior
#c net/minecraft/core/dispenser/DispenseBehaviorShears net/minecraft/core/dispenser/ShearsDispenseItemBehavior
# m (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/core/BlockPosition;Lorg/bukkit/block/Block;Lorg/bukkit/craftbukkit/inventory/CraftItemStack;)Z b tryShearLivingEntity
#
## CraftBukkit adds ServerPlayer parameter to ServerEntity#sendPairingData
#c net/minecraft/server/level/EntityTrackerEntry net/minecraft/server/level/ServerEntity
# m (Ljava/util/function/Consumer;Lnet/minecraft/server/level/EntityPlayer;)V a sendPairingData
#
## CraftBukkit overloads LivingEntity#removeEffectNoUpdate
#c net/minecraft/world/entity/EntityLiving net/minecraft/world/entity/LivingEntity
# m (Lnet/minecraft/world/effect/MobEffectList;Lorg/bukkit/event/entity/EntityPotionEffectEvent$Cause;)Lnet/minecraft/world/effect/MobEffect; c removeEffectNoUpdate
#
## CraftBukkit adds an Entity parameter to methods in BigDripleafBlock
#c net/minecraft/world/level/block/BigDripleafBlock net/minecraft/world/level/block/BigDripleafBlock
# m (Lnet/minecraft/world/level/block/state/IBlockData;Lnet/minecraft/world/level/World;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/world/level/block/state/properties/Tilt;Lnet/minecraft/sounds/SoundEffect;Lnet/minecraft/world/entity/Entity;)V a setTiltAndScheduleTick
# m (Lnet/minecraft/world/level/block/state/IBlockData;Lnet/minecraft/world/level/World;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/world/level/block/state/properties/Tilt;Lnet/minecraft/world/entity/Entity;)Z a setTilt
#
## CraftBukkit adds the source BlockPos to MultifaceBlock#spreadToFace
#c net/minecraft/world/level/block/MultifaceBlock net/minecraft/world/level/block/MultifaceBlock
# m (Lnet/minecraft/world/level/GeneratorAccess;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/core/EnumDirection;ZLnet/minecraft/core/BlockPosition;)Z a spreadToFace
#
## CraftBukkit adds the source BlockPos to PointedDripstoneBlock#createDripstone
#c net/minecraft/world/level/block/PointedDripstoneBlock net/minecraft/world/level/block/PointedDripstoneBlock
# m (Lnet/minecraft/world/level/GeneratorAccess;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/core/EnumDirection;Lnet/minecraft/world/level/block/state/properties/DripstoneThickness;Lnet/minecraft/core/BlockPosition;)V a createDripstone
#
## CraftBukkit modifies methods in AbstraftFurnaceBlockEntity
#c net/minecraft/world/level/block/entity/TileEntityFurnace net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity
# m (Lnet/minecraft/server/level/EntityPlayer;Lnet/minecraft/world/item/ItemStack;I)V a awardUsedRecipesAndPopExperience
# m (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/phys/Vec3D;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/server/level/EntityPlayer;Lnet/minecraft/world/item/ItemStack;I)Ljava/util/List; a getRecipesToAwardAndPopExperience
# m (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/phys/Vec3D;IFLnet/minecraft/core/BlockPosition;Lnet/minecraft/world/entity/player/EntityHuman;Lnet/minecraft/world/item/ItemStack;I)V a createExperience
#
## CraftBukkit overloads PersistentEntitySectionManager#storeChunkSections
#c net/minecraft/world/level/entity/PersistentEntitySectionManager net/minecraft/world/level/entity/PersistentEntitySectionManager
# m (JLjava/util/function/Consumer;Z)Z a storeChunkSections
# p 0 chunkPos
# p 1 action
#
## CraftBukkit adds parameters to PortalShape#createPortalInfo
#c net/minecraft/world/level/portal/BlockPortalShape net/minecraft/world/level/portal/PortalShape
# m (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/BlockUtil$Rectangle;Lnet/minecraft/core/EnumDirection$EnumAxis;Lnet/minecraft/world/phys/Vec3D;Lnet/minecraft/world/entity/EntitySize;Lnet/minecraft/world/phys/Vec3D;FFLorg/bukkit/craftbukkit/event/CraftPortalEvent;)Lnet/minecraft/world/level/portal/ShapeDetectorShape; a createPortalInfo
#
## CraftBukkit adds a byte array parameter to MapItemSavedData$HoldingPlayer#createPatch
#c net/minecraft/world/level/saveddata/maps/WorldMap$WorldMapHumanTracker net/minecraft/world/level/saveddata/maps/MapItemSavedData$HoldingPlayer
# m ([B)Lnet/minecraft/world/level/saveddata/maps/WorldMap$b; a createPatch
#
## CraftBukkit adds a level resource key to LevelStorageSource#createAccess
#c net/minecraft/world/level/storage/Convertable net/minecraft/world/level/storage/LevelStorageSource
# m (Ljava/lang/String;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/storage/Convertable$ConversionSession; c createAccess