GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-29 03:39:22 +00:00
Code Issues Releases Activity

Make Geyser dumps backwards compatible

Browse Source
This commit is contained in:
Camotoy
2022-09-11 19:26:22 -04:00
parent 25f43f3152
commit 2d7a463089
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View File

@@ -116,6 +116,8 @@ public class GeyserImpl implements GeyserApi {
public static final String BUILD_NUMBER = "${buildNumber}";
public static final String BRANCH = "${branch}";
public static final String COMMIT = "${commit}";
public static final String REPOSITORY = "${repository}";
/**
* Oauth client ID for Microsoft authentication

11
core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
View File

@@ -26,6 +26,7 @@
package org.geysermc.geyser.dump;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteSource;
@@ -50,7 +51,6 @@ import org.geysermc.geyser.util.WebUtils;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -89,7 +89,7 @@ public class DumpInfo {
this.systemLocale = Locale.getDefault();
this.systemEncoding = System.getProperty("file.encoding");
this.gitInfo = new GitInfo(GeyserImpl.VERSION, GeyserImpl.BUILD_NUMBER, GeyserImpl.GIT_VERSION, GeyserImpl.BRANCH);
this.gitInfo = new GitInfo(GeyserImpl.BUILD_NUMBER, GeyserImpl.COMMIT.substring(0, 7), GeyserImpl.COMMIT, GeyserImpl.BRANCH, GeyserImpl.REPOSITORY);
this.config = GeyserImpl.getInstance().getConfig();
this.floodgate = new Floodgate();
@@ -300,9 +300,14 @@ public class DumpInfo {
@Getter
@AllArgsConstructor
public static class GitInfo {
private final String version;
private final String buildNumber;
@JsonProperty("git.commit.id.abbrev")
private final String commitHashAbbrev;
@JsonProperty("git.commit.id")
private final String commitHash;
@JsonProperty("git.branch")
private final String branchName;
@JsonProperty("git.remote.origin.url")
private final String originUrl;
}
}