Updated Upstream (Paper, Pufferfish, Purpur)

Upstream has released updates that appear to apply and compile correctly.

[Purpur Changes]
PurpurMC/Purpur@e86a1b6: Updated Upstream (Paper)
PurpurMC/Purpur@962ee30: Updated Upstream (Paper)
PurpurMC/Purpur@74d1b4c: Updated Upstream (Paper)
PurpurMC/Purpur@e2e8c61: Updated Upstream (Paper)
PurpurMC/Purpur@7a01fd8: Updated Upstream (Paper)
PurpurMC/Purpur@34c18f0: Updated Upstream (Paper)
PurpurMC/Purpur@ca668ab: Updated Upstream (Paper)
PurpurMC/Purpur@200178d: Updated Upstream (Paper)
PurpurMC/Purpur@9968cbb: Updated Upstream (Paper)
PurpurMC/Purpur@db09358: Fix clamp-levels option not being true by default (#1609)
PurpurMC/Purpur@f289b6a: Updated Upstream (Paper)
PurpurMC/Purpur@959c29d: Fix Tridents giving errors without having an Elytra equipped (#1612)
PurpurMC/Purpur@68c1612: Fix villagers not spawning when the `follow-emerald-blocks` option is enabled (#1611)
PurpurMC/Purpur@5b75c68: fix `bypass-mob-griefing` not being the inverse of mobgriefing gamerule, closes #1603
PurpurMC/Purpur@55d4309: Updated Upstream (Paper)
PurpurMC/Purpur@0601f87: Updated Upstream (Paper)
PurpurMC/Purpur@06dde9d: Add Ridable and Attribute options for Creaking mob (#1613)
PurpurMC/Purpur@420a1ce: Set the bee's `takes-damage-from-water` option to true by default (#1614)
PurpurMC/Purpur@2b6f273: Updated Upstream (Paper)
PurpurMC/Purpur@504f311: Updated Upstream (Paper)
PurpurMC/Purpur@2b694c9: Updated Upstream (Paper)
PurpurMC/Purpur@96d7ef7: Updated Upstream (Paper)
PurpurMC/Purpur@e141f68: Updated Upstream (Paper)
PurpurMC/Purpur@7f6f667: Updated Upstream (Pufferfish)
PurpurMC/Purpur@de20ba9: ignore `minecart.max-speed` config value if using minecart experiment, closes #1618
PurpurMC/Purpur@03062a8: fix ridable mobs not being controllable, closes #1620
PurpurMC/Purpur@0493ac3: Updated Upstream (Paper)
PurpurMC/Purpur@16ce24a: fix(ridables/creaking): override tick method in look/move control

.editorconfig

@@ -9,7 +9,7 @@ ij_any_block_comment_at_first_column = false
 ij_any_line_comment_at_first_column = false
 ij_any_line_comment_add_space = true
 max_line_length = 120
-ij_visual_guides = 80
+ij_visual_guides = 16, 80
 
 [*.tiny]
 indent_style=tab
@@ -19,6 +19,7 @@ end_of_line=crlf
 
 [*.yml]
 indent_size=2
+ij_visual_guides = 8, 80
 
 [*.patch]
 trim_trailing_whitespace=false

.github/workflows/gradle.yml

@@ -23,13 +23,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout action
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
 
       - name: Set up JDK ${{ matrix.java }} ${{ matrix.jdk }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.java }}
           java-version: ${{ matrix.jdk }}

.gitignore

@@ -61,3 +61,4 @@ paper-api-generator
 compare.txt
 *.patch
 !patches/**/*
+upstream

build-data/dev-imports.txt

@@ -12,3 +12,65 @@
 #     mc_data chat_type/chat.json
 #     mc_data dimension_type/overworld.json
 #
+
+minecraft net/minecraft/server/commands/AdvancementCommands.java
+minecraft net/minecraft/server/commands/AttributeCommand.java
+minecraft net/minecraft/server/commands/BanListCommands.java
+minecraft net/minecraft/server/commands/BossBarCommands.java
+minecraft net/minecraft/server/commands/ChaseCommand.java
+minecraft net/minecraft/server/commands/ClearInventoryCommands.java
+minecraft net/minecraft/server/commands/CloneCommands.java
+minecraft net/minecraft/server/commands/DamageCommand.java
+minecraft net/minecraft/server/commands/DataPackCommand.java
+minecraft net/minecraft/server/commands/DebugCommand.java
+minecraft net/minecraft/server/commands/DebugConfigCommand.java
+minecraft net/minecraft/server/commands/DebugMobSpawningCommand.java
+minecraft net/minecraft/server/commands/DebugPathCommand.java
+minecraft net/minecraft/server/commands/EmoteCommands.java
+minecraft net/minecraft/server/commands/ExecuteCommand.java
+minecraft net/minecraft/server/commands/ExperienceCommand.java
+minecraft net/minecraft/server/commands/FillBiomeCommand.java
+minecraft net/minecraft/server/commands/FillCommand.java
+minecraft net/minecraft/server/commands/ForceLoadCommand.java
+minecraft net/minecraft/server/commands/FunctionCommand.java
+minecraft net/minecraft/server/commands/HelpCommand.java
+minecraft net/minecraft/server/commands/ItemCommands.java
+minecraft net/minecraft/server/commands/JfrCommand.java
+minecraft net/minecraft/server/commands/KillCommand.java
+minecraft net/minecraft/server/commands/LocateCommand.java
+minecraft net/minecraft/server/commands/LookAt.java
+minecraft net/minecraft/server/commands/MsgCommand.java
+minecraft net/minecraft/server/commands/PardonCommand.java
+minecraft net/minecraft/server/commands/PardonIpCommand.java
+minecraft net/minecraft/server/commands/ParticleCommand.java
+minecraft net/minecraft/server/commands/PerfCommand.java
+minecraft net/minecraft/server/commands/PlaySoundCommand.java
+minecraft net/minecraft/server/commands/PublishCommand.java
+minecraft net/minecraft/server/commands/RaidCommand.java
+minecraft net/minecraft/server/commands/RandomCommand.java
+minecraft net/minecraft/server/commands/RecipeCommand.java
+minecraft net/minecraft/server/commands/ReturnCommand.java
+minecraft net/minecraft/server/commands/RideCommand.java
+minecraft net/minecraft/server/commands/RotateCommand.java
+minecraft net/minecraft/server/commands/SaveAllCommand.java
+minecraft net/minecraft/server/commands/SaveOffCommand.java
+minecraft net/minecraft/server/commands/SaveOnCommand.java
+minecraft net/minecraft/server/commands/SayCommand.java
+minecraft net/minecraft/server/commands/ScoreboardCommand.java
+minecraft net/minecraft/server/commands/SeedCommand.java
+minecraft net/minecraft/server/commands/ServerPackCommand.java
+minecraft net/minecraft/server/commands/SetBlockCommand.java
+minecraft net/minecraft/server/commands/SetPlayerIdleTimeoutCommand.java
+minecraft net/minecraft/server/commands/SpawnArmorTrimsCommand.java
+minecraft net/minecraft/server/commands/SpectateCommand.java
+minecraft net/minecraft/server/commands/StopCommand.java
+minecraft net/minecraft/server/commands/StopSoundCommand.java
+minecraft net/minecraft/server/commands/TagCommand.java
+minecraft net/minecraft/server/commands/TeamCommand.java
+minecraft net/minecraft/server/commands/TeamMsgCommand.java
+minecraft net/minecraft/server/commands/TellRawCommand.java
+minecraft net/minecraft/server/commands/TitleCommand.java
+minecraft net/minecraft/server/commands/TransferCommand.java
+minecraft net/minecraft/server/commands/TriggerCommand.java
+minecraft net/minecraft/server/commands/WardenSpawnTrackerCommand.java
+minecraft net/minecraft/server/commands/WhitelistCommand.java

gradle.properties

@@ -17,13 +17,13 @@ version = 1.21.3-R0.1-SNAPSHOT
 mcVersion = 1.21.3
 jdkVersion = 21
 
-paperRepo = https://github.com/PaperMC/Paper
-paperBranch = master
+paperRepo = https://github.com/PaperMC/Paper-archive
+paperBranch = ver/1.21.3
 purpurRepo = https://github.com/PurpurMC/Purpur
 purpurBranch = ver/1.21.3
 pufferfishRepo = https://github.com/pufferfish-gg/Pufferfish
 pufferfishBranch = ver/1.21
 usePufferfish = false
 
-paperCommit = be886cf4e7ba906a3e79d9d38835d35abf60a0ce
-purpurCommit = c6802b0a27f1f8faac4ad30f902810fd0ed8051e
+paperCommit = da7138233f6392e791d790d1c3407414c855f9c2
+purpurCommit = 16ce24aa7eb08232030e4570e027f7baefa5f3f9

initDev

@@ -3,70 +3,134 @@
 # run below command in your terminal:
 # source ./initDev
 
-export PROJECT_DIR=$(pwd)
-
-alias api="cd $PROJECT_DIR/*-API"
-alias srv="cd $PROJECT_DIR/*-Server"
-
-alias g="./gradlew"
-alias c="clear;"
-
-alias ap="./gradlew --no-rebuild applyPatches"
-alias aap="./gradlew --no-rebuild applyAPIPatches"
-alias agp="./gradlew --no-rebuild applyGeneratedAPIPatches"
-alias asp="./gradlew --no-rebuild applyServerPatches"
-
-alias rp="./gradlew --no-rebuild rebuildPatches"
-alias rap="./gradlew --no-rebuild rebuildAPIPatches"
-alias rgp="./gradlew --no-rebuild rebuildGeneratedAPIPatches"
-alias rsp="./gradlew --no-rebuild rebuildServerPatches"
-
-alias run="./gradlew runDevServer"
-alias build="./gradlew build"
-alias reobf="./gradlew createReobfPaperclipJar"
-alias mojmap="./gradlew createMojmapPaperclipJar"
-
-alias lg="git log --oneline base..HEAD"
-alias rc="git rebase --autosquash -i base"
-alias rcc="git rebase --continue"
-
-# generate Fixup patches for Server
-function fs() {
-    cd ./*-Server || exit 1
-    garg="."
-    [[ "$1" == "-x" ]] && garg="--amend"
-
-    git add .
-    git commit "$garg" -m "fixup"
-    git format-patch -1
-    mv 0001-fixup.patch ../
-
-    cd ../
-}
-
-# generate Fixup patches for API
-function fa() {
-    cd ./*-API || exit 1
+PROJECT_DIR=$(pwd)
+
+alias cl="clear;"
+
+alias src="cd $PROJECT_DIR;"
+alias ca="cd $PROJECT_DIR/*-API || exit 1; vs;"
+alias cg="cd $PROJECT_DIR/paper-api-generator/generated || exit 1; vs;"
+alias cs="cd $PROJECT_DIR/*-Server || exit 1; vs;"
+
+alias fa="ca __generate_fixup_patch"
+alias fg="cg __generate_fixup_patch"
+alias fs="cs __generate_fixup_patch"
+
+hash gradle 2>&1 && alias gradle="./gradlew"
+alias gr="cd $PROJECT_DIR; gradle"
+alias grc="gr --no-rebuild"
+
+alias ap="grc applyPatches"
+alias aap="grc applyAPIPatches"
+alias agp="grc applyGeneratedAPIPatches"
+alias asp="grc applyServerPatches"
+
+alias aap!="rm -rf $PROJECT_DIR/*-API; aap"
+alias agp!="rm -rf $PROJECT_DIR/paper-api-generator/generated; agp"
+alias asp!="rm -rf $PROJECT_DIR/*-Server; asp"
+
+alias aapa="ca vpa"
+alias aapc="ca vpc"
+alias aapc="ca vps"
+alias agpa="cg vpa"
+alias agpc="cg vpc"
+alias agpc="cg vps"
+alias aspa="cs vpa"
+alias aspc="cs vpc"
+alias aspc="cs vps"
+
+alias rp="grc rebuildPatches"
+alias rap="grc rebuildAPIPatches"
+alias rgp="grc rebuildGeneratedAPIPatches"
+alias rsp="grc rebuildServerPatches"
+
+alias mk="gr build"
+alias mko="gr createReobfPaperclipJar"
+alias mkm="gr createMojmapPaperclipJar"
+
+
+alias va="git add"
+alias va.="git add ."
+
+alias vl="git log --oneline base..HEAD"
+
+alias vr="git rebase --autosquash base"
+alias vra="git rebase --abort"
+alias vrc="va.; git rebase --continue"
+alias vrs="git rebase --skip"
+
+alias vp="git am --show-current-patch"
+alias vpa="git am --abort"
+alias vpc="git am --continue"
+alias vps="git am --skip"
+
+alias vm="git commit --fixup"
+alias vs="git status"
+
+alias vc="git commit --verbose --no-interactive"
+alias vcn="vc --no-message"
+alias vcm="vc --message"
+
+alias vca="git commit --verbose --no-interactive --all"
+alias vcan="git commit --verbose --no-interactive --all --no-message"
+alias vcam="git commit --verbose --no-interactive --all --message"
+
+alias ve="git commit --verbose --no-interactive --amend"
+alias ven="ve --no-message"
+alias vem="ve --message"
+
+alias vea="git commit --verbose --no-interactive --all --amend"
+alias vean="vea --no-message"
+alias veam="vea --message"
+
+alias as="ca src"
+alias al="ca vl"
+alias ac="ca va.; vcm"
+alias am="ca vm"
+alias ae="ca ve"
+alias aea="ca vea"
+alias aean="ca vean"
+alias aeam="ca veam"
+
+alias gs="cg src"
+alias gl="cg vl"
+alias gc="cg va.; vcm"
+alias gm="cg vm"
+alias ge="cg ve"
+alias gea="cg vea"
+alias gean="cg vean"
+alias geam="cg veam"
+
+alias ss="cs src"
+alias sl="cs vl"
+alias sc="cs va.; vcm"
+alias sm="cs vm"
+alias se="cs ve"
+alias sea="cs vea"
+alias sean="cs vean"
+alias seam="cs veam"
+
+function __generate_fixup_patch() {
     garg="."
     [[ "$1" == "-x" ]] && garg="--amend"
 
     git add .
     git commit "$garg" -m "fixup"
     git format-patch -1
-    mv 0001-fixup.patch ../
+    mv 0001-fixup.patch ../ -f
 
     cd ../
 }
 
-# ReApply Server Patches
-function rasp() {
-    rm -rf ./*-Server
-    ./gradlew applyServerPatches
-}
-
 # Commit Updated Upstream
 function cuu() {
     # shellcheck disable=SC2059
     printf "Updated Upstream ($1)$(/bin/cat compare.txt)" | git commit -F -
 }
 
+git update-index --assume-unchanged ./build-data/dev-imports.txt
+
+if [ ! -L "$PROJECT_DIR/upstream" ]; then
+    grc applyPatches
+    ln -dsf "$PROJECT_DIR/.gradle/caches/paperweight/upstreams/paper" "$PROJECT_DIR/upstream"
+fi

libs/api.versions.toml

@@ -1,33 +1,47 @@
 [versions]
-gson = "2.10.1"
-joml = "1.10.5"
-guava = "32.1.2-jre"
-sentry = "5.4.0"
-jspecify = "1.0.0"
-fastutil = "8.5.6"
-findbugs = "1.3.9"
-slf4j-api = "2.0.9"
 brigadier = "1.2.9"
-bungeechat = "1.20-R0.2"
+
+guava = "33.3.1-jre"
+gson = "2.11.0"
+bungeechat = "1.20-R0.2-deprecated+build.19"
+
+# snakeyaml
+joml = "1.10.8"
 json-simple = "1.1.1"
-annotations = "24.0.1"
+
+fastutil = "8.5.6"
+# adventure
+# log4j
+slf4j-api = "2.0.9"
+sentry = "5.4.0"
+
+# asm
+# mvn
+
+annotations = "24.1.0"
 checkerqual = "3.21.0"
+jspecify = "1.0.0"
+
 
 [libraries]
-joml = { group = "org.joml", name = "joml", version.ref = "joml" }
-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
-guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
-sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
-jspecify = { group = "org.jspecify", name = "jspecify", version.ref = "jspecify" }
-fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
-findbugs = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "findbugs" }
 brigadier = { group = "com.mojang", name = "brigadier", version.ref = "brigadier" }
-slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" }
+
+guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 bungeechat = { group = "net.md-5", name = "bungeecord-chat", version.ref = "bungeechat" }
+
+joml = { group = "org.joml", name = "joml", version.ref = "joml" }
 jsonsimple = { group = "com.googlecode.json-simple", name = "json-simple", version.ref = "json-simple" }
+
+fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
+slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" }
+sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
+
 annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
 checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
+jspecify = { group = "org.jspecify", name = "jspecify", version.ref = "jspecify" }
+
 
 [bundles]
-api = [ "jspecify", "guava", "gson", "joml", "fastutil", "slf4j-api", "sentry", "brigadier" ]
+api = [ "brigadier", "guava", "gson", "joml", "fastutil", "slf4j", "sentry", "jspecify" ]
 annotations = [ "annotations", "checkerqual" ]