2021-06-11 09:45:34 +02:00
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
# CraftBukkit adds the getServer() method, clashes with a Mojang method
c net/minecraft/world/level/World net/minecraft/world/level/Level
m ()Lorg/bukkit/craftbukkit/CraftServer; getServer getCraftServer
# CraftBukkit adds the server field, clashes with a Mojang field
c net/minecraft/server/network/PlayerConnection net/minecraft/server/network/ServerGamePacketListenerImpl
2021-06-11 13:23:18 +02:00
m ()Lorg/bukkit/craftbukkit/entity/CraftPlayer; getPlayer getCraftPlayer
2021-06-11 09:45:34 +02:00
# CraftBukkit adds the getType() method, clashes with a Mojang method
c net/minecraft/world/entity/EntityAreaEffectCloud net/minecraft/world/entity/AreaEffectCloud
2021-06-11 13:23:18 +02:00
m ()Ljava/lang/String; getType getPotionType
2021-06-11 09:45:34 +02:00
# CraftBukkit adds the getType() method, clashes with a Mojang method
c net/minecraft/world/entity/projectile/EntityTippedArrow net/minecraft/world/entity/projectile/Arrow
2021-06-11 13:23:18 +02:00
m ()Ljava/lang/String; getType getPotionType
2021-06-11 09:45:34 +02:00
# 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
2021-06-12 23:31:35 +02:00
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
2021-06-11 09:45:34 +02:00
2021-06-12 02:22:53 +02:00
# missed mapping?
c net/minecraft/world/level/block/MultifaceBlock net/minecraft/world/level/block/MultifaceBlock
m (Lnet/minecraft/world/level/block/state/IBlockData;Lnet/minecraft/world/level/IBlockAccess;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/core/EnumDirection;)Lnet/minecraft/world/level/block/state/IBlockData; c getStateForPlacement
2021-06-12 09:30:37 +02:00
# another missed one
c net/minecraft/server/players/UserCache net/minecraft/server/players/GameProfileCache
m (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; getProfile get
p 0 name
2021-06-14 21:58:32 +02:00
2021-06-15 05:50:34 +02:00
# change dimension 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
2021-06-15 06:39:41 +02:00
# 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
m ()Lnet/minecraft/world/level/World; getWorld getLevel
2021-06-17 19:47:34 +02:00
# Teleport method in ServerGamePacketListenerImpl
c net/minecraft/server/network/PlayerConnection net/minecraft/server/network/ServerGamePacketListenerImpl
m (DDDFFLorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)V a teleport
