From 9f4580a9220ddc16ba17fad2a9533574fa31b25e Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L de Mello" Date: Mon, 1 Jun 2026 15:08:17 -0300 Subject: [PATCH] fix(services,minecraft-servers): bedrock connection end of stream --- secrets.yaml | 6 +++--- services/minecraft-servers.nix | 26 ++++++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/secrets.yaml b/secrets.yaml index af5f95e..68ee57a 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -19,7 +19,7 @@ services: discord-webhook: ENC[AES256_GCM,data:IuelRGTjNLpZxAFFdRQEO9fx/qaN64tPIqWAKIRmCpgxSwpzXaEPXMF8SIrtLUEY868ngT1RfHTvqDpPMO25TFzIw9nTWr9DM45+ZWzxEKwRMy1PzLzrUdSZNQI3Kc5mKPrGg/avPO+z2VoeAZLBEY8Z2WC6eBd7eg==,iv:FI1NmXLMrOvLDpH/T487irbTf4Aa9b9aN7pOb7jyfyY=,tag:gySiKEEpwtfOdKLaO5wPAw==,type:str] playit-secret: ENC[AES256_GCM,data:dXy11fLDMTYg+aeoHOVVsNxXHry5OvKixWwtF/FWQULQ/KyOH8eshVznSXBazx3MFTO0qm6c5jJecGiN/0Ry0WdtRqzZ7mFqjMnpTck7xDU=,iv:y9PAcD86PlnK8mxjMAS1FMBNW3ZT8uLAFPnxxUaEgm4=,tag:NtnVnknzWDwqzg+4hC65UQ==,type:str] proxy-allowed-users: ENC[AES256_GCM,data:VhNcS+EkTjzXKoCP1lQXapM=,iv:WMHoiLM62nQdl8KovnSNK9qlpuB192qa5hY8ruGYyN8=,tag:qXjmfcQO4ESyhyEpkobaXA==,type:str] - proxy-geyser-config: ENC[AES256_GCM,data:AzpwESSBL001YF4NuoyihOVpEh9SxzrbO0lwD3gD5vsUbt9yTrfvUNGea4uOVu8y5co8ykbwUrqJo1Y2x/iq0ix3pgoKnPMmvkC0Wz+HVqU8bKGxlf5/bVaehaTln5rrLB8mo+zAjgJKlAywsN+VM2hdGMD/9Gs01lTT2vYr5FvPpVVOBxTQ,iv:hMv2a0FpjS5bFFaDUMLacGJihRcWTopiCSi7uvDovbU=,tag:v8uirKfDDgE8hblzCtPhJg==,type:str] + proxy-geyser-config: ENC[AES256_GCM,data:ANzK1c0lYAVTcqwrb5JgDGyHvgMXoBYOH4AX21v3jGaNSNlkGMVitDUFip2QUnQRItKwsuVdsbLlfVQ0MzVbzrC9oc5BQkU1gCCuwBWoRW5IgNbmvuSQcfLEQzn5OPozPb9+cRF8ZvxrQ2oqJ2VzhHw/v3z7tMmcdzH83E1K0Db7cwvN08Aybb402NZad/dQsGFzyAnYdrHyhW+TXVp1LgBNuNv3jpdY2brM5W39neWM6MaSJEkgHQ2iYi7xtRYuhWFuWtwJm/0doqbXns13CTPyShKnchvOudCGwwVplS90p8jWPnNNth2q2lFHHeYGcS+0VSTaygqlQrXENbiWOlC4lbv3LenlQca5YmwFau6dx5GxNNnyA6K66NWsaM7y2uz8lY7BE9hT0ovj0iFVJsDaSNYU6zHsp+PJeALm70WNE+yBvA3mdi0d6spIlMDpOYk+vvhJoKOT/CLZ4pZHDFIM7ZSlk6Vg6mbshmFJmXhBmcM5JJgVbM0Jxan/F83J+jWtvBPApGi3pUIqb8WcVsp5krzHBbFQhHCzi7OqVSG9EdzDjDCkPz2SGSSfDOzuzh5ZN4i9ZTCUDiYlZxSJXC2krVS69Wgv9ho8WR2Khu/bOC4LkX/1uHM/yBR9XA+RGT6t07jD4LNQs6dcxGGAeI4Q23beCL1Y/5j6N2DQeET9S5cmslfoojOmO3FEeEjpOWeOVZCyxTI9sBnK3LY4EfCTtR3fNjgfNaYpIAgz6Ge0N6ZQCBl25iujnA==,iv:XRwqD9/6JOYdKHbEBwVd7LSM6R6B5D1eXexejaOO7+k=,tag:TAqpeGVEgzvmEUqwg5Bi7A==,type:str] proxy-voicechat-properties: ENC[AES256_GCM,data:gb7CLWCKHLATMyJTlBDe4wrFzLbpTjX11dUP/WXZ1ONt9nuegLI6rNrnv2LbjcvNOkXJn4KnUsWNB8xrSt0+1/Jr3JAqKNSxuqA=,iv:EgYSq4/B1U95zQ/TCXOCij7gmO84GdTId4rwzaufl/0=,tag:C4RqylO5J4qlDqNf+07PCg==,type:str] proxy-secret: ENC[AES256_GCM,data:K5GMlzDMD31YKjrJ,iv:1jSAFuPri5DS7foMBSw0rzXimmg3IPN6JXm0WVXqNwI=,tag:X1InctFVT53Ne/b23crnTg==,type:str] favelasmp-ops: ENC[AES256_GCM,data:dLS7S0MlilX2RKmEPcJkzoyANgAp19zPtGCqAO1w2E6sJyqz4+pEY6BddVBH4hh3bfm42j5Uh78wlJR3oXu3jwz5yJnBlTM+JhK0Q7DO+nYx/3vNqg4ZFe88Pme/FDp7xrRr2zJC4WOt20LvmjfGIoy68vsxiD2h4A9Z96ER6IUbm0HaxngET70MGSaN3V/GB9kl8fB2ZrYm6wMixiCXOokXqNSizifgXEPfrYwnUbLwVjL0kELP4T7wlkr8HGMZjT2qdosyk5uFySNM20gU5s4gh0rah+OsVYqzE3nZt+Qgrau/zwBQCgIIGrsN+t6HQ2SIcuPbQZOq3bpofY0TpqMItCQVVJfHiE5J9Md5kklBEZn97ylNqLiGd3zPOPikha8AWqhLw4Q0dB52kKCLmf5VTxf5dZ9QkN6iyCuSGHLcMX+6GLKezemQ2l+qkRvEYBTGM3fcO+Ey9oo8UgOzb5MUrwAV+gqWuJ5am9QX843M4gV3IpMGFBa9RfDUF+CghnBlAzk893F0hjWeMoMxazVxMA==,iv:RDHHOYnHLLEY5ouqVsQhd/tnS3ZuU+HD0IXNOC4uoko=,tag:P3i88sKHPsaADsZcnHRMvQ==,type:str] @@ -45,7 +45,7 @@ sops: TUIyZG5rVC9PM21RR1ZtaXhKUytyL2sKH49RFJJi94RFtbyJMYM2oLETQ3sgpXkJ BFyQJClKlbE5In6XnvJ0PjXForr8tYFIZ2YG7/Y2jf/hXMtIHO/02g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-05-28T01:38:59Z" - mac: ENC[AES256_GCM,data:/8kA+mpqP+TzwLqIZuaw1yecor+FmIiz9Bm/XwU9PnTB2v4fQxNGCNFiP5+qBZxkj7dXbFpafAaI4/9JSGAIsdJNJe1vRypeklzLbwzdCpPV86ixlhAadOTibq/MAST56R7y2Y0GnBq7lUj0VK/MNrHbG4l58IuJohjYhpEn64k=,iv:bErVayfaKfokxBCSExX+BVLKcptoxIb4C/RhAEqdmno=,tag:jzxLzFahft5ANGlklSOlsQ==,type:str] + lastmodified: "2026-06-01T18:05:27Z" + mac: ENC[AES256_GCM,data:dRiaJuSV+UehACve0xYIkgzyxHSYPbhiBmUHxbJ5yRBpa3GeTsPxa+BnBIbT0YSa651UThadPEE9fGQJekMzFiZ3O/1pvE1alHiMRBPzOB6UeDapGa0snlCeNVF6ktKhFT6cJDsjqmX6s2Wie0icTXSwHhTjuA6BsxjozbYyZz4=,iv:mLY90TSW9SoLt4mCaRjl7P5MPbaWPcmgYclQGTvHYNY=,tag:mGW14OWgBX//UeUrglM0Hg==,type:str] unencrypted_suffix: _unencrypted version: 3.12.1 diff --git a/services/minecraft-servers.nix b/services/minecraft-servers.nix index 6b66e92..2085fd4 100644 --- a/services/minecraft-servers.nix +++ b/services/minecraft-servers.nix @@ -83,17 +83,10 @@ in { url = "https://cdn.modrinth.com/data/wKkoqHrH/versions/8L4eozIR/Geyser-Velocity.jar"; sha512 = "3e8385e7bcde82f8e75c980b94f18188adf84847aefaded02918f5c9c9a93a12399977442ebbb231205ebb9ad627261b1b7a4b23e92777d4c27062091f592900"; }; - "plugins/Geyser-Velocity/config.yml" = - config.sops.secrets."services/minecraft/proxy-geyser-config".path; "plugins/floodgate-velocity.jar" = pkgs.fetchurl { url = "https://download.geysermc.org/v2/projects/floodgate/versions/2.2.5/builds/132/downloads/velocity"; hash = "sha256-8liZUEOkhpy28e9gURCsHZBmpbHhsxZJWiWwavoMEGA="; }; - "plugins/floodgate/config.yml".value = - cfg.servers."favelasmp".files."config/floodgate/config.yml".value - // { - send-floodgate-data = true; - }; "plugins/ViaVersion-5.9.2-SNAPSHOT.jar" = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/P1OZGk5p/versions/LXloXgE7/ViaVersion-5.9.2-SNAPSHOT.jar"; sha512 = "55f6095de22481a0230e1cc419f333349156322924b9d5476cb4d4becc919cc6c522312ad325906a7e724fe45d68dee4cb938622285cf6d9ba5645e486f0b3ea"; @@ -110,6 +103,15 @@ in { url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/5SU8XYFw/voicechat-velocity-2.6.13.jar"; sha512 = "1096d733949b5743ba4af83fd8648caa738ebbeeb9427427f46949c7f33f812aeb914422268f96a1f4c5cccd9e9187426015db6ea000c472a71d237555c17e28"; }; + }; + files = { + "plugins/Geyser-Velocity/config.yml" = + config.sops.secrets."services/minecraft/proxy-geyser-config".path; + "plugins/floodgate/config.yml".value = + cfg.servers."favelasmp".files."config/floodgate/config.yml".value + // { + send-floodgate-data = true; + }; "plugins/voicechat/voicechat-proxy.properties" = config.sops.secrets."services/minecraft/proxy-voicechat-properties".path; }; @@ -169,6 +171,10 @@ in { symlinks = collectFilesAt modpack "mods" // { + "whitelist.json" = + config.sops.secrets."services/minecraft/favelasmp-whitelist".path; + "ops.json" = + config.sops.secrets."services/minecraft/favelasmp-ops".path; "mods/bluemap-5.20-fabric.jar" = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/swbUV1cr/versions/D9j76thC/bluemap-5.20-fabric.jar"; sha512 = "b140390c505655491130f74653fc0e9cd9501f35f001c174965c13bccf45bb91900c4ed439ecdb8d824723fb57688a20ce37582b7b3a4a04623af09854f6fb2d"; @@ -229,10 +235,6 @@ in { in collectFilesAt modpack "config" // { - "whitelist.json" = - config.sops.secrets."services/minecraft/favelasmp-whitelist".path; - "ops.json" = - config.sops.secrets."services/minecraft/favelasmp-ops".path; "config/bluemap/core.conf" = { format = pkgs.formats.keyValue {}; value = { @@ -320,7 +322,7 @@ in { }; }; - networking.firewall.allowedUDPPorts = [24454 24455]; + networking.firewall.allowedUDPPorts = [24454 24455 19132 30066]; systemd.services = let tellraw = c: t: ''/tellraw @a ["",{"text":"\n"},{"text":"","bold":true,"color":"gold"},{"text":" O servidor irá reiniciar em "},{"text":"${t}","bold":true,"color":"${c}"},{"text":".\n "}]'';