From 4e21b1fc56895b2d18d7a56ee4834f6abde648c6 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 22 Jul 2023 19:55:02 -0300 Subject: [PATCH] bump everything --- TODO.md | 3 +- config/config/paper-global.yml | 12 ++++- config/config/paper-world-defaults.yml | 16 +++++- config/config/scissors.yml | 11 ++++ config/plugins/FastAsyncWorldEdit/config.yml | 53 ++++++++----------- config/plugins/GSit/config.yml | 20 ++++--- .../plugins/PlotSquared/config/settings.yml | 12 ++--- config/plugins/TotalFreedomMod/config.yml | 22 +------- config/plugins/WorldGuard/config.yml | 24 +++++++++ config/server.properties | 1 + config/spigot.yml | 2 + server.toml | 22 ++++---- 12 files changed, 117 insertions(+), 81 deletions(-) diff --git a/TODO.md b/TODO.md index b30205c..7d5fc31 100644 --- a/TODO.md +++ b/TODO.md @@ -2,4 +2,5 @@ # Plugins - Plan -- Votifier \ No newline at end of file +- Votifier +- ViaRewind \ No newline at end of file diff --git a/config/config/paper-global.yml b/config/config/paper-global.yml index 9e3cd72..26f15ed 100644 --- a/config/config/paper-global.yml +++ b/config/config/paper-global.yml @@ -13,6 +13,9 @@ # Website: https://papermc.io/ _version: 28 +block-updates: + disable-noteblock-updates: false + disable-tripwire-updates: false chunk-loading: autoconfig-send-distance: true enable-frustum-priority: false @@ -24,6 +27,14 @@ chunk-loading: 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 + player-max-concurrent-chunk-loads: 0 +chunk-loading-basic: + player-max-chunk-generate-rate: -1.0 + player-max-chunk-load-rate: 100.0 + player-max-chunk-send-rate: 75.0 chunk-system: gen-parallelism: default io-threads: -1 @@ -53,7 +64,6 @@ item-validation: logging: deobfuscate-stacktraces: true log-player-ip-addresses: true - use-rgb-for-named-text-colors: true messages: kick: authentication-servers-down: diff --git a/config/config/paper-world-defaults.yml b/config/config/paper-world-defaults.yml index 4e864ef..7b8bede 100644 --- a/config/config/paper-world-defaults.yml +++ b/config/config/paper-world-defaults.yml @@ -1,3 +1,17 @@ +# This is the world defaults configuration file for Paper. +# As you can see, there's a lot 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 Paper, +# join us in our Discord or check the docs page. +# +# Configuration options here apply to all worlds, unless you specify overrides inside +# the world-specific config file inside each world folder. +# +# Docs: https://docs.papermc.io/ +# Discord: https://discord.gg/papermc +# Website: https://papermc.io/ + _version: 30 anticheat: anti-xray: @@ -226,7 +240,7 @@ misc: disable-sprint-interruption-on-attack: false light-queue-size: 20 max-leash-distance: 10.0 - redstone-implementation: ALTERNATE-CURRENT + redstone-implementation: ALTERNATE_CURRENT shield-blocking-delay: 5 show-sign-click-command-failure-msgs-to-player: false update-pathfinding-on-block-update: true diff --git a/config/config/scissors.yml b/config/config/scissors.yml index c45139b..40fb77c 100644 --- a/config/config/scissors.yml +++ b/config/config/scissors.yml @@ -1,3 +1,14 @@ +# 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/ + runCommandsInBooks: false commandSignsBypassPermissions: false componentDepthLimit: 128 diff --git a/config/plugins/FastAsyncWorldEdit/config.yml b/config/plugins/FastAsyncWorldEdit/config.yml index ceb51d1..4b1731f 100644 --- a/config/plugins/FastAsyncWorldEdit/config.yml +++ b/config/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: "Sat Jun 03 00:00:00 BRT 2023" -build: "https://ci.athion.net/job/FastAsyncWorldEdit/27" -commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/f8a98495" +date: "Tue Aug 22 00:00:00 BRT 2023" +build: "https://ci.athion.net/job/FastAsyncWorldEdit/38" +commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/f294b3e7" 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 @@ -80,6 +80,14 @@ web: # The maximum size (width x length) an image being loaded can be. # - 8294400 is 3840x2160 max-image-size: 8294400 + # Whitelist of hostnames to allow images to be downloaded from + # - Adding '*' to the list will allow any host, but this is NOT adviseable + # - Crash exploits exist with malformed images + # - See: https://medium.com/chargebee-engineering/perils-of-parsing-pixel-flood-attack-on-java-imageio-a97aeb06637d + allowed-image-hosts: + - "i.imgur.com" + - "files.catbox.moe" + - "litter.catbox.moe" extent: # Don't bug console when these plugins slow down WorldEdit operations @@ -105,8 +113,9 @@ experimental: dynamic-chunk-rendering: -1 # Allows brushes to be persistent (default: true) persistent-brushes: true - # [SAFE] Keep entities that are positioned in non-air blocks when editing an area - # Might cause client-side FPS lag in some situations + # [SAFE] Keep entities that are positioned in non-air blocks when editing an area (default: true) + # - Might cause client-side FPS lag in some situations + # - Requires fast-placement to be true keep-entities-in-blocks: false # [SAFE] Attempt to remove entities from the world if they were not present in the expected chunk (default: true) # - Sometimes an entity may have moved into a different chunk to that which FAWE expected @@ -114,7 +123,7 @@ experimental: # - If the entity is in an unloaded or partially loaded chunk, this will fail # - If an entity cannot be removed, it is possible duplicate entities may be created when using undo and/or redo remove-entity-from-world-on-chunk-fail: true - # Other experimental features + # Increased debug logging for brush actions and processor setup other: false # Allow fluids placed by FAWE to tick (flow). This could cause the big lags. # This has no effect on existing blocks one way or the other. @@ -134,6 +143,7 @@ queue: # - false = disabled # - title = Display progress titles # - chat = Display progress in chat + # - Currently not implemented display: "title" # How often edit progress is displayed interval: 2 @@ -145,13 +155,8 @@ queue: # - A smaller value will reduce memory usage # - A value too small may break some operations (deform?) # - Values smaller than the configurated parallel-threads are not accepted - # - It is recommended this option be at least 2x greater than parallel-threads + # - It is recommended this option be at least 4x greater than parallel-threads target-size: 64 - # Force FAWE to start placing chunks regardless of whether an edit is finished processing - # - A larger value will use slightly less CPU time - # - A smaller value will reduce memory usage - # - A value too small may break some operations (deform?) - max-wait-ms: 1000 # Increase or decrease queue intensity (ms) [-50,50]: # 0 = balance of performance / stability # -10 = Allocate 10ms less for chunk placement @@ -168,10 +173,6 @@ queue: # If pooling is enabled (reduces GC, higher memory usage) # - Enable to improve performance at the expense of memory pool: true - # Discard edits which have been idle for a certain amount of time (ms) - # - E.g. A plugin creates an EditSession but never does anything with it - # - This only applies to plugins improperly using WorldEdit's legacy API - discard-after-ms: 60000 # When using fastmode do not bother to tick existing/placed blocks/fluids # Only works in versions up to 1.17.1 no-tick-fastmode: true @@ -213,27 +214,13 @@ history: # - Larger = better ratio but uses more upfront memory # - Must be in the range [64, 33554432] buffer-size: 531441 - # The maximum time in milliseconds to wait for a chunk to load for an edit. - # (50ms = 1 server tick, 0 = Fastest). - # The default value of 100 should be safe for most cases. - # - # Actions which require loaded chunks (e.g. copy) which do not load in time - # will use the last chunk as filler, which may appear as bands of duplicated blocks. - # Actions usually wait about 25-50ms for the chunk to load, more if the server is lagging. - # A value of 100ms does not force it to wait 100ms if the chunk loads in 10ms. - # - # This value is a timeout in case a chunk is never going to load (for whatever odd reason). - # If the action times out, the operation continues by using the previous chunk as filler, - # and displaying an error message. In this case, either copy a smaller section, - # or increase chunk-wait-ms. - # A value of 0 is faster simply because it doesn't bother loading the chunks or waiting. - chunk-wait-ms: 1000 # Delete history on disk after a number of days delete-after-days: 7 # Delete history in memory on logout (does not effect disk) delete-on-logout: true # If history should be enabled by default for plugins using WorldEdit: # - It is faster to have disabled + # - It is faster to have disabled # - Use of the FAWE API will not be effected enable-for-console: true # Should redo information be stored: @@ -281,6 +268,10 @@ region-restrictions-options: # - Will still search for current allowed regions to limit the edit to. # - Any blacklist regions are likely to override any internal allowed regions. worldguard-region-blacklist: false + # Restrict all edits to within the safe chunk limits of +/- 30 million blocks + # - Edits outside this range may induce crashing + # - Forcefully prevents any edit outside this range + restrict-to-safe-range: true # The "default" limit group affects those without a specific limit permission. # To grant someone different limits, copy the default limits group # and give it a different name (e.g. newbie). Then give the user the limit diff --git a/config/plugins/GSit/config.yml b/config/plugins/GSit/config.yml index 5c937a8..e8f0e3b 100644 --- a/config/plugins/GSit/config.yml +++ b/config/plugins/GSit/config.yml @@ -33,16 +33,16 @@ Options: Sit: - # Defines the blocks a player can sit on by clicking (materials and tags) + # Defines the blocks a player can sit on by clicking (materials and tags) (* means every block) # Separate a material or tag from its y-offset with a ";" character SitMaterials: - - '#stairs' - - '#slabs' - - '#carpets' - - '#wool_carpets' - - moss_carpet - - big_dripleaf - - snow + - '#stairs' + - '#slabs' + - '#carpets' + - '#wool_carpets' + - moss_carpet + - big_dripleaf + - snow # Defines whether you can sit on stairs and slabs that are not in the bottom part of a block bottom-part-only: true @@ -120,12 +120,16 @@ Options: get-up-sneak: true # Defines whether a player can double-sneak in a short amount of time to start crawling + # In order for it to work, you must be looking straight down double-sneak: false Emote: + # Defines whether to create the default "happy" emote in the emotes folder if it is missing + create-default-emote: true + # Defines the maximum range at which emotes can be seen max-distance: 192.0 diff --git a/config/plugins/PlotSquared/config/settings.yml b/config/plugins/PlotSquared/config/settings.yml index 8df76e6..0a19523 100644 --- a/config/plugins/PlotSquared/config/settings.yml +++ b/config/plugins/PlotSquared/config/settings.yml @@ -94,7 +94,7 @@ enabled-components: # Make road regeneration persistent across restarts persistent-road-regen: true # Enable the `/plot component` preset GUI - # Read more about components here: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components + # Read more about components here: https://intellectualsites.gitbook.io/plotsquared/customization/plot-components component-presets: true # Enable per user locale per-user-locale: false @@ -133,7 +133,7 @@ auto-clear: delete-if-owner-is-unknown: false worlds: - "*" - # See: https://intellectualsites.github.io/plotsquared-documentation/optimization/plot-analysis for a description of each value. + # See: https://intellectualsites.gitbook.io/plotsquared/optimization/plot-analysis for a description of each value. calibration: variety: 0 variety-sd: 0 @@ -213,7 +213,7 @@ teleport: visit-merged-owners: true # Chunk processor related settings -# See https://intellectualsites.github.io/plotsquared-documentation/optimization/chunk-processor for more information. +# See https://intellectualsites.gitbook.io/plotsquared/optimization/chunk-processor for more information. chunk-processor: # Auto trim will not save chunks which aren't claimed auto-trim: false @@ -324,7 +324,7 @@ confirmation: confirmation-timeout-seconds: 20 # Backup related settings -# See https://intellectualsites.github.io/plotsquared-documentation/plot-backups for more information. +# See https://intellectualsites.gitbook.io/plotsquared/plot-backups for more information. backup: # Automatically backup plots when destructive commands are performed, e.g. /plot clear automatic-backups: true @@ -370,7 +370,7 @@ arkitektonika: delete-url: "https://api.schematic.cloud/delete/{key}" # Schematic Settings -# See https://intellectualsites.github.io/plotsquared-documentation/schematics/schematic-on-claim for more information. +# See https://intellectualsites.gitbook.io/plotsquared/schematics/schematic-on-claim for more information. schematics: # Whether schematic based generation should paste schematic on top of plots, or from Y=1 paste-on-top: true @@ -403,7 +403,7 @@ general: # Always show explosion Particles, even if explosion flag is set to false always-show-explosions: false # Blocks that may not be used in plot components - # Checkout the wiki article regarding plot components before modifying: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components + # Checkout the wiki article regarding plot components before modifying: https://intellectualsites.gitbook.io/plotsquared/customization/plot-components invalid-blocks: - "acacia_button" - "acacia_fence_gate" diff --git a/config/plugins/TotalFreedomMod/config.yml b/config/plugins/TotalFreedomMod/config.yml index 64e9388..3938f77 100644 --- a/config/plugins/TotalFreedomMod/config.yml +++ b/config/plugins/TotalFreedomMod/config.yml @@ -55,6 +55,7 @@ server: discord: token: '${DISCORD_TOKEN}' prefix: '${DISCORD_PREFIX}' + pluralkit_integration: true server_id: '${DISCORD_SERVER_ID}' report_channel_id: '' report_archive_channel_id: '' @@ -156,15 +157,6 @@ adminlist: # Handy in development environments. console_is_admin: true -# CoreProtect -coreprotect: - enabled: true - host: '${DATABASE_HOST}' - port: '${DATABASE_PORT}' - username: '${DATABASE_USER}' - password: '${DATABASE_PASS}' - database: '${DATABASE_NAME}' - # ForceIP configuration forceip: enabled: false @@ -233,7 +225,6 @@ blocked_commands: # * The second section is a letter which indicates what to do when a player executes that command. # Valid actions: # b - Block the command - # a - Block the command and auto-eject that player (for ops and below) # u - Block the command and Return an "Unknown command" message (Used to hide commands) # # * The third section is the command to be blocked, prefixed with a slash @@ -245,7 +236,7 @@ blocked_commands: # # Examples: # - 'n:b:/mail sendall:&4You can't send mails to everyone!' - # - 's:a:/stop' + # - 's:b:/stop' # - 'n:b:/ban:_' # global: @@ -444,12 +435,6 @@ admin_only_mode: false # Toggle Chat toggle_chat: true -# Host Sender Names - Names that indicate automated services or host-based consoles you want to block from using some commands. -# Make sure these are all lower-case. -host_sender_names: - - rcon - - console - # Announcer announcer: enabled: true @@ -549,6 +534,3 @@ blocked_chatcodes: '&0,&k,&m,&n' # Enables certain things like debug logs and console bypasses developer_mode: false - -# AntiSpam Time (minutes) -antispam_minutes: 2 diff --git a/config/plugins/WorldGuard/config.yml b/config/plugins/WorldGuard/config.yml index 56d6c64..dbddab4 100644 --- a/config/plugins/WorldGuard/config.yml +++ b/config/plugins/WorldGuard/config.yml @@ -1,3 +1,24 @@ +# +# WorldGuard's main configuration file +# +# This is the global configuration file. Anything placed into here will +# be applied to all worlds. However, each world has its own configuration +# file to allow you to replace most settings in here for that world only. +# +# About editing this file: +# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If +# you use an editor like Notepad++ (recommended for Windows users), you +# must configure it to "replace tabs with spaces." In Notepad++, this can +# be changed in Settings > Preferences > Language Menu. +# - Don't get rid of the indents. They are indented so some entries are +# in categories (like "enforce-single-session" is in the "protection" +# category. +# - If you want to check the format of this file before putting it +# into WorldGuard, paste it into http://yaml-online-parser.appspot.com/ +# and see if it gives "ERROR:". +# - Lines starting with # are comments and so they are ignored. +# + regions: uuid-migration: perform-on-next-start: false @@ -159,3 +180,6 @@ blacklist: path: worldguard/logs/%Y-%m-%d.log open-files: 10 custom-metrics-charts: true +sniffer-egg: + disable-creature-trampling: false + disable-player-trampling: false diff --git a/config/server.properties b/config/server.properties index a5ff7dc..938e64e 100644 --- a/config/server.properties +++ b/config/server.properties @@ -8,3 +8,4 @@ enforce-secure-profile=false max-players=75 allow-flight=true sync-chunk-writes=false +server-ip=0.0.0.0 diff --git a/config/spigot.yml b/config/spigot.yml index 36b19e5..0a20822 100644 --- a/config/spigot.yml +++ b/config/spigot.yml @@ -81,6 +81,7 @@ world-settings: hanging-tick-frequency: 100 thunder-chance: 100000 growth: + pitcherplant-modifier: 100 cactus-modifier: 100 cane-modifier: 100 melon-modifier: 100 @@ -158,6 +159,7 @@ world-settings: seed-portal: 34222645 seed-ancientcity: 20083232 seed-buriedtreasure: 10387320 + seed-trailruins: 83469867 seed-mineshaft: default seed-stronghold: default hunger: diff --git a/server.toml b/server.toml index 279f49b..48ae3d5 100644 --- a/server.toml +++ b/server.toml @@ -46,19 +46,16 @@ eula_args = true nogui = true memory = "6500M" -[launcher.properties] -"com.github.iptfreedom.fastasynchronousincompetence.allowv7" = "true" - [[plugins]] type = "ghrel" repo = "IPTFreedom/TotalFreedomMod" -tag = "2022.06.08-IPT" +tag = "2023.07.01-IPT" asset = "TotalFreedomMod" [[plugins]] type = "ghrel" repo = "IPTFreedom/Minecraft-JDA" -tag = "5.0.0-beta.10-1" +tag = "5.0.0-beta.12" asset = "Minecraft-JDA" [[plugins]] @@ -129,7 +126,7 @@ desc = "TODO: Decompile this one and clean up the code & make a release" [[plugins]] type = "ghrel" repo = "IPTFreedom/MarriageMaster" -tag = "2.7.0.2-IPT" +tag = "2.7.1.beta.1-IPT" asset = "MarriageMaster" [[plugins]] @@ -139,12 +136,11 @@ job = "PluginLib" build = "latest" artifact = "first" -# TODO(mcman): change when hangar support [[plugins]] -type = "url" -url = "https://hangarcdn.papermc.io/plugins/Telesphoreo/ItemizerX/versions/2.0/PAPER/ItemizerX.jar" -filename = "ItemizerX.jar" -desc = "TODO(mcman): change when hangar support" +type = "ghrel" +repo = "plexusorg/ItemizerX" +tag = "2.1" +asset = "ItemizerX" [[plugins]] type = "modrinth" @@ -172,13 +168,13 @@ asset = "OpenInv.jar" [[plugins]] type = "ghrel" repo = "IPTFreedom/PlotSquared" -tag = "7.0.0-beta.3-IPT" +tag = "7.0.0-beta.4-IPT" asset = "plotsquared-bukkit" [[plugins]] type = "ghrel" repo = "Gecolay/GSit" -tag = "1.4.7" +tag = "1.4.10" asset = "GSit" [[plugins]]