OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-01 20:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix dumps

Browse source
This commit is contained in:
RednedEpic 2022-09-04 16:35:50 -05:00
parent 896bf7c218
commit 770dfca328
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
View file

@ -70,7 +70,7 @@ public class DumpInfo {
private final String cpuName; private final String cpuName;
private final Locale systemLocale; private final Locale systemLocale;
private final String systemEncoding; private final String systemEncoding;
private Properties gitInfo; private final GitInfo gitInfo;
private final GeyserConfiguration config; private final GeyserConfiguration config;
private final Floodgate floodgate; private final Floodgate floodgate;
private final Object2IntMap<DeviceOs> userPlatforms; private final Object2IntMap<DeviceOs> userPlatforms;
@ -89,11 +89,7 @@ public class DumpInfo {
this.systemLocale = Locale.getDefault(); this.systemLocale = Locale.getDefault();
this.systemEncoding = System.getProperty("file.encoding"); this.systemEncoding = System.getProperty("file.encoding");
try (InputStream stream = GeyserImpl.getInstance().getBootstrap().getResource("git.properties")) { this.gitInfo = new GitInfo(GeyserImpl.VERSION, GeyserImpl.BUILD_NUMBER, GeyserImpl.GIT_VERSION, GeyserImpl.BRANCH);
this.gitInfo = new Properties();
this.gitInfo.load(stream);
} catch (IOException ignored) {
}
this.config = GeyserImpl.getInstance().getConfig(); this.config = GeyserImpl.getInstance().getConfig();
this.floodgate = new Floodgate(); this.floodgate = new Floodgate();
@ -300,4 +296,13 @@ public class DumpInfo {
public String main; public String main;
public List<String> authors; public List<String> authors;
} }
@Getter
@AllArgsConstructor
public static class GitInfo {
private final String version;
private final String buildNumber;
private final String commitHash;
private final String branchName;
}
} }