From 68cd2eb4f1f66aaafabd02a33a5ed0ad8b07ae24 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Tue, 8 Jun 2021 10:12:52 +0200
Subject: [PATCH] Moved Floodgate dump info to one class

---
 .../floodgate/util/FloodgateConfigHolder.java | 35 -------------------
 ...esHolder.java => FloodgateInfoHolder.java} |  6 +++-
 .../org/geysermc/connector/dump/DumpInfo.java |  7 ++--
 3 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100644 common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java
 rename common/src/main/java/org/geysermc/floodgate/util/{FloodgateGitPropertiesHolder.java => FloodgateInfoHolder.java} (93%)

diff --git a/common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java b/common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java
deleted file mode 100644
index d33840bb4..000000000
--- a/common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @author GeyserMC
- * @link https://github.com/GeyserMC/Geyser
- */
-
-package org.geysermc.floodgate.util;
-
-import lombok.Getter;
-import lombok.Setter;
-
-public final class FloodgateConfigHolder {
-    @Getter
-    @Setter
-    private static Object config;
-}
diff --git a/common/src/main/java/org/geysermc/floodgate/util/FloodgateGitPropertiesHolder.java b/common/src/main/java/org/geysermc/floodgate/util/FloodgateInfoHolder.java
similarity index 93%
rename from common/src/main/java/org/geysermc/floodgate/util/FloodgateGitPropertiesHolder.java
rename to common/src/main/java/org/geysermc/floodgate/util/FloodgateInfoHolder.java
index 5f157aceb..c7a681f9d 100644
--- a/common/src/main/java/org/geysermc/floodgate/util/FloodgateGitPropertiesHolder.java
+++ b/common/src/main/java/org/geysermc/floodgate/util/FloodgateInfoHolder.java
@@ -27,9 +27,13 @@ package org.geysermc.floodgate.util;
 
 import lombok.Getter;
 import lombok.Setter;
+
 import java.util.Properties;
 
-public class FloodgateGitPropertiesHolder {
+public final class FloodgateInfoHolder {
+    @Getter
+    @Setter
+    private static Object config;
     @Getter
     @Setter
     private static Properties gitProperties;
diff --git a/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java b/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java
index f83598469..fee4ac7a4 100644
--- a/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java
+++ b/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java
@@ -42,8 +42,7 @@ import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.utils.DockerCheck;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.floodgate.util.DeviceOs;
-import org.geysermc.floodgate.util.FloodgateConfigHolder;
-import org.geysermc.floodgate.util.FloodgateGitPropertiesHolder;
+import org.geysermc.floodgate.util.FloodgateInfoHolder;
 
 import java.io.File;
 import java.io.IOException;
@@ -184,8 +183,8 @@ public class DumpInfo {
         private final Object config;
 
         Floodgate() {
-            this.gitInfo = FloodgateGitPropertiesHolder.getGitProperties();
-            this.config = FloodgateConfigHolder.getConfig();
+            this.gitInfo = FloodgateInfoHolder.getGitProperties();
+            this.config = FloodgateInfoHolder.getConfig();
         }
     }