OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-21 22:36:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Moved Floodgate dump info to one class

Browse source
This commit is contained in:
Tim203 2021-06-08 10:12:52 +02:00
parent 1eef152f43
commit 68cd2eb4f1
No known key found for this signature in database
GPG key ID: 064EE9F5BF7C3EE8
3 changed files with 8 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java
View file

@ -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;
}

6
common/src/main/java/org/geysermc/floodgate/util/FloodgateGitPropertiesHolder.java → common/src/main/java/org/geysermc/floodgate/util/FloodgateInfoHolder.java
View file

@ -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;

7
connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java
View file

@ -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();
}
}