|
@@ -29,11 +29,11 @@ import com.gmail.nossr50.listeners.InventoryListener;
|
|
import com.gmail.nossr50.listeners.PlayerListener;
|
|
import com.gmail.nossr50.listeners.PlayerListener;
|
|
import com.gmail.nossr50.listeners.SelfListener;
|
|
import com.gmail.nossr50.listeners.SelfListener;
|
|
import com.gmail.nossr50.listeners.WorldListener;
|
|
import com.gmail.nossr50.listeners.WorldListener;
|
|
-import com.gmail.nossr50.locale.LocaleLoader;
|
|
|
|
import com.gmail.nossr50.metrics.MetricsManager;
|
|
import com.gmail.nossr50.metrics.MetricsManager;
|
|
import com.gmail.nossr50.party.PartyManager;
|
|
import com.gmail.nossr50.party.PartyManager;
|
|
import com.gmail.nossr50.runnables.CheckDateTask;
|
|
import com.gmail.nossr50.runnables.CheckDateTask;
|
|
import com.gmail.nossr50.runnables.SaveTimerTask;
|
|
import com.gmail.nossr50.runnables.SaveTimerTask;
|
|
|
|
+import com.gmail.nossr50.runnables.UpdaterResultAsyncTask;
|
|
import com.gmail.nossr50.runnables.backups.CleanBackupsTask;
|
|
import com.gmail.nossr50.runnables.backups.CleanBackupsTask;
|
|
import com.gmail.nossr50.runnables.database.UserPurgeTask;
|
|
import com.gmail.nossr50.runnables.database.UserPurgeTask;
|
|
import com.gmail.nossr50.runnables.party.PartyAutoKickTask;
|
|
import com.gmail.nossr50.runnables.party.PartyAutoKickTask;
|
|
@@ -57,9 +57,6 @@ import com.gmail.nossr50.util.experience.FormulaManager;
|
|
import com.gmail.nossr50.util.player.UserManager;
|
|
import com.gmail.nossr50.util.player.UserManager;
|
|
import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
|
|
import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
|
|
|
|
|
|
-import net.gravitydevelopment.updater.mcmmo.Updater;
|
|
|
|
-import net.gravitydevelopment.updater.mcmmo.Updater.UpdateResult;
|
|
|
|
-import net.gravitydevelopment.updater.mcmmo.Updater.UpdateType;
|
|
|
|
import net.shatteredlands.shatt.backup.ZipLibrary;
|
|
import net.shatteredlands.shatt.backup.ZipLibrary;
|
|
|
|
|
|
public class mcMMO extends JavaPlugin {
|
|
public class mcMMO extends JavaPlugin {
|
|
@@ -258,6 +255,10 @@ public class mcMMO extends JavaPlugin {
|
|
return updateAvailable;
|
|
return updateAvailable;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public void setUpdateAvailable(boolean available) {
|
|
|
|
+ this.updateAvailable = available;
|
|
|
|
+ }
|
|
|
|
+
|
|
public boolean isXPEventEnabled() {
|
|
public boolean isXPEventEnabled() {
|
|
return xpEventEnabled;
|
|
return xpEventEnabled;
|
|
}
|
|
}
|
|
@@ -377,21 +378,7 @@ public class mcMMO extends JavaPlugin {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- Updater updater = new Updater(this, 31030, mcmmo, UpdateType.NO_DOWNLOAD, false);
|
|
|
|
-
|
|
|
|
- if (updater.getResult() != UpdateResult.UPDATE_AVAILABLE) {
|
|
|
|
- this.updateAvailable = false;
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (updater.getLatestType().equals("beta") && !Config.getInstance().getPreferBeta()) {
|
|
|
|
- this.updateAvailable = false;
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- this.updateAvailable = true;
|
|
|
|
- getLogger().info(LocaleLoader.getString("UpdateChecker.Outdated"));
|
|
|
|
- getLogger().info(LocaleLoader.getString("UpdateChecker.NewAvailable"));
|
|
|
|
|
|
+ new UpdaterResultAsyncTask(this).runTaskAsynchronously(mcMMO.p);
|
|
}
|
|
}
|
|
|
|
|
|
private void loadConfigFiles() {
|
|
private void loadConfigFiles() {
|