From 54c43f2b022f1be1fdd6bda2c3603372369c8c3c Mon Sep 17 00:00:00 2001
From: Konicai <71294714+Konicai@users.noreply.github.com>
Date: Tue, 6 Aug 2024 18:36:34 -0500
Subject: [PATCH 1/3] Suppress address in bind log if it is 0.0.0.0 (#4160)

Co-authored-by: onebeastchris <github@onechris.mozmail.com>
---
 .../main/java/org/geysermc/geyser/GeyserImpl.java | 15 ++++++++++-----
 core/src/main/resources/languages                 |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
index 5c08e34d7..8febf4d21 100644
--- a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
+++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
@@ -432,13 +432,18 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
         this.geyserServer = new GeyserServer(this, bedrockThreadCount);
         this.geyserServer.bind(new InetSocketAddress(config.getBedrock().address(), config.getBedrock().port()))
             .whenComplete((avoid, throwable) -> {
+                String address = config.getBedrock().address();
+                String port = String.valueOf(config.getBedrock().port()); // otherwise we get commas
+
                 if (throwable == null) {
-                    logger.info(GeyserLocale.getLocaleStringLog("geyser.core.start", config.getBedrock().address(),
-                            String.valueOf(config.getBedrock().port())));
+                    if ("0.0.0.0".equals(address)) {
+                        // basically just hide it in the log because some people get confused and try to change it
+                        logger.info(GeyserLocale.getLocaleStringLog("geyser.core.start.ip_suppressed", port));
+                    } else {
+                        logger.info(GeyserLocale.getLocaleStringLog("geyser.core.start", address, port));
+                    }
                 } else {
-                    String address = config.getBedrock().address();
-                    int port = config.getBedrock().port();
-                    logger.severe(GeyserLocale.getLocaleStringLog("geyser.core.fail", address, String.valueOf(port)));
+                    logger.severe(GeyserLocale.getLocaleStringLog("geyser.core.fail", address, port));
                     if (!"0.0.0.0".equals(address)) {
                         logger.info(Component.text("Suggestion: try setting `address` under `bedrock` in the Geyser config back to 0.0.0.0", NamedTextColor.GREEN));
                         logger.info(Component.text("Then, restart this server.", NamedTextColor.GREEN));
diff --git a/core/src/main/resources/languages b/core/src/main/resources/languages
index 60b20023a..a943a1bb9 160000
--- a/core/src/main/resources/languages
+++ b/core/src/main/resources/languages
@@ -1 +1 @@
-Subproject commit 60b20023a92f084aba895ab0336e70fa7fb311fb
+Subproject commit a943a1bb910f58caa61f14bafacbc622bd48a694

From 069d35c6422a05a74f960d2fdb5d2788823ff722 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:08:27 -0400
Subject: [PATCH 2/3] Likely fix for #2573

Tested working on Paper 1.21
---
 .../translator/protocol/java/JavaCommandsTranslator.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
index 4c817ba01..01da23809 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
@@ -76,6 +76,9 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
         @Override
         public int hashCode(BedrockCommandInfo o) {
             int paramHash = Arrays.deepHashCode(o.paramData());
+            if ("help".equals(o.name())) {
+                paramHash = 31 * paramHash + 1;
+            }
             return 31 * paramHash + o.description().hashCode();
         }
 
@@ -83,6 +86,11 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
         public boolean equals(BedrockCommandInfo a, BedrockCommandInfo b) {
             if (a == b) return true;
             if (a == null || b == null) return false;
+            if ("help".equals(a.name()) && !"help".equals(b.name())) {
+                // Merging this causes Bedrock to fallback to its own help command
+                // https://github.com/GeyserMC/Geyser/issues/2573
+                return false;
+            }
             if (!a.description().equals(b.description())) return false;
             if (a.paramData().length != b.paramData().length) return false;
             for (int i = 0; i < a.paramData().length; i++) {

From 8d1e9e95ef89e12b05fdb8fdb7561c1fecf2a0c4 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:09:01 -0400
Subject: [PATCH 3/3] New files for .gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a44afd242..aff61aa60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -249,6 +249,8 @@ locales/
 /packs/
 /dump.json
 /saved-refresh-tokens.json
+/saved-auth-chains.json
 /custom_mappings/
 /languages/
-/custom-skulls.yml
\ No newline at end of file
+/custom-skulls.yml
+/permissions.yml