EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Move the update utility setup to it's own method

Browse Source
This commit is contained in:
MattBDev 2019-04-29 15:18:38 -04:00
parent 299fac95fb
commit 9e324762b6
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
View File

@ -1611,6 +1611,30 @@ import java.util.zip.ZipInputStream;
} }
} }
Settings.load(configFile); Settings.load(configFile);
setupUpdateUtility();
//Sets the version information for the settings.yml file
try (InputStream stream = getClass().getResourceAsStream("/plugin.properties")) {
try (BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
String versionString = br.readLine();
String commitString = br.readLine();
String dateString = br.readLine();
this.version = PlotVersion.tryParse(versionString, commitString, dateString);
Settings.DATE =
new Date(100 + version.year, version.month, version.day).toGMTString();
Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
Settings.COMMIT =
"https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
.toHexString(version.hash);
System.out.println("Version is " + this.version);
}
} catch (IOException throwable) {
throwable.printStackTrace();
}
Settings.save(configFile);
config = YamlConfiguration.loadConfiguration(configFile);
}
private void setupUpdateUtility() {
try { try {
copyFile("updater.properties", "config"); copyFile("updater.properties", "config");
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader( try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(
@ -1630,24 +1654,6 @@ import java.util.zip.ZipInputStream;
} catch (final Throwable throwable) { } catch (final Throwable throwable) {
throwable.printStackTrace(); throwable.printStackTrace();
} }
try (InputStream stream = getClass().getResourceAsStream("/plugin.properties");
BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
//java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
String versionString = br.readLine();
String commitString = br.readLine();
String dateString = br.readLine();
//scanner.close();
this.version = PlotVersion.tryParse(versionString, commitString, dateString);
Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
.toHexString(version.hash);
System.out.println("Version is " + this.version);
} catch (IOException throwable) {
throwable.printStackTrace();
}
Settings.save(configFile);
config = YamlConfiguration.loadConfiguration(configFile);
} }
/** /**