Merge remote-tracking branch 'refs/remotes/origin/server'

# Conflicts:
#	pack.toml

.packwizignore

@@ -21,3 +21,6 @@ git
 
 # Exclude GitHub workflows
 .github/
+
+# Ignore music on the server
+music/

config/apugli.json

@@ -0,0 +1,6 @@
+{
+  "fileSizeLimit": "1MB",
+  "fileConnectionTimeout": 30000,
+  "resetTimerTicks": 100,
+  "performVersionCheck": false
+}

config/extended_drawers.json

@@ -0,0 +1,39 @@
+{
+  "client": {
+    "displayEmptyCount": false,
+    "layout": {
+      "smallTextScale": 0.5,
+      "largeTextScale": 1.0,
+      "textOffset": 0.8,
+      "smallItemScale": 0.4,
+      "largeItemScale": 1.0
+    },
+    "icons": {
+      "lockedIcon": "extended_drawers:item/lock",
+      "voidingIcon": "minecraft:item/lava_bucket",
+      "hiddenIcon": "minecraft:item/black_dye",
+      "dupingIcon": "extended_drawers:item/dupe_wand"
+    },
+    "itemRenderDistance": 64,
+    "iconRenderDistance": 16,
+    "textRenderDistance": 32
+  },
+  "storage": {
+    "t1UpgradeMultiplier": 2,
+    "t2UpgradeMultiplier": 4,
+    "t3UpgradeMultiplier": 8,
+    "t4UpgradeMultiplier": 16,
+    "drawerCapacity": 1024,
+    "compactingCapacity": 1024,
+    "stackSizeAffectsCapacity": false,
+    "slotCountAffectsCapacity": true
+  },
+  "misc": {
+    "blockUpgradeRemovalsWithOverflow": true,
+    "allowRecursion": true,
+    "drawersDropContentsOnBreak": false,
+    "insertAllTime": 10,
+    "frontBreakingBehaviour": "mine",
+    "sideBreakingBehaviour": "break"
+  }
+}

config/lithium.properties

@@ -7,4 +7,5 @@
 #
 # By default, this file will be empty except for this notice.
 
-mixin.world.block_entity_ticking.sleeping.campfire=false
+mixin.world.block_entity_ticking.sleeping.campfire=false
+mixin.util.block_tracking=false

config/origins_server.json

