Move multiversion materials setup to before Conf setup

This commit is contained in:
ProSavage 2018-08-20 09:16:53 -05:00
parent 124cd4f8ac
commit 8b90eb97c4

View File

@ -109,12 +109,28 @@ public class P extends MPlugin {
@Override @Override
public void onEnable() { public void onEnable() {
log("==== Setup ====");
int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
if (version == 7) {
P.p.log("Minecraft Version 1.7 found, disabling banners, itemflags inside GUIs, and Titles.");
mc17 = true;
} else if (version == 8) {
P.p.log("Minecraft Version 1.8 found, Title Fadeouttime etc will not be configurable.");
mc18 = true;
} else if (version == 13) {
P.p.log("Minecraft Version 1.13 found, New Items will be used.");
mc113 = true;
changeItemIDSInConfig();
}
setupMultiversionMaterials();
log("==== End Setup ====");
if (!preEnable()) { if (!preEnable()) {
return; return;
} }
this.loadSuccessful = false; this.loadSuccessful = false;
saveDefaultConfig(); saveDefaultConfig();
setupMultiversionMaterials();
// Load Conf from disk // Load Conf from disk
Conf.load(); Conf.load();
Essentials.setup(); Essentials.setup();
@ -157,18 +173,7 @@ public class P extends MPlugin {
MassiveStats massive = new MassiveStats(this); MassiveStats massive = new MassiveStats(this);
int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
if (version == 7) {
P.p.log("Minecraft Version 1.7 found, disabling banners, itemflags inside GUIs, and Titles.");
mc17 = true;
} else if (version == 8) {
P.p.log("Minecraft Version 1.8 found, Title Fadeouttime etc will not be configurable.");
mc18 = true;
} else if (version == 13) {
P.p.log("Minecraft Version 1.13 found, New Items will be used.");
mc113 = true;
changeItemIDSInConfig();
}
if (version > 8) { if (version > 8) {
useNonPacketParticles = true; useNonPacketParticles = true;