diff --git a/datapacks.json b/datapacks.json new file mode 100644 index 0000000..d75d60f --- /dev/null +++ b/datapacks.json @@ -0,0 +1,28 @@ +{ + "type": "datapacks", + "version": "1.21", + "packs": { + "admin-tools": [ + "kill empty boats" + ], + "gameplay-changes": [ + "armored elytra", + "graves", + "confetti creepers" + ], + "informative": [ + "afk display" + ], + "decorative-cosmetic": [ + "armor statues", + "silence mobs", + "player head drops" + ], + "convenience": [ + "multiplayer sleep", + "cauldron mud", + "cauldron concrete", + "timber" + ] + } +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index cbb4b93..5510318 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,10 +12,10 @@ secrets: services: spigot: - image: 'ghcr.io/zekrotja/papermc-docker' + image: 'ghcr.io/zekrotja/papermc-docker:zulu-22' restart: unless-stopped environment: - VERSION: "1.21.4" + VERSION: "1.21.8" BUILD: "latest" CACHE_DOWNLOAD: "true" XMS: 4G @@ -23,12 +23,12 @@ services: MAX_AGE_BACKUP_FILES: 15d PRE_START_BACKUP: "true" POST_START_BACKUP: "false" - BACKUP_SUCCESS_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" "https://ntfy.zekro.de/minecraft_backups?title=✅ Minecraft Backup Successfull"' - BACKUP_FAILED_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" -d "$$MESSAGE" "https://ntfy.zekro.de/minecraft_backups?title=❌ Minecraft Backup Failed"' + BACKUP_SUCCESS_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" -H "Title: ✅ Minecraft Backup Successfull" "https://ntfy.zekro.de/minecraft_backups"' + BACKUP_FAILED_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" -H "Title: ❌ Minecraft Backup Failed" -d "$$MESSAGE" "https://ntfy.zekro.de/minecraft_backups"' DEBUG_MODE: "true" ports: - '24693:25565' -# - '25575:25575' # RCON temporarily disabled because of security issues + - '25575:25575' # RCON temporarily disabled because of security issues networks: - "core_public" - "minecraft" @@ -78,7 +78,7 @@ services: image: 'ghcr.io/zekrotja/papermc-docker' restart: unless-stopped environment: - VERSION: "1.21.4" + VERSION: "1.21.8" BUILD: "latest" CACHE_DOWNLOAD: "true" XMS: 2G diff --git a/spigot/config/bukkit.yml b/spigot/config/bukkit.yml index d739ce3..97b8bc6 100755 --- a/spigot/config/bukkit.yml +++ b/spigot/config/bukkit.yml @@ -1,3 +1,14 @@ +# This is the Bukkit configuration file in Paper. +# As you can see, there's actually not that much to configure without any plugins. +# +# If you need help with the configuration or have any questions related to Paper, +# join us in our Discord or check the docs page. +# +# File Reference: https://docs.papermc.io/paper/reference/bukkit-configuration/ +# Docs: https://docs.papermc.io/ +# Discord: https://discord.gg/papermc +# Website: https://papermc.io/ + settings: allow-end: true warn-on-overload: false diff --git a/spigot/config/commands.yml b/spigot/config/commands.yml index da50320..368bd24 100755 --- a/spigot/config/commands.yml +++ b/spigot/config/commands.yml @@ -1,3 +1,13 @@ +# This is the Bukkit commands configuration file for Paper. +# +# If you need help with the configuration or have any questions related to Paper, +# join us in our Discord or check the docs page. +# +# File Reference: https://docs.papermc.io/paper/reference/bukkit-commands-configuration/ +# Docs: https://docs.papermc.io/ +# Discord: https://discord.gg/papermc +# Website: https://papermc.io/ + command-block-overrides: [] ignore-vanilla-permissions: false aliases: diff --git a/spigot/config/spigot.yml b/spigot/config/spigot.yml index f625158..49fda9d 100755 --- a/spigot/config/spigot.yml +++ b/spigot/config/spigot.yml @@ -1,14 +1,14 @@ -# This is the main configuration file for Spigot. +# This is the Spigot configuration file for Paper. # 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. -# For a reference for any variable inside this file, check out the Spigot wiki at -# http://www.spigotmc.org/wiki/spigot-configuration/ # -# If you need help with the configuration or have any questions related to Spigot, -# join us at the Discord or drop by our forums and leave a post. +# If you need help with the configuration or have any questions related to Paper, +# join us in our Discord or check the docs page. # -# Discord: https://www.spigotmc.org/go/discord -# Forums: http://www.spigotmc.org/ +# File Reference: https://docs.papermc.io/paper/reference/spigot-configuration/ +# Docs: https://docs.papermc.io/ +# Discord: https://discord.gg/papermc +# Website: https://papermc.io/ settings: debug: false @@ -53,6 +53,7 @@ commands: log: true tab-complete: 0 send-namespaced: true + enable-spam-exclusions: false advancements: disable-saving: false disabled: diff --git a/spigot/locals/config/paper-global.yml b/spigot/locals/config/paper-global.yml index 0800a6e..64ee8bd 100644 --- a/spigot/locals/config/paper-global.yml +++ b/spigot/locals/config/paper-global.yml @@ -8,11 +8,12 @@ # The world configuration options have been moved inside # their respective world folder. The files are named paper-world.yml # +# File Reference: https://docs.papermc.io/paper/reference/global-configuration/ # Docs: https://docs.papermc.io/ # Discord: https://discord.gg/papermc # Website: https://papermc.io/ -_version: 29 +_version: 30 anticheat: obfuscation: items: @@ -49,6 +50,7 @@ collisions: enable-player-collisions: true send-full-pos-for-hard-colliding-entities: true commands: + ride-command-allow-player-as-vehicle: false suggest-player-names-when-null-tab-completions: true time-command-affects-all-worlds: false console: @@ -83,13 +85,15 @@ misc: chat-executor-max-size: -1 client-interaction-leniency-distance: default compression-level: default - fix-entity-position-desync: true load-permissions-yml-before-plugins: true max-joins-per-tick: 5 + prevent-negative-villager-demand: false region-file-cache-size: 256 + send-full-pos-for-item-entities: false strict-advancement-dimension-check: false use-alternative-luck-formula: false use-dimension-type-for-custom-spawners: false + xp-orb-groups-per-area: default packet-limiter: all-packets: action: KICK @@ -97,7 +101,7 @@ packet-limiter: max-packet-rate: 500.0 kick-message: overrides: - ServerboundPlaceRecipePacket: + minecraft:place_recipe: action: DROP interval: 4.0 max-packet-rate: 5.0 @@ -142,8 +146,10 @@ unsupported-settings: allow-unsafe-end-portal-teleportation: false compression-format: ZLIB perform-username-validation: true + simplify-remote-item-matching: false skip-tripwire-hook-placement-validation: false skip-vanilla-damage-tick-when-shield-blocked: false + update-equipment-on-player-actions: true watchdog: early-warning-delay: 10000 early-warning-every: 5000 diff --git a/spigot/locals/config/paper-world-defaults.yml b/spigot/locals/config/paper-world-defaults.yml index b6c01ba..4e39f22 100644 --- a/spigot/locals/config/paper-world-defaults.yml +++ b/spigot/locals/config/paper-world-defaults.yml @@ -8,6 +8,7 @@ # Configuration options here apply to all worlds, unless you specify overrides inside # the world-specific config file inside each world folder. # +# File Reference: https://docs.papermc.io/paper/reference/world-configuration/ # Docs: https://docs.papermc.io/ # Discord: https://discord.gg/papermc # Website: https://papermc.io/ @@ -125,6 +126,7 @@ entities: player-insomnia-start-ticks: 72000 should-remove-dragon: false spawner-nerfed-mobs-should-jump: false + stuck-entity-poi-retry-delay: 200 zombie-villager-infection-chance: default zombies-target-turtle-eggs: true markers: @@ -292,6 +294,7 @@ max-growth-height: cactus: 3 reeds: 3 misc: + allow-remote-ender-dragon-respawning: false alternate-current-update-order: HORIZONTAL_FIRST_OUTWARD disable-end-credits: false disable-relative-projectile-velocity: false diff --git a/spigot/locals/server.properties b/spigot/locals/server.properties index ba5bb14..17a3dfb 100755 --- a/spigot/locals/server.properties +++ b/spigot/locals/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Fri Mar 07 17:08:48 UTC 2025 +#Sat Sep 13 14:45:15 UTC 2025 accepts-transfers=false allow-flight=false allow-nether=true @@ -44,7 +44,7 @@ previews-chat=false pvp=true query.port=25565 rate-limit=0 -rcon.password=internal-password +rcon.password=jox7b70oEW0L7qSjSEPwX20yBsves3oX rcon.port=25575 region-file-compression=deflate require-resource-pack=false diff --git a/spigot/locals/whitelist.json b/spigot/locals/whitelist.json index 06cb6a6..3f7be13 100755 --- a/spigot/locals/whitelist.json +++ b/spigot/locals/whitelist.json @@ -1,8 +1,4 @@ [ - { - "uuid": "c3371e36-f288-4eae-b9d5-b90e47258444", - "name": "zekroTJA" - }, { "uuid": "6828a84e-347f-418f-8f52-5a71cba08c9b", "name": "Lentora" @@ -12,12 +8,8 @@ "name": "Voxain" }, { - "uuid": "a88e46f4-50c0-45c7-baba-5ae1bd48979f", - "name": "PuFuSpecter" - }, - { - "uuid": "2b7a0b02-4b6d-4b67-a090-de0e40705578", - "name": "Lauchson" + "uuid": "6f7aed3e-29fe-4517-9a7c-2911a57bceba", + "name": "Jannik_W1912" }, { "uuid": "da3f4fb9-7486-4a64-b939-1c4e263c3b7b", @@ -27,10 +19,6 @@ "uuid": "5fdf7eee-58b0-4fe3-9647-7236017cbedf", "name": "BusfahrerLukas" }, - { - "uuid": "d51c9805-6298-4f93-9386-dfacad2eae28", - "name": "MCraftDan" - }, { "uuid": "3cb054a7-828c-4a48-9bb4-15e9b4f29558", "name": "luxtracon" @@ -43,10 +31,6 @@ "uuid": "b6708a23-96b5-480b-90f9-c242bba54ac5", "name": "TheGreen" }, - { - "uuid": "5d859e08-8c70-47ef-a375-0c50980b058a", - "name": "OsmanIAC3" - }, { "uuid": "74e73b86-723c-404b-898f-0d1952c8e08b", "name": "Mediaahh" @@ -63,10 +47,6 @@ "uuid": "e56021bf-7d63-418f-8885-096dfa10c886", "name": "awsdcrafting" }, - { - "uuid": "715a6b4e-ad28-4bd2-a04e-8e900c4d7106", - "name": "LeaWolf19" - }, { "uuid": "66e5a48d-0c4a-4243-ad2e-73851b990814", "name": "Sannson_" @@ -75,10 +55,6 @@ "uuid": "b7d57e48-f73c-46e2-9761-3c471327fb31", "name": "XZack_FairX" }, - { - "uuid": "d6381dc3-59c9-4c0e-97cd-6e9a682a5d51", - "name": "weiiXer" - }, { "uuid": "ce17302f-a5b4-4b03-a3de-cdb9d4ca0409", "name": "boloped" @@ -87,6 +63,38 @@ "uuid": "6714e5a0-9acb-4866-ae5c-bf71530cb2fb", "name": "itsDkiller" }, + { + "uuid": "c3371e36-f288-4eae-b9d5-b90e47258444", + "name": "zekroTJA" + }, + { + "uuid": "a88e46f4-50c0-45c7-baba-5ae1bd48979f", + "name": "PuFuSpecter" + }, + { + "uuid": "2b7a0b02-4b6d-4b67-a090-de0e40705578", + "name": "Lauchson" + }, + { + "uuid": "d51c9805-6298-4f93-9386-dfacad2eae28", + "name": "MCraftDan" + }, + { + "uuid": "e188450c-0379-4986-8f81-cc9228318222", + "name": "Pseico_Music" + }, + { + "uuid": "5d859e08-8c70-47ef-a375-0c50980b058a", + "name": "OsmanIAC3" + }, + { + "uuid": "715a6b4e-ad28-4bd2-a04e-8e900c4d7106", + "name": "LeaWolf19" + }, + { + "uuid": "d6381dc3-59c9-4c0e-97cd-6e9a682a5d51", + "name": "weiiXer" + }, { "uuid": "f6ee25ce-7354-405b-a617-e3447d7f7341", "name": "SkyIXI" diff --git a/spigot/mrpm.project.toml b/spigot/mrpm.project.toml new file mode 100644 index 0000000..3ac607f --- /dev/null +++ b/spigot/mrpm.project.toml @@ -0,0 +1,16 @@ +game_version = [ + "1.21.4", + "1.21.5", + "1.21.6", + "1.21.7", + "1.21.8", +] +loader = "paper" +minimum_version_type = "beta" +artifacts_dir = "plugins" + +[dependencies] +worldguard = "7.0.14" +pl3xmapextras = "1.21.5-9c7e9f5" +pl3xmap = "1.21.8-534" +worldedit = "7.3.16" diff --git a/spigot/plugins/WorldGuard/worlds/world/regions.yml b/spigot/plugins/WorldGuard/worlds/world/regions.yml index 4d49217..1fb1625 100644 --- a/spigot/plugins/WorldGuard/worlds/world/regions.yml +++ b/spigot/plugins/WorldGuard/worlds/world/regions.yml @@ -109,7 +109,7 @@ regions: b7d57e48-f73c-46e2-9761-3c471327fb31, 5fdf7eee-58b0-4fe3-9647-7236017cbedf, b6708a23-96b5-480b-90f9-c242bba54ac5, d6381dc3-59c9-4c0e-97cd-6e9a682a5d51, 715a6b4e-ad28-4bd2-a04e-8e900c4d7106] - flags: {} + flags: {creeper-explosion: deny} owners: unique-ids: [c3371e36-f288-4eae-b9d5-b90e47258444] type: cuboid @@ -144,7 +144,8 @@ regions: min: {x: -89, y: -64, z: 1037} max: {x: 115, y: 319, z: 1241} members: - unique-ids: [b6708a23-96b5-480b-90f9-c242bba54ac5, c3371e36-f288-4eae-b9d5-b90e47258444] + unique-ids: [b6708a23-96b5-480b-90f9-c242bba54ac5, c3371e36-f288-4eae-b9d5-b90e47258444, + 6f7aed3e-29fe-4517-9a7c-2911a57bceba] flags: {} owners: unique-ids: [3cb054a7-828c-4a48-9bb4-15e9b4f29558] @@ -165,8 +166,8 @@ regions: max: {x: 172, y: 319, z: 1600} members: unique-ids: [3cb054a7-828c-4a48-9bb4-15e9b4f29558] - flags: {sleep: allow, item-drop: allow, exp-drops: allow, use: allow, mob-damage: allow, - item-pickup: allow, damage-animals: allow, interact: allow, chest-access: allow, + flags: {sleep: allow, item-drop: allow, exp-drops: allow, use: allow, item-pickup: allow, + mob-damage: allow, interact: allow, damage-animals: allow, chest-access: allow, use-anvil: allow} owners: unique-ids: [c3371e36-f288-4eae-b9d5-b90e47258444] @@ -194,7 +195,7 @@ regions: priority: 0 __global__: members: {} - flags: {notify-enter: false, enderman-grief: deny, notify-leave: false} + flags: {enderman-grief: deny, notify-enter: false, notify-leave: false} owners: {} type: global priority: 0 diff --git a/spigot_staging/config/bukkit.yml b/spigot_staging/config/bukkit.yml index d739ce3..97b8bc6 100644 --- a/spigot_staging/config/bukkit.yml +++ b/spigot_staging/config/bukkit.yml @@ -1,3 +1,14 @@ +# This is the Bukkit configuration file in Paper. +# As you can see, there's actually not that much to configure without any plugins. +# +# If you need help with the configuration or have any questions related to Paper, +# join us in our Discord or check the docs page. +# +# File Reference: https://docs.papermc.io/paper/reference/bukkit-configuration/ +# Docs: https://docs.papermc.io/ +# Discord: https://discord.gg/papermc +# Website: https://papermc.io/ + settings: allow-end: true warn-on-overload: false diff --git a/spigot_staging/config/commands.yml b/spigot_staging/config/commands.yml index da50320..368bd24 100644 --- a/spigot_staging/config/commands.yml +++ b/spigot_staging/config/commands.yml @@ -1,3 +1,13 @@ +# This is the Bukkit commands configuration file for Paper. +# +# If you need help with the configuration or have any questions related to Paper, +# join us in our Discord or check the docs page. +# +# File Reference: https://docs.papermc.io/paper/reference/bukkit-commands-configuration/ +# Docs: https://docs.papermc.io/ +# Discord: https://discord.gg/papermc +# Website: https://papermc.io/ + command-block-overrides: [] ignore-vanilla-permissions: false aliases: diff --git a/spigot_staging/config/spigot.yml b/spigot_staging/config/spigot.yml index f625158..49fda9d 100644 --- a/spigot_staging/config/spigot.yml +++ b/spigot_staging/config/spigot.yml @@ -1,14 +1,14 @@ -# This is the main configuration file for Spigot. +# This is the Spigot configuration file for Paper. # 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. -# For a reference for any variable inside this file, check out the Spigot wiki at -# http://www.spigotmc.org/wiki/spigot-configuration/ # -# If you need help with the configuration or have any questions related to Spigot, -# join us at the Discord or drop by our forums and leave a post. +# If you need help with the configuration or have any questions related to Paper, +# join us in our Discord or check the docs page. # -# Discord: https://www.spigotmc.org/go/discord -# Forums: http://www.spigotmc.org/ +# File Reference: https://docs.papermc.io/paper/reference/spigot-configuration/ +# Docs: https://docs.papermc.io/ +# Discord: https://discord.gg/papermc +# Website: https://papermc.io/ settings: debug: false @@ -53,6 +53,7 @@ commands: log: true tab-complete: 0 send-namespaced: true + enable-spam-exclusions: false advancements: disable-saving: false disabled: diff --git a/spigot_staging/locals/config/paper-global.yml b/spigot_staging/locals/config/paper-global.yml index 649186c..64ee8bd 100644 --- a/spigot_staging/locals/config/paper-global.yml +++ b/spigot_staging/locals/config/paper-global.yml @@ -8,11 +8,27 @@ # The world configuration options have been moved inside # their respective world folder. The files are named paper-world.yml # +# File Reference: https://docs.papermc.io/paper/reference/global-configuration/ # Docs: https://docs.papermc.io/ # Discord: https://discord.gg/papermc # Website: https://papermc.io/ -_version: 29 +_version: 30 +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 @@ -34,7 +50,7 @@ collisions: enable-player-collisions: true send-full-pos-for-hard-colliding-entities: true commands: - fix-target-selector-tag-completion: true + ride-command-allow-player-as-vehicle: false suggest-player-names-when-null-tab-completions: true time-command-affects-all-worlds: false console: @@ -69,13 +85,15 @@ misc: chat-executor-max-size: -1 client-interaction-leniency-distance: default compression-level: default - fix-entity-position-desync: true load-permissions-yml-before-plugins: true max-joins-per-tick: 5 + prevent-negative-villager-demand: false region-file-cache-size: 256 + send-full-pos-for-item-entities: false strict-advancement-dimension-check: false use-alternative-luck-formula: false use-dimension-type-for-custom-spawners: false + xp-orb-groups-per-area: default packet-limiter: all-packets: action: KICK @@ -83,7 +101,7 @@ packet-limiter: max-packet-rate: 500.0 kick-message: overrides: - ServerboundPlaceRecipePacket: + minecraft:place_recipe: action: DROP interval: 4.0 max-packet-rate: 5.0 @@ -128,7 +146,10 @@ unsupported-settings: allow-unsafe-end-portal-teleportation: false compression-format: ZLIB perform-username-validation: true + simplify-remote-item-matching: false + skip-tripwire-hook-placement-validation: false skip-vanilla-damage-tick-when-shield-blocked: false + update-equipment-on-player-actions: true watchdog: early-warning-delay: 10000 early-warning-every: 5000 diff --git a/spigot_staging/locals/config/paper-world-defaults.yml b/spigot_staging/locals/config/paper-world-defaults.yml index 59ceb67..4e39f22 100644 --- a/spigot_staging/locals/config/paper-world-defaults.yml +++ b/spigot_staging/locals/config/paper-world-defaults.yml @@ -8,6 +8,7 @@ # Configuration options here apply to all worlds, unless you specify overrides inside # the world-specific config file inside each world folder. # +# File Reference: https://docs.papermc.io/paper/reference/world-configuration/ # Docs: https://docs.papermc.io/ # Discord: https://discord.gg/papermc # Website: https://papermc.io/ @@ -84,6 +85,7 @@ entities: behavior: allow-spider-world-border-climbing: true baby-zombie-movement-modifier: 0.5 + cooldown-failed-beehive-releases: true disable-chest-cat-detection: false disable-creeper-lingering-effect: false disable-player-crits: false @@ -124,6 +126,7 @@ entities: player-insomnia-start-ticks: 72000 should-remove-dragon: false spawner-nerfed-mobs-should-jump: false + stuck-entity-poi-retry-delay: 200 zombie-villager-infection-chance: default zombies-target-turtle-eggs: true markers: @@ -291,12 +294,12 @@ max-growth-height: cactus: 3 reeds: 3 misc: + allow-remote-ender-dragon-respawning: false alternate-current-update-order: HORIZONTAL_FIRST_OUTWARD disable-end-credits: false 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: VANILLA shield-blocking-delay: 5 diff --git a/spigot_staging/locals/server.properties b/spigot_staging/locals/server.properties index 59f5bd7..0438695 100644 --- a/spigot_staging/locals/server.properties +++ b/spigot_staging/locals/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Fri Dec 27 23:36:03 UTC 2024 +#Sat Sep 13 14:40:15 UTC 2025 accepts-transfers=false allow-flight=false allow-nether=true diff --git a/spigot_staging/mrpm.project.toml b/spigot_staging/mrpm.project.toml new file mode 100644 index 0000000..9088323 --- /dev/null +++ b/spigot_staging/mrpm.project.toml @@ -0,0 +1,16 @@ +game_version = [ + "1.21.4", + "1.21.5", + "1.21.6", + "1.21.7", + "1.21.8", +] +loader = "paper" +minimum_version_type = "beta" +artifacts_dir = "plugins" + +[dependencies] +pl3xmapextras = "1.21.5-9c7e9f5" +pl3xmap = "1.21.8-534" +worldguard = "7.0.14" +worldedit = "7.3.16"