diff --git a/server/podman-run.sh b/server/podman-run.sh deleted file mode 100755 index 42b62a8..0000000 --- a/server/podman-run.sh +++ /dev/null @@ -1,11 +0,0 @@ -podman run \ - --name jre-hl-mc \ - --tty \ - --interactive \ - --publish 25565:25565/tcp \ - --publish 24454:24454/tcp \ - --volume ./server:/mnt/server \ - --workdir /mnt/server \ -alp-jre-21-hl:latest \ -java -Xmx4G -Xms1G -jar minecraft_server.jar --nogui - diff --git a/server/server/config/c2me.toml b/server/server/config/c2me.toml index f081185..e46fd6b 100644 --- a/server/server/config/c2me.toml +++ b/server/server/config/c2me.toml @@ -18,15 +18,15 @@ version = 3 # This is used when the parallelism isn't overridden. # Available variables: is_windows, is_j9vm, is_client, cpus, mem_gb # -defaultGlobalExecutorParallelismExpression = "max(1,min(if(is_client,(cpus/2.66+1),(cpus/1.5)),if(is_j9vm,((mem_gb-(if(is_client,0.5,0.2)))/0.2),((mem_gb-(if(is_client,0.8,0.5)))/0.2))))" -# (Default: 2) Configures the parallelism of global executor +defaultGlobalExecutorParallelismExpression = "max(1,min(if(is_client,(cpus/2.66+1),(cpus/1.5)),if(is_j9vm,((mem_gb-(if(is_client,0.5,0.2)))/0.2),((mem_gb-(if(is_client,0.8,0.5)))/0.2))))" +# (Default: 10) Configures the parallelism of global executor globalExecutorParallelism = "default" [noTickViewDistance] # (Default: true) Whether to use compatibility mode to send chunks # This may fix some mod compatibility issues compatibilityMode = "default" - # (Default: 3) No-tick view distance max concurrent chunk loads + # (Default: 11) No-tick view distance max concurrent chunk loads # Lower this for a better latency and higher this for a faster loading maxConcurrentChunkLoads = 2 # (Default: false) Whether to ensure correct chunks within normal render distance @@ -79,7 +79,7 @@ globalExecutorParallelism = "default" # (may cause incompatibility with other mods) # asyncScheduling = "default" - # (Default: false) Whether to enable this feature + # (Default: true) Whether to enable this feature enabled = "default" [fixes] diff --git a/server/server/config/create-client.toml b/server/server/config/create-client.toml index 87542af..5a0e7f4 100644 --- a/server/server/config/create-client.toml +++ b/server/server/config/create-client.toml @@ -21,9 +21,6 @@ #Range: > 0 maximumContraptionLightVolume = 16384 #. - #Disable to prevent being rotated while seated on a Moving Contraption - rotateWhenSeated = true - #. #Log a stack-trace when rendering issues happen within a moving contraption. explainRenderErrors = false #. diff --git a/server/server/config/create-server.toml b/server/server/config/create-server.toml index 6aaeee2..e026058 100644 --- a/server/server/config/create-server.toml +++ b/server/server/config/create-server.toml @@ -172,10 +172,6 @@ #Whether harvesters should replant crops after harvesting. harvesterReplants = true #. - #Whether stabilised bearings create a separated entity even on non-rotating contraptions. - #[Technical] - stabiliseStableContraptions = false - #. #Whether minecart contraptions can be placed into container items. minecartContraptionInContainers = false #. @@ -400,19 +396,15 @@ #Range: > 100 schematicIdleTimeout = 600 #. - #The amount of Schematics a player can upload until previous ones are overwritten. - #Range: > 1 + #[in KiloBytes] + #The maximum allowed file size of uploaded Schematics. + #Range: > 16 maxSchematics = 256 #. #. #Whether placing a Schematic directly in Creative Mode should replace world blocks with Air creativePrintIncludesAir = false #. - #[in KiloBytes] - #The maximum allowed file size of uploaded Schematics. - #Range: > 16 - maxTotalSchematicSize = 256 - #. #[in Bytes] #The maximum packet size uploaded Schematics are split into. #Range: 256 ~ 32767 @@ -421,14 +413,18 @@ #. #Schematicannon [schematics.schematicannon] + #. + #% of Schematicannon's Fuel filled by 1 Gunpowder. + #Range: 0.0 ~ 100.0 + schematicannonGunpowderWorth = 20.0 + #. + #% of Schematicannon's Fuel used for each fired block. + #Range: 0.0 ~ 100.0 + schematicannonFuelUsage = 0.05000000074505806 #. #Amount of game ticks between shots of the cannon. Higher => Slower #Range: > 1 schematicannonDelay = 10 - #. - #Amount of blocks a Schematicannon can print per Gunpowder item provided. - #Range: > 1 - schematicannonShotsPerGunpowder = 400 #. #Equipment and gadgets added by Create diff --git a/server/server/config/enhancedgroups/auto-join-groups.json b/server/server/config/enhancedgroups/auto-join-groups.json index ce3f60c..f1763e2 100644 --- a/server/server/config/enhancedgroups/auto-join-groups.json +++ b/server/server/config/enhancedgroups/auto-join-groups.json @@ -1,4 +1 @@ -{ - "playerGroups": {}, - "globalGroupForced": false -} \ No newline at end of file +{} \ No newline at end of file diff --git a/server/server/config/enhancedgroups/enhancedgroups.properties b/server/server/config/enhancedgroups/enhancedgroups.properties index 74db7d1..3603d85 100644 --- a/server/server/config/enhancedgroups/enhancedgroups.properties +++ b/server/server/config/enhancedgroups/enhancedgroups.properties @@ -1,35 +1,18 @@ -# The default range for the /instantgroup command if no range was provided +# The default range for the instant group command if no range was provided default_instant_group_range=128.0 # The name of the instant group instant_group_name=Instant Group -# The default permission level of the /instantgroup command -# EVERYONE - Every player can use this command -# OPS - Operators can use this command -# NOONE - The command can't be used by anyone +# The default permission type of the instantgroup command instant_group_command_permission_level=EVERYONE -# The default permission level of the /persistentgroup command -# EVERYONE - Every player can use this command -# OPS - Operators can use this command -# NOONE - The command can't be used by anyone +# The default permission type of the persistentgroup command persistent_group_command_permission_level=OPS -# The default permission level of the /autojoingroup command -# EVERYONE - Every player can use this command -# OPS - Operators can use this command -# NOONE - The command can't be used by anyone +# The default permission type of the autojoingroup command auto_join_group_command_permission_type=EVERYONE -# The default permission level of the /autojoingroup global command -# EVERYONE - Every player can use this command -# OPS - Operators can use this command -# NOONE - The command can't be used by anyone -auto_join_group_global_command_permission_type=OPS -# The default permission level of the /forcejoingroup command -# EVERYONE - Every player can use this command -# OPS - Operators can use this command -# NOONE - The command can't be used by anyone +# The default permission type of the forcejoingroup command force_join_group_command_permission_type=OPS -# Determines if a summary of all groups should be shown when a player joins the server +# If a summary of all groups should be shown when a player joins the server group_summary=true -# Forces all groups to be of the given type +# If the group type should be forced to a specific type # OFF - No group type is forced # NORMAL - All groups are forced to be normal groups # OPEN - All groups are forced to be open groups diff --git a/server/server/config/enhancedgroups/persistent-groups.json b/server/server/config/enhancedgroups/persistent-groups.json index 61849b3..3801da0 100644 --- a/server/server/config/enhancedgroups/persistent-groups.json +++ b/server/server/config/enhancedgroups/persistent-groups.json @@ -1,8 +1 @@ -[ - { - "name": "general", - "type": "OPEN", - "hidden": false, - "id": "9c8f061b-56c7-424c-ba80-a14c71781b5f" - } -] \ No newline at end of file +[{"name":"general","type":"OPEN","hidden":false,"id":"9c8f061b-56c7-424c-ba80-a14c71781b5f"}] \ No newline at end of file diff --git a/server/server/config/modernfix-mixins.properties b/server/server/config/modernfix-mixins.properties index b84243a..33117b6 100644 --- a/server/server/config/modernfix-mixins.properties +++ b/server/server/config/modernfix-mixins.properties @@ -14,14 +14,12 @@ # mixin.bugfix.chunk_deadlock=false # (overridden for mod compat) # mixin.bugfix.concurrency=true # (default) # mixin.bugfix.ender_dragon_leak=true # (default) -# mixin.bugfix.missing_block_entities=false # (default) # mixin.bugfix.packet_leak=false # (default) # mixin.bugfix.paper_chunk_patches=false # (overridden for mod compat) # mixin.bugfix.restore_old_dragon_movement=false # (default) # mixin.bugfix.world_leaks=true # (default) # mixin.bugfix.world_screen_skipped=true # (default) # mixin.devenv=false # (default) -# mixin.feature.blockentity_incorrect_thread=false # (default) # mixin.feature.branding=true # (default) # mixin.feature.cause_lag_by_disabling_threads=false # (default) # mixin.feature.direct_stack_trace=false # (default) @@ -29,7 +27,6 @@ # mixin.feature.integrated_server_watchdog=true # (default) # mixin.feature.measure_time=true # (default) # mixin.feature.remove_chat_signing=false # (default) -# mixin.feature.remove_telemetry=true # (default) # mixin.feature.snapshot_easter_egg=true # (default) # mixin.feature.spam_thread_dump=false # (default) # mixin.feature.spark_profile_launch=false # (default) @@ -43,7 +40,6 @@ # mixin.perf.cache_profile_texture_url=true # (default) # mixin.perf.cache_strongholds=false # (overridden for mod compat) # mixin.perf.cache_upgraded_structures=true # (default) -# mixin.perf.chunk_meshing=true # (default) # mixin.perf.clear_fabric_mapping_tables=false # (default) # mixin.perf.clear_mixin_classinfo=false # (default) # mixin.perf.compact_bit_storage=true # (default) @@ -61,7 +57,6 @@ # mixin.perf.faster_structure_location=true # (default) # mixin.perf.faster_texture_stitching=true # (default) # mixin.perf.fix_loop_spin_waiting=true # (default) -# mixin.perf.memoize_creative_tab_build=true # (default) # mixin.perf.model_optimizations=true # (default) # mixin.perf.mojang_registry_size=true # (default) # mixin.perf.nbt_memory_usage=false # (overridden for mod compat) diff --git a/server/server/config/tectonic.json b/server/server/config/tectonic.json index 2434702..bb51280 100644 --- a/server/server/config/tectonic.json +++ b/server/server/config/tectonic.json @@ -1,23 +1,26 @@ { - "enabled": true, - "feature_toggles": { - "desert_dunes": true, - // Moves max height to y640 + "experimental": { + // The increased height setting will change the max Overworld build and generation height to y640. + // The horizontal mountain scale setting will change the thickness of mountain ranges and the spacing between them. + // Lower values = thicker mountain ranges and more space between ranges. 0.15-0.25 is the sweet spot. + // The terrain scale setting will vertically stretch/compress terrain. Higher values = more extreme terrain heights. + "horizontal_mountain_scale": 0.25, "increased_height": false, + "terrain_scale": 1.125 + }, + "features": { + // Enabling deeper oceans will lower vanilla ocean monuments to compensate for lower depth. + // This DOES NOT apply on Forge 1.18-1.20.1. Ocean monuments will remain at their vanilla levels on those versions. + "deeper_oceans": true, + "desert_dunes": true, "lava_rivers": true, - // Offsets ocean monuments 30 blocks down - "monument_offset": true, "underground_rivers": true }, - "snow_start_offset": 128, - "terrain_scales": { - // Vanilla value is -0.22 - "deep_ocean_depth": -0.45, - // Lower values = thicker mountain ranges and more space between ranges - "erosion_scale": 0.25, - // Vanilla value is -0.12 - "ocean_depth": -0.15, - // Higher values = vertically stretched terrain - "vertical_multiplier": 1.125 - } + "legacy": { + // Tectonic v1 worlds have old biome data preventing them from being opened in Tectonic v2.1+. + // Enabling legacy mode will add back the biomes and upgrade worlds to the new format upon opening them. + // Once a world is upgraded by opening it, turn off legacy mode. + "enabled": false + }, + "mod_enabled": true } \ No newline at end of file diff --git a/server/server/config/threadtweak.json b/server/server/config/threadtweak.json index f999c3a..acb25a1 100644 --- a/server/server/config/threadtweak.json +++ b/server/server/config/threadtweak.json @@ -1,13 +1,8 @@ { - "threadCount": { - "bootstrap": 1, - "main": 3 - }, "threadPriority": { "game": 8, - "bootstrap": 1, "main": 4, "io": 7, "integratedServer": 7 } -} \ No newline at end of file +} diff --git a/server/server/config/vmp.properties b/server/server/config/vmp.properties index 3de6b16..c8f7b0d 100644 --- a/server/server/config/vmp.properties +++ b/server/server/config/vmp.properties @@ -1,5 +1,5 @@ #Configuration file for VMP -#Sat Apr 12 14:26:44 GMT 2025 +#Fri Mar 21 22:09:23 GMT 2025 deprecated_precache_biome_lookup=false exp3_use_packet_priority_system=false exp_use_optimized_chunk_ticking_iteration=true diff --git a/server/server/config/voicechat/translations.properties b/server/server/config/voicechat/translations.properties index 49f786e..f32aed2 100644 --- a/server/server/config/voicechat/translations.properties +++ b/server/server/config/voicechat/translations.properties @@ -7,7 +7,7 @@ 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 version is not compatible with the servers 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 message a player gets when trying to execute a command that requires voice chat # 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 diff --git a/server/server/config/voicechat/voicechat-server.properties b/server/server/config/voicechat/voicechat-server.properties index b3372b2..b3b11c7 100644 --- a/server/server/config/voicechat/voicechat-server.properties +++ b/server/server/config/voicechat/voicechat-server.properties @@ -1,53 +1,45 @@ -# Simple Voice Chat server config v1.20.1-2.5.29 +# Simple Voice Chat server config v1.20.1-2.5.19 -# 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! +# The port of the voice chat server +# Setting this to "-1" sets the port to the Minecraft servers port (Not recommended) port=24454 -# 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 '*' +# The IP address to bind the voice chat server on +# Leave empty to use 'server-ip' of server.properties +# To bind to the wildcard address, use '*' bind_address= -# The distance to which the voice can be heard +# The distance to where the voice can be heard max_voice_distance=48.0 # The multiplier of the voice distance when crouching crouch_distance_multiplier=1.0 # The multiplier of the voice distance when whispering whisper_distance_multiplier=0.5 -# The Opus codec -# Valid values are 'VOIP', 'AUDIO', and 'RESTRICTED_LOWDELAY' +# The opus codec +# Possible 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 +# The maximum size in bytes that voice packets are allowed to have mtu_size=1024 -# The frequency at which keep-alive packets are sent (in milliseconds) +# The frequency at which keep alive packets are sent # Setting this to a higher value may result in timeouts keep_alive=1000 # If group chats are allowed enable_groups=true -# The hostname that clients should use to connect to the voice chat +# The host name 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 +# Don't change this value if you don't know what you are doing voice_host= -# If players are allowed to record the voice chat audio +# If players are allowed to record the voice chat allow_recording=true # If spectators are allowed to talk to other players spectator_interaction=false # 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 +# If players without the mod should get kicked from the server force_voice_chat=true -# 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' +# 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 -# The range in which the voice chat should broadcast audio -# A value less than 0 means 'max_voice_distance' +# The range where the voice chat should broadcast audio to +# A value <0 means 'max_voice_distance' broadcast_range=-1.0 -# If the voice chat server should reply to external pings +# If the voice chat server should reply to pings allow_pings=true -# If the mod should load native libraries on dedicated servers -# This is mostly relevant for voice chat addons -use_natives=true diff --git a/server/server/server.properties b/server/server/server.properties index 8e84889..a7c8ab4 100644 --- a/server/server/server.properties +++ b/server/server/server.properties @@ -1,58 +1,68 @@ #Minecraft server properties -#Sat Apr 12 14:27:06 GMT 2025 + +#Game Features +gamemode=survival +force-gamemode=false +difficulty=normal +hardcore=false +pvp=true +simulation-distance=10 +view-distance=10 allow-flight=false allow-nether=true -broadcast-console-to-ops=true -broadcast-rcon-to-ops=true -difficulty=normal -enable-command-block=false -enable-jmx-monitoring=false -enable-query=false -enable-rcon=true -enable-status=true -enforce-secure-profile=false -enforce-whitelist=true -entity-broadcast-range-percentage=100 -force-gamemode=false -function-permission-level=2 -gamemode=survival +spawn-animals=true +spawn-monsters=true +spawn-npcs=true +spawn-protection=0 generate-structures=true generator-settings={} -hardcore=false +enable-command-block=false +entity-broadcast-range-percentage=100 +max-chained-neighbor-updates=1000000 +max-tick-time=60000 +max-world-size=29999984 +#Server Features +enable-status=true hide-online-players=false +online-mode=true +enforce-secure-profile=false +white-list=true +enforce-whitelist=true +require-resource-pack=false +resource-pack= +resource-pack-prompt= +resource-pack-sha1= +max-players=30 +player-idle-timeout=0 +op-permission-level=3 +function-permission-level=2 +broadcast-console-to-ops=true +broadcast-rcon-to-ops=true +motd=\u00A72\u00A7n3.0\u00A7r \u00A76\u00A7lCreate Expansion\u00A7r\u00A7r\nwill be here \u00A7o(soon)\u00A7r in \u00A7kx\u00A7r days + +#Server +server-ip= +server-port=25565 +enable-jmx-monitoring=false +enable-query=false +query.port=25565 +enable-rcon=true +rcon.port=25575 +#password is redacted +rcon.password= +use-native-transport=true +network-compression-threshold=256 +prevent-proxy-connections=false +rate-limit=0 +sync-chunk-writes=true + +#Initialisation initial-disabled-packs= initial-enabled-packs=vanilla level-name=world level-seed= level-type=minecraft\:normal -max-chained-neighbor-updates=1000000 -max-players=30 -max-tick-time=60000 -max-world-size=29999984 -motd=§2§n3.0§r §6§lCreate Expansion§r§r\nwill be here §o(soon)§r in §kx§r days -network-compression-threshold=256 -online-mode=true -op-permission-level=3 -player-idle-timeout=0 -prevent-proxy-connections=false -pvp=true -query.port=25565 -rate-limit=0 -rcon.password= -rcon.port=25575 -require-resource-pack=false -resource-pack= -resource-pack-prompt= -resource-pack-sha1= -server-ip= -server-port=25565 -simulation-distance=10 -spawn-animals=true -spawn-monsters=true -spawn-npcs=true -spawn-protection=0 -sync-chunk-writes=true + +#unknown text-filtering-config= -use-native-transport=true -view-distance=10 -white-list=true +