wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ModGitInfo crashing on release MC

Browse Source 
It won't show the commits or branches, but it won't crash either
This commit is contained in:
James Seibel
2023-08-14 07:30:41 -05:00
parent 2914ddd121
commit 56959094ae
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/jar/ModGitInfo.java
+32 -10
View File
@@ -3,6 +3,8 @@ package com.seibel.distanthorizons.core.jar;
import com.electronwill.nightconfig.core.Config;
import com.electronwill.nightconfig.core.io.ParsingMode;
import com.electronwill.nightconfig.json.JsonFormat;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* Get info on the git for the mod <br>
@@ -10,17 +12,37 @@ import com.electronwill.nightconfig.json.JsonFormat;
*
* @author coolGi
*/
public final class ModGitInfo {
static {
// Warning: Atm, this file is in the common subproject as the processResources task in gradle doesnt work for core
String s = JarUtils.convertInputStreamToString(JarUtils.accessFile("build_info.json"));
public final class ModGitInfo
{
private static final Logger LOGGER = LogManager.getLogger();
private static final String FILE_NAME = "build_info.json";
static
{
String gitMainCommit = "UNKNOWN";
String gitMainBranch = "UNKNOWN";
String gitCoreCommit = "UNKNOWN";
try
{
// Warning: Atm, this file is in the common subproject as the processResources task in gradle doesn't work for core
String jsonString = JarUtils.convertInputStreamToString(JarUtils.accessFile(FILE_NAME));
Config jsonObject = Config.inMemory();
JsonFormat.minimalInstance().createParser().parse(jsonString, jsonObject, ParsingMode.REPLACE);
gitMainCommit = jsonObject.get("git_main_commit");
gitMainBranch = jsonObject.get("git_core_commit");
gitCoreCommit = jsonObject.get("git_main_branch");
}
catch (Exception | Error e)
{
LOGGER.warn("Unable to get the Git information from "+FILE_NAME);
}
Config jsonObject = Config.inMemory();
JsonFormat.minimalInstance().createParser().parse(s, jsonObject, ParsingMode.REPLACE);
Git_Main_Commit = jsonObject.get("git_main_commit");
Git_Core_Commit = jsonObject.get("git_core_commit");
Git_Main_Branch = jsonObject.get("git_main_branch");
Git_Main_Commit = gitMainCommit;
Git_Core_Commit = gitMainBranch;
Git_Main_Branch = gitCoreCommit;
}
public static final String Git_Main_Commit;