@@ -0,0 +1,170 @@
+{
+  "performVersionCheck": false,
+  "origins": {
+    "origins-classes:nitwit": {
+      "enabled": true
+    },
+    "origins:enderian": {
+      "enabled": true
+    },
+    "origins:feline": {
+      "enabled": true
+    },
+    "origins:elytrian": {
+      "enabled": true
+    },
+    "toomanyorigins:hare": {
+      "enabled": true,
+      "toomanyorigins:hot_hops": true,
+      "toomanyorigins:superfall": true,
+      "origins:fragile": true,
+      "origins:vegetarian": true,
+      "toomanyorigins:drenchable_fur": true,
+      "toomanyorigins:waterskipper": true,
+      "toomanyorigins:small_appetite": true,
+      "toomanyorigins:extra_step_height": true,
+      "toomanyorigins:prevent_movement_checks": true,
+      "toomanyorigins:cancel_out_sprint_disable_on_hit": true,
+      "origins_bc23:reset_minus_upon_chosen": true
+    },
+    "origins_minus:voidthing": {
+      "enabled": true,
+      "origins_minus:blink": true,
+      "origins_minus:reach": true,
+      "origins_minus:wraparound": true,
+      "origins:ender_particles": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "origins_minus:avian": {
+      "enabled": true,
+      "origins_minus:flap": true,
+      "origins_minus:glide": true,
+      "origins_minus:like_air": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "origins:phantom": {
+      "enabled": true
+    },
+    "origins:blazeborn": {
+      "enabled": true
+    },
+    "origins:avian": {
+      "enabled": true
+    },
+    "origins_minus:wildling": {
+      "enabled": true,
+      "origins_minus:energetic": true,
+      "origins_minus:bound": true,
+      "origins_minus:fall_immunity": true,
+      "origins_minus:bounce": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "toomanyorigins:withered": {
+      "enabled": true,
+      "toomanyorigins:affliction": true,
+      "toomanyorigins:drainage": true,
+      "origins:nether_spawn": true,
+      "toomanyorigins:hell_raised": true,
+      "toomanyorigins:spirit_strider": true,
+      "toomanyorigins:deathly_digestion": true,
+      "toomanyorigins:unholy": true,
+      "toomanyorigins:soul_siphon": true
+    },
+    "toomanyorigins:hisskin": {
+      "enabled": true,
+      "toomanyorigins:buildup": true,
+      "toomanyorigins:aerial_stability": true,
+      "toomanyorigins:stubby_legs": true,
+      "toomanyorigins:conductive": true,
+      "toomanyorigins:ailurophobia": true,
+      "toomanyorigins:redirect_lightning_chance": true
+    },
+    "origins:human": {
+      "enabled": true
+    },
+    "origins_minus:mer": {
+      "enabled": true,
+      "origins_minus:water_breathing": true,
+      "origins_minus:swim_speed": true,
+      "origins_minus:water_vision": true,
+      "origins_minus:aqua_affinity": true,
+      "origins_minus:harvest_seagrass": true,
+      "origins_minus:edible_seagrass": true,
+      "origins:like_water": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "origins_minus:dryad": {
+      "enabled": true,
+      "origins_minus:sunlight": true,
+      "origins_minus:no_hunger": true,
+      "origins_minus:vine_whip": true,
+      "origins_minus:bioluminescence": true,
+      "origins_minus:leaf_phasing": true,
+      "origins_minus:plant_fall_resistance": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "toomanyorigins:swarm": {
+      "enabled": true,
+      "toomanyorigins:hover": true,
+      "toomanyorigins:pollination": true,
+      "toomanyorigins:calming_aura": true,
+      "toomanyorigins:stinging_pains": true,
+      "toomanyorigins:unity": true,
+      "toomanyorigins:beekeeper": true,
+      "origins:arthropod": true
+    },
+    "origins:shulk": {
+      "enabled": true
+    },
+    "toomanyorigins:dragonborn": {
+      "enabled": true,
+      "toomanyorigins:draconic_breath": true,
+      "toomanyorigins:block_synergistics": true,
+      "toomanyorigins:weaponry_pride": true,
+      "toomanyorigins:zenith_scales": true,
+      "toomanyorigins:rough_claws": true
+    },
+    "origins_minus:sanguine": {
+      "enabled": true,
+      "origins_minus:blood": true,
+      "origins_minus:no_hunger": true,
+      "origins_minus:frenzy": true,
+      "origins_minus:nightstalker": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "origins:merling": {
+      "enabled": true
+    },
+    "origins:arachnid": {
+      "enabled": true
+    },
+    "origins_minus:steadfast": {
+      "enabled": true,
+      "origins_minus:brace": true,
+      "origins_minus:rescue": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "origins_minus:hellspawn": {
+      "enabled": true,
+      "origins_minus:fire_immunity": true,
+      "origins_minus:lava_vision": true,
+      "origins_minus:lava_swimming": true,
+      "origins_minus:fire_punch": true,
+      "origins_minus:lava_fall_immunity": true,
+      "origins:flame_particles": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "origins_minus:weaver": {
+      "enabled": true,
+      "origins_minus:echolocation": true,
+      "origins_minus:rappel": true,
+      "origins_minus:suffocation_immunity": true,
+      "origins_minus:web_affinity": true,
+      "origins:master_of_webs_no_slowdown": true,
+      "origins_bc23:reset_tmo_upon_chosen": true
+    },
+    "origins_bc23:tmo_no_origin": {
+      "enabled": true
+    }
+  }
+}

config/servercore.toml

@@ -0,0 +1,14 @@
+# Lets you enable / disable certain features and modify them.
+[features]
+	# (Default = false) Makes villagers tick less often if they are stuck in a 1x1 space.
+	lobotomize_villagers = true
+	# (Default = 0.5) Decides the radius in blocks that items / xp will merge at.
+	item_merge_radius = 0.75
+	xp_merge_radius = 1.0
+
+# Allows you to toggle specific optimizations that don't have full vanilla parity.
+# These settings will only take effect after server restarts.
+[optimizations]
+	# (Default = false) Can significantly reduce time spent on mobspawning, but isn't as accurate as vanilla on biome borders.
+	# This may cause mobs from another biome to spawn a few blocks across a biome border (this does not affect structure spawning!).
+	fast_biome_lookups = true

config/threadtweak.json

@@ -0,0 +1,8 @@
+{
+  "threadPriority": {
+    "game": 8,
+    "main": 3,
+    "io": 4,
+    "integratedServer": 8
+  }
+}

config/toomanyorigins.json

@@ -0,0 +1,3 @@
+{
+  "performVersionCheck": false
+}

config/vmp.properties

@@ -1,2 +1,3 @@
 # Configuration file for VMP
-show_async_loading_messages=false
+show_async_loading_messages=false
+use_multiple_netty_event_loops=false