Merge pull request #154 from amyavi/master

1.21.4

.gitignore

@@ -1,10 +1,7 @@
-/fetched_*/
-/scripts/fetched_*/
-
-# Server files
 cache/
 /libraries/
 /logs/
+/plugins/.paper-remapped/
 /plugins/Essentials/userdata
 /plugins/Essentials/warps/*
 /plugins/Essentials/custom_items.yml
@@ -15,6 +12,8 @@ cache/
 /plugins/Essentials/worth.yml
 /plugins/FastAsyncWorldEdit/lang/
 /plugins/Geyser-Spigot/locales/
+/plugins/spark/tmp-client/
+/.console_history
 /versions/
 /worlds/
 /banned-ips.json

commands.yml

@@ -153,6 +153,10 @@ aliases:
   - minecraft:time $1-
   tp:
   - minecraft:tp $1-
+  transfer:
+  - []
+  minecraft:transfer:
+  - []
   w:
   - minecraft:w $1-
   weather:

config/paper-global.yml

@@ -13,22 +13,26 @@
 # Website: https://papermc.io/
 
 _version: 29
+anticheat:
+  obfuscation:
+    items:
+      all-models:
+        also-obfuscate: []
+        dont-obfuscate:
+        - minecraft:lodestone_tracker
+        sanitize-count: true
+      enable-item-obfuscation: false
+      model-overrides:
+        minecraft:elytra:
+          also-obfuscate: []
+          dont-obfuscate:
+          - minecraft:damage
+          sanitize-count: true
 block-updates:
   disable-chorus-plant-updates: false
   disable-mushroom-block-updates: false
   disable-noteblock-updates: false
   disable-tripwire-updates: false
-chunk-loading:
-  autoconfig-send-distance: true
-  enable-frustum-priority: false
-  global-max-chunk-load-rate: -1.0
-  global-max-chunk-send-rate: -1.0
-  global-max-concurrent-loads: 500.0
-  max-concurrent-sends: 2
-  min-load-radius: 2
-  player-max-chunk-load-rate: -1.0
-  player-max-concurrent-loads: 20.0
-  target-player-chunk-send-rate: 100.0
 chunk-loading-advanced:
   auto-config-send-distance: true
   player-max-concurrent-chunk-generates: 0
@@ -45,7 +49,6 @@ collisions:
   enable-player-collisions: true
   send-full-pos-for-hard-colliding-entities: true
 commands:
-  fix-target-selector-tag-completion: true
   suggest-player-names-when-null-tab-completions: true
   time-command-affects-all-worlds: false
 console:
@@ -78,6 +81,7 @@ misc:
   chat-threads:
     chat-executor-core-size: -1
     chat-executor-max-size: -1
+  client-interaction-leniency-distance: default
   compression-level: default
   fix-entity-position-desync: true
   lag-compensate-block-breaking: true
@@ -126,26 +130,17 @@ spam-limiter:
   recipe-spam-limit: 20
   tab-spam-increment: 1
   tab-spam-limit: 500
-timings:
+spark:
-  enabled: true
+  enable-immediately: false
-  hidden-config-entries:
+  enabled: false
-  - database
-  - proxies.velocity.secret
-  history-interval: 300
-  history-length: 3600
-  server-name: Unknown Server
-  server-name-privacy: false
-  url: https://timings.aikar.co/
-  verbose: true
 unsupported-settings:
-  allow-grindstone-overstacking: false
   allow-headless-pistons: true
   allow-permanent-block-break-exploits: true
   allow-piston-duplication: true
-  allow-tripwire-disarming-exploits: false
   allow-unsafe-end-portal-teleportation: false
   compression-format: ZLIB
   perform-username-validation: false
+  skip-vanilla-damage-tick-when-shield-blocked: false
 watchdog:
   early-warning-delay: 10000
   early-warning-every: 5000

config/paper-world-defaults.yml

@@ -12,7 +12,7 @@
 # Discord: https://discord.gg/papermc
 # Website: https://papermc.io/
 
-_version: 30
+_version: 31
 anticheat:
   anti-xray:
     enabled: false
@@ -103,6 +103,7 @@ entities:
       skeletons: false
       zombies: false
     nerf-pigmen-from-nether-portals: false
+    only-merge-items-horizontally: false
     parrots-are-unaffected-by-player-movement: false
     phantoms-do-not-spawn-on-creative-players: true
     phantoms-only-attack-insomniacs: true
@@ -123,7 +124,6 @@ entities:
     spawner-nerfed-mobs-should-jump: false
     zombie-villager-infection-chance: default
     zombies-target-turtle-eggs: false
-  entities-target-with-follow-range: false
   markers:
     tick: false
   mob-effects:
@@ -131,7 +131,6 @@ entities:
       wither: true
       wither-skeleton: true
     spiders-immune-to-poison-effect: true
-    undead-immune-to-certain-effects: true
   sniffer:
     boosted-hatch-time: default
     hatch-time: default
@@ -143,6 +142,7 @@ entities:
         cobblestone: 300
     count-all-mobs-for-spawning: false
     creative-arrow-despawn-rate: default
+    despawn-range-shape: ELLIPSOID
     despawn-ranges:
       ambient:
         hard: 128
@@ -168,6 +168,9 @@ entities:
       water_creature:
         hard: 128
         soft: 32
+    despawn-time:
+      llama_spit: disabled
+      snowball: disabled
     disable-mob-spawner-spawn-egg-transformation: false
     duplicate-uuid:
       mode: SAFE_REGEN
@@ -227,7 +230,6 @@ entities:
 environment:
   disable-explosion-knockback: false
   disable-ice-and-snow: false
-  disable-teleportation-suffocation-check: false
   disable-thunder: false
   fire-tick-delay: 30
   frosted-ice:
@@ -249,6 +251,8 @@ environment:
     find-already-discovered:
       loot-tables: default
       villager-trade: false
+  void-damage-amount: 4.0
+  void-damage-min-build-height-offset: -64.0
   water-over-lava-flow-speed: 5
 feature-seeds:
   generate-random-seeds-for-all: false
@@ -274,6 +278,7 @@ lootables:
   reset-seed-on-fill: true
   restrict-player-reloot: true
   restrict-player-reloot-time: disabled
+  retain-unlooted-shulker-box-loot-table-on-non-player-break: true
 maps:
   item-frame-cursor-limit: 128
   item-frame-cursor-update-interval: 10
@@ -284,9 +289,11 @@ max-growth-height:
   cactus: 3
   reeds: 3
 misc:
+  alternate-current-update-order: HORIZONTAL_FIRST_OUTWARD
   disable-end-credits: true
   disable-relative-projectile-velocity: false
   disable-sprint-interruption-on-attack: false
+  legacy-ender-pearl-behavior: false
   light-queue-size: 20
   max-leash-distance: 10.0
   redstone-implementation: ALTERNATE_CURRENT

config/scissors.yml

@@ -1,17 +0,0 @@
-# This is the main configuration file for Scissors.
-# As you can see, there's tons to configure. Some options may impact gameplay, so use
-# with caution, and make sure you know what each option does before configuring.
-#
-# If you need help with the configuration or have any questions related to Scissors,
-# join us in our Discord.
-#
-# Discord: https://discord.com/invite/mtVQcHn58h
-# Website: https://scissors.gg/ 
-# Docs: https://javadoc.scissors.gg/1.20.1/ 
-
-excludePlayersFromNbtComponents: false
-componentDepthLimit: 128
-chatSignaturesEnabled: false
-commandSignsBypassPermissions: false
-runCommandsInBooks: true
-config-version: 5

plugins/FastAsyncWorldEdit/config.yml

@@ -1,9 +1,9 @@
 # These first 6 aren't configurable
 issues: "https://github.com/IntellectualSites/FastAsyncWorldEdit/issues"
 wiki: "https://intellectualsites.github.io/fastasyncworldedit-documentation/"
-date: "Sun Feb 23 00:00:00 GMT-03:00 2025"
+date: "Thu Feb 27 00:00:00 GMT-03:00 2025"
-build: "https://ci.athion.net/job/FastAsyncWorldEdit/1026"
+build: "https://ci.athion.net/job/FastAsyncWorldEdit/1030"
-commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/f3add7a0"
+commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/f55e76a9"
 platform: "Bukkit"
 # Set true to enable WorldEdit restrictions per region (e.g. PlotSquared or WorldGuard).
 # To be allowed to WorldEdit in a region, users need the appropriate
@@ -13,6 +13,9 @@ region-restrictions: false
 #  - Bypass with `/wea` or `//fast` or `fawe.bypass`
 #  - Disable with 100 or -1.
 max-memory-percent: 60
+# When percent memory usage reaches this threshold some aspects of editing will be slowed down:
+#  - FAWE-Asynchronous chunk loading when writing changes (see queue.async-chunk-load-write)
+slower-memory-percent: 80
 
 # Enable or disable core components
 enabled-components:
@@ -193,6 +196,17 @@ queue:
   # If pooling is enabled (reduces GC, higher memory usage)
   #  - Enable to improve performance at the expense of memory
   pool: true
+  # If chunk loading for writing edits to the world should be performed asynchronously to FAWE
+  #  - Enable to improve performance at the expense of memory
+  #  - If experience out of memory crashed, disable this or reduce slower-memory-percent
+  async-chunk-load-write: true
+  # Percentage of queue.target-size to use per thread in multi-threaded operations
+  #  - Minimum of 100 / queue.parallel-threads (queue.target-size split across threads)
+  #  - Maximum of 100 (queue.target-size per thread)
+  #  - Higher performance at the expense of memory
+  #  - I.e. target-size=400, parallel-threads=8 and threads-target-size=25 means target-size of 100 per thread
+  #  - Defaults to 100 * 2 / parallel-threads
+  thread-target-size-percent: 100
 
 history:
   # Should history be saved on disk:

scripts/_common.sh

@@ -11,10 +11,10 @@ if [ "$DEBUG" = 1 ]; then
         printf '[DEBUG] '
 
         # If shell supports FUNCNAME, print it
-        # The -20 is used to pad the function name with up to 20 spaces on the right.
+        # We make sure the string is less than 19 characters, and pad it with spaces until it's 20.
         if [ -n "${FUNCNAME+x}" ]; then
             # shellcheck disable=SC3054 # FUNCNAME support requires array support
-            printf '%-20s' "${FUNCNAME[1]}"
+            printf '%-*.*s' "20" "19" "${FUNCNAME[1]}"
         fi
 
         echo "$@"

scripts/_sources/_bibliothek.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+# Bibliothek is Paper's API for downloading builds
+# https://docs.papermc.io/misc/downloads-api
+
+_fetch_latest_build() {
+    builds_url="$1/builds"
+
+    debug "fetch: $builds_url"
+    BUILD_JSON="$(fetch -so- "$builds_url")"
+
+    # We have to read the variables like this because POSIX read
+    # doesn't support reading multiple variables at a time
+    for var in LATEST_BUILD LATEST_BUILD_FILENAME; do
+        read -r "${var?}"
+    done <<FETCH_LATEST_BUILD_HEREDOC
+$(echo "$BUILD_JSON" \
+    | jq --raw-output --exit-status '.builds[-1] | "\(.build)\n\(.downloads?.application?.name)"')
+FETCH_LATEST_BUILD_HEREDOC
+}
+
+_download_type_bibliothek() {
+    read_args endpoint project version
+    require_args endpoint project version
+    project_url="${arg_endpoint:?}/v2/projects/${arg_project:?}/versions/${arg_version:?}"
+
+    _fetch_latest_build "$project_url"
+    debug "latest file: $LATEST_BUILD_FILENAME ($LATEST_BUILD)"
+
+    download_url="$project_url/builds/$LATEST_BUILD/downloads/$LATEST_BUILD_FILENAME"
+    download "$download_url" "$1"
+}

scripts/_sources/_github.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+_fetch_github_asset() {
+    list_release_url="https://api.github.com/repos/$1/releases"
+    debug "fetch: $list_release_url"
+
+    # We have to read the variables like this because POSIX read
+    # doesn't support reading multiple variables at a time
+    download_url="$(fetch -so- "$list_release_url" | \
+        jq --raw-output --exit-status --arg filter "$2" \
+            '.[0].assets[] | select(.name | test($filter)) | .browser_download_url')"
+}
+
+_download_type_github() {
+    read_args repo asset
+    require_args repo asset
+
+    _fetch_github_asset "${arg_repo:?}" "${arg_asset:?}"
+    download "$download_url" "$1"
+}

scripts/_sources/_index.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 # shellcheck disable=SC1091
 
+. "$_SCRIPT_PATH"/_sources/_bibliothek.sh
+. "$_SCRIPT_PATH"/_sources/_github.sh
 . "$_SCRIPT_PATH"/_sources/_url.sh
 . "$_SCRIPT_PATH"/_sources/_zip.sh
 
@@ -59,9 +61,11 @@ download_type() {
     # Since the args are part of the function's stdin, they will be
     # be propagated into the _download_type_... functions.
     case "$1" in
-        "url")  _download_type_url "$2";;
+        "bibliothek")   _download_type_bibliothek "$2";;
-        "zip")  _download_type_zip "$2";;
+        "github")       _download_type_github "$2";;
-        *)      echo Invalid download type "$1"
+        "url")          _download_type_url "$2";;
-                return 1;;
+        "zip")          _download_type_zip "$2";;
+        *) echo Invalid download type "$1"
+           return 1;;
     esac
-}
+}

scripts/downloads.json

@@ -1,8 +1,14 @@
 {
     "server.jar": {
-        "type": "zip",
+        "type": "github",
-        "url": "https://ci.plex.us.org/job/Scissors/job/1.20.4/lastSuccessfulBuild/artifact/*zip*/archive.zip",
+        "repo": "vectrix-space/ignite",
-        "extract": "archive/build/libs/scissors-*.jar"
+        "asset": "ignite\\.jar"
+    },
+    "paper.jar": {
+        "type": "bibliothek",
+        "endpoint": "https://api.papermc.io",
+        "project": "paper",
+        "version": "1.21.4"
     },
     "plugins": {
         "external": {
@@ -14,7 +20,7 @@
             "plugins/FastAsyncWorldEdit.jar": {
                 "type": "zip",
                 "url": "https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/*zip*/archive.zip",
-                "extract": "archive/artifacts/FastAsyncWorldEdit-Bukkit-*.jar"
+                "extract": "archive/artifacts/FastAsyncWorldEdit-Paper-*.jar"
             },
             "plugins/Geyser.jar": {
                 "type": "zip",
@@ -38,6 +44,12 @@
             }
         },
         "internal": {
+            "mods/PaperMixins.jar": {
+                "type": "zip",
+                "skip_404": true,
+                "url":  "https://nightly.link/kaboomserver/papermixins/workflows/build/master/Artifacts.zip",
+                "extract": "paper-mixins-master.jar"
+            },
             "plugins/CommandSpy.jar": {
                 "type": "zip",
                 "skip_404": true,

server.properties

@@ -1,9 +1,11 @@
 #Minecraft server properties
-#Sun Jun 23 19:39:57 UTC 2024
+#Wed Jan 29 00:00:00 UTC 2025
+accepts-transfers=true
 allow-flight=true
 allow-nether=true
 broadcast-console-to-ops=true
 broadcast-rcon-to-ops=true
+bug-report-link=https\://github.com/kaboomserver/server/issues
 debug=false
 difficulty=easy
 enable-command-block=true
@@ -22,12 +24,12 @@ generator-settings={}
 hardcore=false
 hide-online-players=false
 initial-disabled-packs=
-initial-enabled-packs=vanilla,update_1_21
+initial-enabled-packs=vanilla
 level-name=world
 level-seed=
 level-type=minecraft\:normal
 log-ips=true
-max-chained-neighbor-updates=200
+max-chained-neighbor-updates=500
 max-players=0
 max-tick-time=30000
 max-world-size=29999984
@@ -35,6 +37,7 @@ motd=§8§l Welcome to Kaboom\!\n   > §7Free OP - Anarchy - Creative
 network-compression-threshold=512
 online-mode=false
 op-permission-level=4
+pause-when-empty-seconds=60
 player-idle-timeout=0
 prevent-proxy-connections=false
 pvp=true
@@ -42,6 +45,7 @@ query.port=25565
 rate-limit=0
 rcon.password=
 rcon.port=25575
+region-file-compression=deflate
 require-resource-pack=false
 resource-pack=
 resource-pack-id=
@@ -56,6 +60,7 @@ spawn-npcs=true
 spawn-protection=0
 sync-chunk-writes=false
 text-filtering-config=
+text-filtering-version=0
 use-native-transport=true
 view-distance=5
 white-list=false

spigot.yml

@@ -39,13 +39,15 @@ settings:
   netty-threads: 4
   sample-count: 12
   player-shuffle: 0
-  user-cache-size: 1000
+  user-cache-size: 0
   save-user-cache-on-stop-only: true
   moved-wrongly-threshold: 0.0625
   moved-too-quickly-multiplier: 100.0
   debug: false
   log-villager-deaths: false
   attribute:
+    maxAbsorption:
+      max: 2048.0
     maxHealth:
       max: 2048.0
     movementSpeed:
@@ -63,6 +65,7 @@ advancements:
   - '*'
 world-settings:
   default:
+    unload-frozen-chunks: false
     seed-trialchambers: 94251327
     below-zero-generation-in-existing-chunks: true
     simulation-distance: default
@@ -181,5 +184,5 @@ world-settings:
       entity: 20
     squid-spawn-range:
       min: 45.0
-  faweregentempworld:
+  worldeditregentempworld:
     verbose: false