Update to Minecraft 1.21

info.json

@@ -1,13 +1,13 @@
 {
-	"minecraftVersion": "1.20.6",
+	"minecraftVersion": "1.21",
-    "spigotVersion": "1.20.6-R0.1-SNAPSHOT",
+    "spigotVersion": "1.21-R0.1-SNAPSHOT",
-	"minecraftHash": "b92e2ca5a38857af739dda1d7d91c41a90676651385aa51f4606b56d86139965",
+	"minecraftHash": "c2bc0e28e4ba8cb15f58a57ea8136b46e411f380d35ee7c853e1fef51d17ceb7",
-	"serverUrl": "https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/server.jar",
+	"serverUrl": "https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/server.jar",
-	"mappingsUrl": "https://piston-data.mojang.com/v1/objects/9e96100f573a46ef44caab3e716d5eb974594bb7/server.txt",
+	"mappingsUrl": "https://piston-data.mojang.com/v1/objects/31c77994d96f05ba25a870ada70f47f315330437/server.txt",
-	"accessTransforms": "bukkit-1.20.6.at",
+	"accessTransforms": "bukkit-1.21.at",
-	"classMappings": "bukkit-1.20.6-cl.csrg",
+	"classMappings": "bukkit-1.21-cl.csrg",
 	"packageMappings": "package.srg",
-	"classMapCommand": "java -jar BuildData/bin/SpecialSource-2.jar map --auto-lvt BASIC -e BuildData/mappings/bukkit-1.20.6.exclude -i {0} -m {1} -o {2}",
+	"classMapCommand": "java -jar BuildData/bin/SpecialSource-2.jar map --auto-lvt BASIC -e BuildData/mappings/bukkit-1.21.exclude -i {0} -m {1} -o {2}",
 	"memberMapCommand": "java -jar BuildData/bin/SpecialSource-2.jar map --auto-member TOKENS -i {0} -m {1} -o {2}",
 	"finalMapCommand": "java -jar BuildData/bin/SpecialSource.jar -i {0} --access-transformer {1} -m {2} -o {3}",
 	"decompileCommand": "java -jar BuildData/bin/fernflower.jar -dgs=1 -hdc=0 -asc=1 -udv=0 -rsy=1 -aoa=1 {0} {1}",

mappings/bukkit-1.20.6.exclude

@@ -1,422 +0,0 @@
-# (c) 2024 SpigotMC Pty. Ltd.
-a
-abo
-abp
-acb
-ach
-aiv
-ajb
-ajt
-aju
-ajv
-akb
-akj
-akp
-akq
-akr
-aku
-alg
-ali
-ame
-amh
-ami
-amj
-amk
-amr
-apy
-apz
-aqg
-aqk
-aql
-arn
-arr
-ars
-art
-asp
-asq
-asr
-asv
-asw
-atn
-atr
-ats
-att
-aue
-aum
-auq
-auw
-avn
-avr
-avw
-awc
-awm
-awu
-axc
-axj
-axk
-axm
-axt
-axu
-axz
-ayt
-ayv
-ayw
-aze
-azq
-b
-bih
-bii
-blt
-bmc
-bmd
-bme
-bmf
-bmh
-bmi
-bmj
-bnb
-bnc
-bnu
-bnx
-bny
-bob
-bod
-bop
-bov
-bpb
-bpe
-bpf
-bpl
-bpn
-bps
-bqd
-bqj
-bql
-brv
-bsp
-bta
-bvc
-bzb
-bzc
-bzm
-bzv
-c
-ccf
-ccq
-cct
-ccz
-cdg
-cdh
-ceh
-cej
-cer
-ceu
-cfa
-cfd
-cgp
-cgs
-cgx
-cha
-chg
-chj
-chw
-chx
-cia
-cie
-civ
-ciw
-ciy
-cjh
-cjl
-cli
-clm
-cln
-cma
-cmg
-cmu
-cmv
-cnb
-cne
-cog
-coo
-cou
-cpj
-cpq
-cpv
-crz
-csc
-cwu
-cxa
-cxb
-cyb
-cyf
-czu
-d
-dau
-dav
-dba
-ddr
-djn
-dre
-drf
-drl
-drs
-dru
-drv
-dsc
-dsh
-dsl
-dso
-dts
-dtw
-duy
-dve
-dvt
-dvv
-dwa
-dwb
-dwq
-dws
-dxd
-dxh
-dxo
-dza
-dzr
-eac
-ebb
-eee
-eej
-eex
-eey
-efe
-efq
-efz
-egl
-egq
-egz
-eh
-ehb
-ehc
-ehd
-ei
-eia
-eid
-eij
-eiy
-eiz
-eja
-ejf
-ejl
-ekc
-ekd
-elj
-emp
-emw
-ene
-ens
-ent
-enz
-eoe
-eof
-eou
-eoy
-epa
-epc
-epd
-epn
-epo
-erg
-etb
-etc
-eth
-euf
-eul
-euu
-eva
-evb
-evh
-evm
-evn
-evu
-ewn
-exb
-exc
-exq
-g
-gk
-gv
-hc
-hd
-hh
-hi
-ht
-ia
-ii
-ij
-iu
-iv
-ix
-iy
-k
-kg
-kp
-ky
-kz
-lf
-lo
-lr
-ls
-lt
-lv
-lx
-lz
-ma
-mb
-mc
-md
-me
-mf
-mg
-mh
-mi
-mj
-mk
-ml
-mm
-mn
-mo
-mp
-mq
-mr
-ms
-mt
-mu
-mv
-mw
-mx
-my
-mz
-na
-nb
-nc
-nd
-ne
-net/minecraft/data/Main
-nf
-ng
-nh
-ni
-nj
-nk
-nl
-nm
-nn
-no
-np
-nq
-nr
-ns
-nt
-nu
-nv
-nw
-nx
-ny
-nz
-oa
-ob
-oc
-od
-oe
-of
-og
-oh
-oi
-oj
-ok
-ol
-om
-on
-oo
-op
-oq
-or
-os
-ot
-ou
-ov
-ow
-ox
-oy
-oz
-pa
-pb
-pc
-pd
-pe
-pf
-pg
-pi
-pk
-pl
-pm
-pn
-po
-pp
-pq
-pr
-ps
-pt
-pu
-pv
-pw
-px
-py
-pz
-qa
-qb
-qc
-qd
-qe
-qf
-qg
-qh
-qi
-qj
-qk
-ql
-qm
-qn
-qo
-qp
-qq
-qr
-qs
-rt
-ru
-rv
-rw
-rx
-sd
-se
-sp
-sq
-tb
-tt
-tx
-u
-um
-uo
-vv
-w
-wa
-wc
-wn
-xx
-ya
-yn
-zc
-zj
-zk
-zr
-zs

mappings/bukkit-1.21.at

@@ -2,6 +2,7 @@
 
 public net/minecraft/server/MinecraftServer$ReloadableResources
 public net/minecraft/server/dedicated/DedicatedServerProperties$WorldDimensionData
+public net/minecraft/server/level/EntityPlayer$RespawnPosAngle
 public net/minecraft/server/level/PlayerChunkMap$EntityTracker
 public net/minecraft/world/entity/Interaction$PlayerAction
 public net/minecraft/world/entity/monster/EntityGuardian$PathfinderGoalGuardianAttack
@@ -24,9 +25,9 @@ public net/minecraft/world/entity/decoration/EntityItemFrame/setDirection(Lnet/m
 public net/minecraft/server/level/WorldServer/getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;
 public net/minecraft/world/level/World/getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;
 
-public net/minecraft/world/entity/projectile/windcharge/AbstractWindCharge/explode()V
+public net/minecraft/world/entity/projectile/windcharge/AbstractWindCharge/explode(Lnet/minecraft/world/phys/Vec3D;)V
-public net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge/explode()V
+public net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge/explode(Lnet/minecraft/world/phys/Vec3D;)V
-public net/minecraft/world/entity/projectile/windcharge/WindCharge/explode()V
+public net/minecraft/world/entity/projectile/windcharge/WindCharge/explode(Lnet/minecraft/world/phys/Vec3D;)V
 
 public net/minecraft/EnumChatFormat/code
 public net/minecraft/commands/CommandListenerWrapper/source
@@ -69,6 +70,7 @@ public net/minecraft/server/level/ChunkMapDistance/simulationDistance
 public net/minecraft/server/level/ChunkMapDistance/tickets
 public net/minecraft/server/level/ChunkProviderServer/spawnEnemies
 public net/minecraft/server/level/ChunkProviderServer/spawnFriendlies
+public net/minecraft/server/level/EntityPlayer/findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/core/BlockPosition;FZZ)Ljava/util/Optional;
 public net/minecraft/server/level/EntityPlayer/initMenu(Lnet/minecraft/world/inventory/Container;)V
 public net/minecraft/server/level/EntityPlayer/isChangingDimension
 public net/minecraft/server/level/EntityPlayer/language
@@ -79,9 +81,9 @@ public net/minecraft/server/level/EntityPlayer/triggerDimensionChangeTriggers(Ln
 public net/minecraft/server/level/PlayerChunk/oldTicketLevel
 public net/minecraft/server/level/PlayerChunk/playerProvider
 public net/minecraft/server/level/PlayerChunkMap$EntityTracker/seenBy
+public net/minecraft/server/level/PlayerChunkMap$EntityTracker/serverEntity
 public net/minecraft/server/level/PlayerChunkMap/distanceManager
 public net/minecraft/server/level/PlayerChunkMap/entityMap
-public net/minecraft/server/level/PlayerChunkMap/generator
 public net/minecraft/server/level/PlayerChunkMap/level
 public net/minecraft/server/level/PlayerChunkMap/progressListener
 public net/minecraft/server/level/PlayerChunkMap/save(Lnet/minecraft/world/level/chunk/IChunkAccess;)Z
@@ -199,7 +201,6 @@ public net/minecraft/world/entity/OminousItemSpawner/spawnItemAfterTicks
 public net/minecraft/world/entity/SaddleStorage/boostTime
 public net/minecraft/world/entity/SaddleStorage/boostTimeTotal()I
 public net/minecraft/world/entity/SaddleStorage/boosting
-public net/minecraft/world/entity/ai/attributes/AttributeModifier/name
 public net/minecraft/world/entity/animal/EntityAnimal/inLove
 public net/minecraft/world/entity/animal/EntityAnimal/loveCause
 public net/minecraft/world/entity/animal/EntityBee/hivePos
@@ -246,7 +247,6 @@ public net/minecraft/world/entity/decoration/EntityArmorStand/rightArmPose
 public net/minecraft/world/entity/decoration/EntityArmorStand/rightLegPose
 public net/minecraft/world/entity/decoration/EntityArmorStand/setMarker(Z)V
 public net/minecraft/world/entity/decoration/EntityArmorStand/setSmall(Z)V
-public net/minecraft/world/entity/decoration/EntityHanging/pos
 public net/minecraft/world/entity/decoration/EntityItemFrame/DATA_ITEM
 public net/minecraft/world/entity/decoration/EntityItemFrame/DATA_ROTATION
 public net/minecraft/world/entity/decoration/EntityItemFrame/dropChance
@@ -309,17 +309,18 @@ public net/minecraft/world/entity/player/EntityHuman/setShoulderEntityRight(Lnet
 public net/minecraft/world/entity/player/EntityHuman/sleepCounter
 public net/minecraft/world/entity/player/PlayerAbilities/flyingSpeed
 public net/minecraft/world/entity/player/PlayerAbilities/walkingSpeed
+public net/minecraft/world/entity/projectile/EntityArrow/firedFromWeapon
 public net/minecraft/world/entity/projectile/EntityArrow/inGround
-public net/minecraft/world/entity/projectile/EntityArrow/knockback
 public net/minecraft/world/entity/projectile/EntityArrow/life
 public net/minecraft/world/entity/projectile/EntityArrow/pickupItemStack
+public net/minecraft/world/entity/projectile/EntityArrow/setPierceLevel(B)V
 public net/minecraft/world/entity/projectile/EntityEnderSignal/life
 public net/minecraft/world/entity/projectile/EntityEnderSignal/surviveAfterDeath
 public net/minecraft/world/entity/projectile/EntityEnderSignal/tx
 public net/minecraft/world/entity/projectile/EntityEnderSignal/ty
 public net/minecraft/world/entity/projectile/EntityEnderSignal/tz
 public net/minecraft/world/entity/projectile/EntityEvokerFangs/warmupDelayTicks
-public net/minecraft/world/entity/projectile/EntityFireball/assignPower(DDD)V
+public net/minecraft/world/entity/projectile/EntityFireball/assignDirectionalMovement(Lnet/minecraft/world/phys/Vec3D;D)V
 public net/minecraft/world/entity/projectile/EntityFireworks/DATA_ID_FIREWORKS_ITEM
 public net/minecraft/world/entity/projectile/EntityFireworks/DATA_SHOT_AT_ANGLE
 public net/minecraft/world/entity/projectile/EntityFireworks/attachedToEntity
@@ -374,6 +375,7 @@ public net/minecraft/world/item/ItemCooldown/cooldowns
 public net/minecraft/world/item/ItemCooldown/tickCount
 public net/minecraft/world/item/ItemDebugStick/handleInteraction(Lnet/minecraft/world/entity/player/EntityHuman;Lnet/minecraft/world/level/block/state/IBlockData;Lnet/minecraft/world/level/GeneratorAccess;Lnet/minecraft/core/BlockPosition;ZLnet/minecraft/world/item/ItemStack;)Z
 public net/minecraft/world/item/ItemWorldMap/createNewSavedData(Lnet/minecraft/world/level/World;IIIZZLnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/saveddata/maps/MapId;
+public net/minecraft/world/item/JukeboxSongPlayer/song
 public net/minecraft/world/item/armortrim/ArmorTrim/showInTooltip
 public net/minecraft/world/item/context/ItemActionContext/<init>(Lnet/minecraft/world/level/World;Lnet/minecraft/world/entity/player/EntityHuman;Lnet/minecraft/world/EnumHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/MovingObjectPositionBlock;)V
 public net/minecraft/world/item/crafting/RecipeItemStack$StackProvider/<init>(Lnet/minecraft/world/item/ItemStack;)V
@@ -451,9 +453,6 @@ public net/minecraft/world/level/block/entity/TileEntityFurnace/cookingProgress
 public net/minecraft/world/level/block/entity/TileEntityFurnace/cookingTotalTime
 public net/minecraft/world/level/block/entity/TileEntityFurnace/litTime
 public net/minecraft/world/level/block/entity/TileEntityFurnace/recipesUsed
-public net/minecraft/world/level/block/entity/TileEntityJukeBox/isPlaying
-public net/minecraft/world/level/block/entity/TileEntityJukeBox/recordStartedTick
-public net/minecraft/world/level/block/entity/TileEntityJukeBox/tickCount
 public net/minecraft/world/level/block/entity/TileEntityLectern/bookAccess
 public net/minecraft/world/level/block/entity/TileEntityLectern/setPage(I)V
 public net/minecraft/world/level/block/entity/TileEntityLootable/lootTable
@@ -513,7 +512,6 @@ public net/minecraft/world/level/levelgen/structure/placement/StructurePlacement
 public net/minecraft/world/level/levelgen/structure/placement/StructurePlacement/salt
 public net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure/entityInfoList
 public net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure/palettes
-public net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager/createAndValidatePathToStructure(Ljava/nio/file/Path;Lnet/minecraft/resources/MinecraftKey;Ljava/lang/String;)Ljava/nio/file/Path;
 public net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager/loadFromGenerated(Lnet/minecraft/resources/MinecraftKey;)Ljava/util/Optional;
 public net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager/loadFromResource(Lnet/minecraft/resources/MinecraftKey;)Ljava/util/Optional;
 public net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager/readStructure(Ljava/io/InputStream;)Lnet/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure;
@@ -537,6 +535,7 @@ private-final net/minecraft/server/MinecraftServer/connection
 private-final net/minecraft/server/MinecraftServer/levels
 public-final net/minecraft/server/MinecraftServer/storageSource
 protected-final net/minecraft/server/MinecraftServer/worldData
+public-final net/minecraft/server/dedicated/DedicatedServer/serverLinks
 public-final net/minecraft/server/dedicated/DedicatedServer/settings
 public-final net/minecraft/server/level/TicketType/timeout
 public-final net/minecraft/server/players/PlayerList/maxPlayers

mappings/bukkit-1.21.exclude

@@ -0,0 +1,400 @@
+# (c) 2024 SpigotMC Pty. Ltd.
+a
+aba
+abb
+abn
+abt
+aih
+ain
+ajf
+ajg
+ajh
+ajn
+ajv
+akb
+akc
+akd
+akg
+aks
+aku
+alr
+alu
+alv
+alw
+alx
+ame
+apk
+apl
+aps
+apw
+apx
+arc
+arg
+arh
+ari
+ase
+asf
+asg
+ask
+asl
+atc
+atg
+ath
+ati
+att
+aub
+auf
+aul
+avc
+avg
+avl
+avr
+awb
+awj
+awr
+awy
+awz
+axb
+axi
+axo
+axq
+ayi
+ayk
+ayl
+ayt
+azf
+b
+bib
+bic
+blo
+blx
+bly
+blz
+bma
+bmc
+bmd
+bme
+bmw
+bmx
+bnp
+bns
+bnt
+bnw
+bny
+bok
+boq
+bow
+boz
+bpa
+bpg
+bpi
+bpn
+bpy
+bqe
+bqg
+brq
+bsk
+bsv
+buz
+byy
+byz
+bzj
+bzs
+c
+ccc
+ccn
+ccq
+ccw
+cdd
+cde
+cee
+ceg
+ceo
+cer
+cex
+cfa
+cgm
+cgp
+cgu
+cgx
+chd
+chg
+cht
+chu
+chx
+cib
+cis
+cit
+civ
+cjf
+cjj
+clg
+clk
+cll
+cly
+cme
+cms
+cmt
+cmz
+cnc
+coe
+col
+cos
+cph
+cpo
+cpt
+cry
+csb
+cww
+cxc
+cyc
+cyg
+czz
+d
+dbh
+dbi
+dbq
+dbr
+dbw
+deo
+dkk
+dsd
+dsj
+dsq
+dss
+dst
+dta
+dtf
+dtj
+dtm
+duq
+duu
+dvw
+dwf
+dwv
+dwx
+dxc
+dxd
+dxs
+dxu
+dyf
+dyj
+dyq
+eac
+eau
+ebf
+ecf
+efi
+efn
+egb
+egc
+egi
+egu
+ehd
+ehp
+ehu
+eid
+eif
+eig
+eih
+ejf
+eji
+ejo
+ekd
+eke
+ekf
+ekk
+ekq
+el
+eli
+elj
+em
+emp
+enw
+eod
+eol
+eoz
+epa
+epg
+epl
+epm
+eqb
+eqf
+eqh
+eqj
+eqk
+equ
+eqv
+esn
+eui
+euj
+euo
+evn
+evt
+ewd
+ewj
+ewk
+ewq
+ewv
+eww
+exd
+exw
+eyk
+eyl
+eyz
+g
+go
+gz
+hg
+hh
+hl
+hm
+hx
+ie
+im
+in
+iy
+iz
+jb
+jc
+k
+kk
+kt
+lc
+ld
+lj
+ls
+lv
+lw
+lx
+lz
+mb
+md
+me
+mf
+mg
+mh
+mi
+mj
+mk
+ml
+mm
+mn
+mo
+mp
+mq
+mr
+ms
+mt
+mu
+mv
+mw
+mx
+my
+mz
+na
+nb
+nc
+nd
+ne
+net/minecraft/data/Main
+nf
+ng
+nh
+ni
+nj
+nk
+nl
+nm
+nn
+no
+np
+nq
+nr
+ns
+nt
+nu
+nv
+nw
+nx
+ny
+nz
+oa
+ob
+oc
+od
+oe
+of
+og
+oh
+oi
+oj
+ok
+ol
+om
+on
+oo
+op
+oq
+or
+os
+ot
+ou
+ov
+ow
+ox
+oy
+oz
+pa
+pb
+pc
+pe
+pg
+ph
+pi
+pj
+pk
+pl
+pm
+pn
+po
+pp
+pq
+pr
+ps
+pt
+pu
+pv
+pw
+px
+py
+pz
+qa
+qb
+qc
+qd
+qe
+qf
+qg
+rn
+ry
+rz
+sk
+tc
+tg
+tv
+tx
+u
+ve
+vj
+vl
+vx
+w
+xh
+xk
+xx
+ym
+yt
+yu
+zb
+zc