diff --git a/.gitignore b/.gitignore index 84657f1..f02c4f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ +archive.zip +archive /fetched_*/ /scripts/fetched_*/ # Server files cache/ -/libraries/ -/logs/ +libraries/ +logs/ +/plugins/CommandSpy/state.bin /plugins/Essentials/userdata /plugins/Essentials/warps/* /plugins/Essentials/custom_items.yml @@ -15,8 +18,9 @@ cache/ /plugins/Essentials/worth.yml /plugins/FastAsyncWorldEdit/lang/ /plugins/Geyser-Spigot/locales/ -/versions/ -/worlds/ +/plugins/Vivecraft-Spigot-Extensions/config-instructions.yml +versions/ +worlds/ /banned-ips.json /banned-players.json /help.yml diff --git a/config/paper-global.yml b/config/paper-global.yml index 0383ce1..9b27483 100644 --- a/config/paper-global.yml +++ b/config/paper-global.yml @@ -127,7 +127,7 @@ spam-limiter: tab-spam-increment: 1 tab-spam-limit: 500 timings: - enabled: true + enabled: false hidden-config-entries: - database - proxies.velocity.secret diff --git a/plugins/Essentials.jar b/plugins/Essentials.jar index 0d28a97..d6feb2c 100644 Binary files a/plugins/Essentials.jar and b/plugins/Essentials.jar differ diff --git a/plugins/FastAsyncWorldEdit.jar b/plugins/FastAsyncWorldEdit.jar index 72b3abc..c3d134a 100644 Binary files a/plugins/FastAsyncWorldEdit.jar and b/plugins/FastAsyncWorldEdit.jar differ diff --git a/plugins/FastAsyncWorldEdit/config.yml b/plugins/FastAsyncWorldEdit/config.yml index e4be7d1..ff03c95 100644 --- a/plugins/FastAsyncWorldEdit/config.yml +++ b/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 Jul 20 00:00:00 UTC 2024" -build: "https://ci.athion.net/job/FastAsyncWorldEdit/812" -commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/f2962369" +date: "Thu Nov 28 00:00:00 GMT-03:00 2024" +build: "https://ci.athion.net/job/FastAsyncWorldEdit/952" +commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/f26a6888" 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 @@ -38,7 +38,7 @@ clipboard: # Number of days to keep history on disk before deleting it delete-after-days: 1 # If a player's clipboard should be deleted upon logout - delete-on-logout: false + delete-on-logout: true # Allows NBT stored in a clipboard to be written to disk # - Requires clipboard.use-disk to be enabled save-clipboard-nbt-to-disk: false @@ -111,6 +111,11 @@ extent: # - UNSAFE = Can cause permanent damage to the server # - SAFE = Can be buggy but unlikely to cause any damage experimental: + # Undo operation batch size + # - The size defines the number of changes read at once. + # - Larger numbers might reduce overhead but increase latency for edits with only few changes. + # - 0 means undo operations are not batched. + undo-batch-size: 128 # [UNSAFE] Directly modify the region files. (OBSOLETE - USE ANVIL COMMANDS) # - IMPROPER USE CAN CAUSE WORLD CORRUPTION! anvil-queue-mode: false @@ -138,6 +143,8 @@ experimental: # This has no effect on existing blocks one way or the other. # Changes due to fluid flow will not be tracked by history, thus may have unintended consequences allow-tick-fluids: false + # Whether FAWE should use the incubator Vector API to accelerate some operations + use-vector-api: false # This relates to how FAWE places chunks queue: @@ -189,7 +196,7 @@ history: # Use a database to store disk storage summaries: # - Enables inspection and rollback # - Does not impact performance - use-database: true + use-database: false # Record history with dispatching: # - Much faster as it avoids duplicate block checks # - Slightly worse compression since dispatch order is different @@ -220,6 +227,8 @@ history: delete-after-days: 1 # Delete history in memory on logout (does not effect disk) delete-on-logout: true + # Delete history on disk on logout + delete-disk-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 @@ -346,6 +355,8 @@ limits: # - Can prevent blocks being pasted from clipboards, etc. # - If fast-placement is disabled, this may cause edits to be slower. universal-disallowed-blocks: true + # If legacy, mumerical, blocks IDs should be able to be used (i.e. 12:2), + allow-legacy: true # List of blocks to deny use of. Can be either an entire block type or a block with a specific property value. # Where block properties are specified, any blockstate with the property will be disallowed (e.g. all directions # of a waterlogged fence). For blocking/remapping of all occurrences of a property like waterlogged, see diff --git a/plugins/Geyser-Spigot/config.yml b/plugins/Geyser-Spigot/config.yml index 2b94f5e..2614a96 100644 --- a/plugins/Geyser-Spigot/config.yml +++ b/plugins/Geyser-Spigot/config.yml @@ -105,11 +105,11 @@ general-thread-pool: 32 # Allow third party capes to be visible. Currently allowing: # OptiFine capes, LabyMod capes, 5Zig capes and MinecraftCapes -allow-third-party-capes: true +allow-third-party-capes: false # Removed from Geyser # Allow third party deadmau5 ears to be visible. Currently allowing: # MinecraftCapes -allow-third-party-ears: true +allow-third-party-ears: false # Removed from Geyser # Allow a fake cooldown indicator to be sent. Bedrock players do not see a cooldown as they still use 1.8 combat show-cooldown: true diff --git a/plugins/Geyser.jar b/plugins/Geyser.jar index 897fc85..91035b9 100644 Binary files a/plugins/Geyser.jar and b/plugins/Geyser.jar differ diff --git a/plugins/ViaBackwards.jar b/plugins/ViaBackwards.jar index 6804c61..30eca45 100644 Binary files a/plugins/ViaBackwards.jar and b/plugins/ViaBackwards.jar differ diff --git a/plugins/ViaBackwards/config.yml b/plugins/ViaBackwards/config.yml index 19a0e15..2828bfa 100644 --- a/plugins/ViaBackwards/config.yml +++ b/plugins/ViaBackwards/config.yml @@ -21,5 +21,12 @@ fix-formatted-inventory-titles: true # This only takes effect for ids in the short range. Useful for anticheat compatibility. handle-pings-as-inv-acknowledgements: false # +# Adds bedrock blocks at y=0 for sub 1.17 clients. This may allow for weird interactions due to sending fake blocks. +bedrock-at-y-0: false +# +# Shows sculk shriekers as crying obsidian for 1.18.2 clients on 1.19+ servers. This fixes collision and block breaking issues. +# If disabled, the client will see them as end portal frames. +sculk-shriekers-to-crying-obsidian: true +# # Suppresses warnings of missing emulations for certain features that are not supported (e.g. world height in 1.17+). -suppress-emulation-warnings: false +suppress-emulation-warnings: true diff --git a/plugins/ViaRewind.jar b/plugins/ViaRewind.jar index 68700ad..40eaa1d 100644 Binary files a/plugins/ViaRewind.jar and b/plugins/ViaRewind.jar differ diff --git a/plugins/ViaRewind/config.yml b/plugins/ViaRewind/config.yml index 759e51a..e7efff6 100644 --- a/plugins/ViaRewind/config.yml +++ b/plugins/ViaRewind/config.yml @@ -3,7 +3,8 @@ # Specifies how 1.8.x clients should see the cooldown indicator # You can choose between TITLE, ACTION_BAR, BOSS_BAR and DISABLED # ONLY DISABLE IF YOU HAVE 1.9 COOLDOWN DISABLED ON YOUR SERVER -# 1.8 PLAYERS MAY ASK WHY PVP IS NOT WORKING OTHERWISE +# 1.8 PLAYERS MAY ASK WHY PVP IS NOT WORKING OTHERWISE. +# REQUIRES A SERVER RESTART TO TAKE EFFECT cooldown-indicator: TITLE # # Replaces Adventure mode with Survival mode for 1.7.x clients @@ -11,14 +12,14 @@ cooldown-indicator: TITLE # or 'CanPlaceOn' flags on items replace-adventure: false # -# Whether 1.9 particles should be replaced by similar ones in +# Whether similar ones should replace 1.9 particles in # 1.8 and lower replace-particles: false # -# Max amount of pages for written books before a client gets kicked +# Max number of pages for written books before a client gets kicked max-book-pages: 100 # -# Max amount of characters in the json (!) string of a book page before a client gets kicked +# Max number of characters in the json (!) string of a book page before a client gets kicked max-book-page-length: 5000 # # Whether to emulate the 1.8+ world border for 1.7.x clients @@ -28,11 +29,17 @@ emulate-world-border: true always-show-original-mob-name: true # # The particle to show the world border for the 1.8+ world border for 1.7.x clients -# see https://wiki.vg/index.php?title=Protocol&oldid=7368#Particle_2 +# sees https://wiki.vg/index.php?title=Protocol&oldid=7368#Particle_2 world-border-particle: fireworksSpark # # If enabled, 1.8 players on 1.9+ servers can use /offhand to switch items between their main hand and offhand. enable-offhand: true # -# Allows to define the offhand command +# Allows defining the offhand command offhand-command: /offhand +# +# If enabled, 1.8 players on 1.9+ servers will also experience the levitation effect by sending velocity packets. +emulate-levitation-effect: true +# +# If enabled, 1.8 players will handle the player combat packet added in 1.9 by showing the custom death message above the hotbar. +handle-player-combat-packet: true diff --git a/plugins/ViaVersion.jar b/plugins/ViaVersion.jar index 03f8e72..a648359 100644 Binary files a/plugins/ViaVersion.jar and b/plugins/ViaVersion.jar differ diff --git a/plugins/ViaVersion/config.yml b/plugins/ViaVersion/config.yml index 9595aff..4bd0429 100644 --- a/plugins/ViaVersion/config.yml +++ b/plugins/ViaVersion/config.yml @@ -25,7 +25,7 @@ block-disconnect-msg: You are using an unsupported Minecraft version! # (We don't suggest using reload either, use a plugin manager) # You can customize the message we kick people with if you use ProtocolLib here. reload-disconnect-msg: Server reload, please rejoin! -# We warn when there's an error converting item and block data over versions, should we suppress these? (Only suggested if spamming) +# We warn when there's an error converting item/block or component/nbt data over versions, should we suppress these? (Only suggested if spamming) suppress-conversion-warnings: true # #----------------------------------------------------------# @@ -142,6 +142,12 @@ enforce-secure-chat: false # Handles items with invalid count values (higher than max stack size) on 1.20.3 servers. handle-invalid-item-count: false # +# Hides scoreboard numbers for 1.20.3+ clients on older server versions. +hide-scoreboard-numbers: false +# +# Fixes 1.21+ clients on 1.20.5 servers placing water/lava buckets at the wrong location when moving fast, NOTE: This may cause issues with anti-cheat plugins. +fix-1_21-placement-rotation: false +# #----------------------------------------------------------# # 1.9+ CLIENTS ON 1.8 SERVERS OPTIONS # #----------------------------------------------------------# @@ -151,7 +157,7 @@ handle-invalid-item-count: false prevent-collision: false # If the above is true, should we automatically team players until you do? auto-team: false -# When enabled if certain metadata can't be read, we won't tell you about it +# When enabled if certain entity data can't be read, we won't tell you about it suppress-metadata-errors: true # When enabled, 1.9+ will be able to block by using shields shield-blocking: false @@ -183,7 +189,7 @@ replace-pistons: false replacement-piston-id: 0 # Fix 1.9+ clients not rendering the far away chunks and improve chunk rendering when moving fast (Increases network usage and decreases client fps slightly) chunk-border-fix: false -# Minimize the cooldown animation in 1.8 servers -minimize-cooldown: false # Allows 1.9+ left-handedness (main hand) on 1.8 servers left-handed-handling: false +# Tries to cancel block break/place sounds sent by 1.8 servers to 1.9+ clients to prevent them from playing twice +cancel-block-sounds: true diff --git a/plugins/Vivecraft-Spigot-Extensions/config.yml b/plugins/Vivecraft-Spigot-Extensions/config.yml new file mode 100644 index 0000000..3d16b9f --- /dev/null +++ b/plugins/Vivecraft-Spigot-Extensions/config.yml @@ -0,0 +1,96 @@ +general: + debug: false + # will check for a newer version and alert any OP when they login to the server + checkforupdate: false + # Set to true to only allow VR players to play. + vive-only: false + # If true, creates an exclusion for vive-only for opped players. No effect if vive-only is false. + allow-op: false + # The message to show kicked non-vive players. + vive-only-kickmessage: '' + # Ticks to wait before kicking a player. The player's client must send a Vivecraft VERSION info in that time. + vive-only-kickwaittime: 0 + # Set to false to disable registering Vivecraft-specific crafting recipes. + vive-crafting: false +SendPlayerData: + # Send player data to all clients with Vivecraft + enabled: true +CreeperRadius: + # Distance from a Vivecraft player before creeper starts to swell up (vanilla is 3) + enabled: true + radius: 1.75 +setSpigotConfig: + enabled: true + # Increase these if you get rubber banding when teleporting. + movedWronglyThreshold: 15 + movedTooQuickly: 64 +pvp: + # Allows Standing VR players to Attack other Standing VR Players + VRvsVR: true + # Allows Standing VR Players to attack Non VR players + VRvsNONVR: true + # Allows Seated VR Players to attack normal players. + SEATEDVRvsNONVR: true + # Allows Standing VR Players to attack Seated VR Players + VRvsSEATEDVR: true +bow: + # Archery damage multiplier for Vivecraft (standing) users. Set to 1 to disable + standingmultiplier: 2 + # Archery damage multiplier for Vivecraft (seated) users. Set to 1 to disable + seatedmultiplier: 1 + # Headshot damage multiplier for Vivecraft (standing) users. Set to 1 to disable + standingheadshotmultiplier: 3 + # Headshot damage multiplier for Vivecraft (seated) users. Set to 1 to disable + seatedheadshotmultiplier: 2 + # Set if players can headshot mobs (only horizontal mobs) + headshotmobs: true +permissions: + # enable setting player groups for vive users. + enabled: false + # Permission group for Vive users + vivegroup: vive.vivegroup + # Permission group for non-Vive users + non-vivegroup: vive.non-vivegroup + # Permission group for vive users in free move mode. + freemovegroup: vive.freemovegroup + # Permission to override climb limitations. + climbperm: vive.climbanywhere +welcomemsg: + enabled: false + # Remove message to not send or set to nothing. ex: leaveMessage: + welcomeVR: '&player has joined with standing VR!' + welcomenonVR: '&player has joined with Non-VR companion!' + welcomeSeated: '&player has joined with seated VR!' + welcomeVanilla: '&player has joined as a Muggle!' + leaveMessage: '&player has disconnected from the server!' +climbey: + # Allows use of jump_boots and climb_claws. Provide with /give (player) climb_claws | jump_boots + enabled: false + # Sets which blocks are climb-able. Options are 'None': List ignored. All blocks are climbable. 'Include': Only blocks on the list are climbable. 'Exclude': All blocks are climbable except those on the list + blockmode: None + # The list of block names for use with include/exclude block mode. + blocklist: + - white_wool + - dirt + - grass_block +crawling: + # Allows use of roomscale crawling. Disabling does not prevent vanilla crawling. + enabled: false +teleport: + # Whether direct teleport is enabled. It is recommended to leave this enabled for players prone to VR sickness. + enable: true + # Enforce limited teleport range and frequency in survival + limitedsurvival: false + # Maximum blocks players can teleport up. Set to 0 to disable. Max: 4 + uplimit: 1 + # Maximum blocks players can teleport down. Set to 0 to disable. Max: 16 + downlimit: 4 + # Maximum blocks players can teleport horizontally. Set to 0 to disable. Max: 32 + horizontallimit: 16 +worldscale: + # Limit the range of world scale players can use + limitrange: false + # Upper limit of range + max: 2 + # Lower limit of range + min: 0.5 diff --git a/plugins/voicechat.jar b/plugins/voicechat.jar index 09c1b21..d6a17af 100644 Binary files a/plugins/voicechat.jar and b/plugins/voicechat.jar differ diff --git a/plugins/voicechat/translations.properties b/plugins/voicechat/translations.properties new file mode 100644 index 0000000..52836a2 --- /dev/null +++ b/plugins/voicechat/translations.properties @@ -0,0 +1,20 @@ +# Simple Voice Chat translations +# This file contains all server-side translations for the Simple Voice Chat plugin + +# The message a player gets when kicked for not having voice chat installed and the server has force_voicechat enabled +# The first parameter is the mod/plugin name and the second parameter is the mod/plugin version +force_voicechat_kick_message=You need %s %s to play on this server +# The message a player gets when joining a server with an incompatible voice chat version +# The first parameter is the mod/plugin version and the second parameter is the mod/plugin name +voicechat_not_compatible_message=Your voice chat client version is not compatible with the server-side version.\\nPlease install version %s of %s. +# The message a player gets when trying to execute a command that requires the voice chat mod installed on the client side. +# The first parameter is the mod/plugin name +voicechat_needed_for_command_message=You need to have %s installed on your client to use this command +# The message a player gets when trying to execute a command that can only be executed as a player +player_command_message=This command can only be executed as a player +# The Placeholder API string for '%voicechat_installed%' +placeholder_api_voicechat_installed= +# The Placeholder API string for '%voicechat_not_installed%' +placeholder_api_voicechat_not_installed= +# The Placeholder API string for '%voicechat_disabled%' +placeholder_api_voicechat_disabled= diff --git a/plugins/voicechat/translations.yml b/plugins/voicechat/translations.yml deleted file mode 100644 index bc403a8..0000000 --- a/plugins/voicechat/translations.yml +++ /dev/null @@ -1,10 +0,0 @@ -not_compatible: |- - Your voice chat version is not compatible with the servers version. - Please install version %s of %s. -voicechat_needed_command: You need to have %s installed on your client to use this - command -command_as_player: This command can only be executed as a player - -placeholder_api_prefix_uses_voicechat: §a -placeholder_api_prefix_no_voicechat: §c -placeholder_api_prefix_disabled: §c diff --git a/plugins/voicechat/voicechat-server.properties b/plugins/voicechat/voicechat-server.properties index 11270de..c42ada5 100644 --- a/plugins/voicechat/voicechat-server.properties +++ b/plugins/voicechat/voicechat-server.properties @@ -1,43 +1,50 @@ -# Simple Voice Chat server config v1.19.3-2.3.28 +# Simple Voice Chat server config v2.5.25 -# The range where the voice chat should broadcast audio to -# A value <0 means 'max_voice_distance' -broadcast_range=-1.0 -# If spectators are allowed to talk to other players -spectator_interaction=false -# If players without the mod should get kicked from the server -force_voice_chat=false -# The IP address to bind the voice chat server on -# Leave empty to bind to an IP address chosen by the kernel -bind_address= -# If players in group chats can be heard locally -open_groups=false -# The multiplier the voice distance will be reduced by when whispering -whisper_distance_multiplier=0.5 -# The opus codec -codec=VOIP -# If players are allowed to record the voice chat -allow_recording=true -# The distance to where the voice can be heard -max_voice_distance=48.0 -# The port of the voice chat server -# Setting this to "-1" sets the port to the Minecraft servers port +# The port number to use for the voice chat communication. +# Audio packets are always transmitted via the UDP protocol on the port number +# specified here, independently of other networking used for the game server. +# Set this to '-1' to use the same port number that is used by the Minecraft server. +# However, it is strongly recommended NOT to use the same port number because UDP on +# it is also used by default for the server query. Doing so may crash the server! port=24454 -# The multiplier the voice distance will be reduced by when sneaking +# The server IP address to bind the voice chat to +# Leave blank to use the 'server-ip' property from the 'server.properties' config file +# To bind to the wildcard IP address, use '*' +bind_address= +# The distance to which the voice can be heard +max_voice_distance=64.0 +# The multiplier of the voice distance when crouching crouch_distance_multiplier=1.0 -# The maximum size in bytes in a voice packet -# Set this to a lower value if your voice packets don't arrive +# The multiplier of the voice distance when whispering +whisper_distance_multiplier=0.5 +# The Opus codec +# Valid values are 'VOIP', 'AUDIO', and 'RESTRICTED_LOWDELAY' +codec=VOIP +# The maximum size that audio packets are allowed to have (in bytes) +# Set this to a lower value if audio packets don't arrive mtu_size=1024 -# The host name that clients should use to connect to the voice chat -# Don't change this value if you don't know what you are doing -voice_host= -# The frequency in which keep alive packets are sent +# The frequency at which keep-alive packets are sent (in milliseconds) # Setting this to a higher value may result in timeouts -keep_alive=1000 -# The amount of milliseconds, the server should wait to check if the player has the mod installed -# Only active when force_voice_chat is set to true -login_timeout=10000 -# If spectators can talk to players they are spectating -spectator_player_possession=false +keep_alive=2000 # If group chats are allowed enable_groups=true +# The hostname that clients should use to connect to the voice chat +# This may also include a port, e.g. 'example.com:24454' +# Do NOT change this value if you don't know what you're doing +voice_host= +# If players are allowed to record the voice chat audio +allow_recording=false +# If spectators are allowed to talk to other players +spectator_interaction=true +# If spectators can talk to players they are spectating +spectator_player_possession=false +# If players without the voice chat mod should be kicked from the server +force_voice_chat=false +# The amount of time the server should wait to check if a player has the mod installed (in milliseconds) +# Only relevant when 'force_voice_chat' is set to 'true' +login_timeout=10000 +# The range in which the voice chat should broadcast audio +# A value less than 0 means 'max_voice_distance' +broadcast_range=-1.0 +# If the voice chat server should reply to external pings +allow_pings=true diff --git a/scripts/fetch_external_plugins.sh b/scripts/fetch_external_plugins.sh index e0891e9..3e9cac0 100755 --- a/scripts/fetch_external_plugins.sh +++ b/scripts/fetch_external_plugins.sh @@ -17,9 +17,6 @@ do rm archive.zip done -## voicechat -curl -L https://cdn.modrinth.com/data/9eGKb6K1/versions/nS19YToN/voicechat-bukkit-2.5.20.jar -o voicechat.jar - # Move plugins mv archive/jars/EssentialsX-*.jar fetched_plugins/Essentials.jar mv archive/artifacts/FastAsyncWorldEdit-Bukkit-*.jar fetched_plugins/FastAsyncWorldEdit.jar @@ -27,7 +24,6 @@ mv Geyser-Spigot.jar fetched_plugins/Geyser.jar mv archive/build/libs/ViaVersion-*.jar fetched_plugins/ViaVersion.jar mv archive/build/libs/ViaBackwards-*.jar fetched_plugins/ViaBackwards.jar mv archive/build/libs/ViaRewind-*.jar fetched_plugins/ViaRewind.jar -mv voicechat.jar fetched_plugins/voicechat.jar # Clean up rm -rf archive/ diff --git a/server.properties b/server.properties index ecb0b44..51a6bf2 100644 --- a/server.properties +++ b/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Sun Jun 23 19:39:57 UTC 2024 +#Fri Nov 01 00:00:00 UTC 2024 allow-flight=true allow-nether=true broadcast-console-to-ops=true diff --git a/spigot.yml b/spigot.yml index 6fb28a6..b61cc84 100644 --- a/spigot.yml +++ b/spigot.yml @@ -63,6 +63,7 @@ advancements: - '*' world-settings: default: + seed-trialchambers: 94251327 below-zero-generation-in-existing-chunks: true simulation-distance: default thunder-chance: 100000