From c4e10d89fe4fd031b0976a74b6fe876c225ec0be Mon Sep 17 00:00:00 2001 From: nicuch Date: Sat, 11 Jan 2020 00:40:07 +0200 Subject: Git toxicity --- .../java/com/leonardobishop/quests/Quests.java | 207 +++++++++++---------- 1 file changed, 104 insertions(+), 103 deletions(-) (limited to 'src') diff --git a/src/main/java/com/leonardobishop/quests/Quests.java b/src/main/java/com/leonardobishop/quests/Quests.java index 05fe5d71..9de7f007 100644 --- a/src/main/java/com/leonardobishop/quests/Quests.java +++ b/src/main/java/com/leonardobishop/quests/Quests.java @@ -1,6 +1,5 @@ package com.leonardobishop.quests; -import com.google.common.io.ByteStreams; import com.leonardobishop.quests.bstats.Metrics; import com.leonardobishop.quests.commands.CommandQuests; import com.leonardobishop.quests.events.EventInventory; @@ -32,7 +31,6 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPluginLoader; -import org.bukkit.scheduler.BukkitRunnable; import java.io.*; import java.util.ArrayList; @@ -42,18 +40,16 @@ import java.util.logging.Level; public class Quests extends JavaPlugin { - private static Quests instance; private static QuestManager questManager; private static QPlayerManager qPlayerManager; private static TaskTypeManager taskTypeManager; private static Updater updater; - private static Metrics metrics; private static Title title; private boolean brokenConfig = false; private QuestsConfigLoader questsConfigLoader; public static Quests get() { - return instance; + return (Quests) Bukkit.getPluginManager().getPlugin("Quests"); } public QuestManager getQuestManager() { @@ -117,11 +113,9 @@ public class Quests extends JavaPlugin { @Override public void onEnable() { - instance = this; taskTypeManager = new TaskTypeManager(this); questManager = new QuestManager(this); qPlayerManager = new QPlayerManager(this); - QuestsAPI.initialise(this); dataGenerator(); setupTitle(); @@ -131,112 +125,100 @@ public class Quests extends JavaPlugin { Bukkit.getPluginManager().registerEvents(new EventInventory(this), this); Bukkit.getPluginManager().registerEvents(new EventPlayerLeave(this), this); - metrics = new Metrics(this); + Metrics metrics = new Metrics(this); if (metrics.isEnabled()) { this.getLogger().log(Level.INFO, "Metrics started. This can be disabled at /plugins/bStats/config.yml."); } questsConfigLoader = new QuestsConfigLoader(Quests.this); - new BukkitRunnable() { - @Override - public void run() { - taskTypeManager.registerTaskType(new MiningTaskType()); - taskTypeManager.registerTaskType(new MiningCertainTaskType()); - taskTypeManager.registerTaskType(new BuildingTaskType()); - taskTypeManager.registerTaskType(new BuildingCertainTaskType()); - taskTypeManager.registerTaskType(new MobkillingTaskType()); - taskTypeManager.registerTaskType(new MobkillingCertainTaskType()); - taskTypeManager.registerTaskType(new PlayerkillingTaskType()); - taskTypeManager.registerTaskType(new FishingTaskType()); - taskTypeManager.registerTaskType(new InventoryTaskType()); - taskTypeManager.registerTaskType(new WalkingTaskType()); - taskTypeManager.registerTaskType(new TamingTaskType()); - taskTypeManager.registerTaskType(new MilkingTaskType()); - taskTypeManager.registerTaskType(new ShearingTaskType()); - taskTypeManager.registerTaskType(new PositionTaskType()); - taskTypeManager.registerTaskType(new PlaytimeTaskType()); - taskTypeManager.registerTaskType(new BrewingTaskType()); - taskTypeManager.registerTaskType(new ExpEarnTaskType()); - taskTypeManager.registerTaskType(new BreedingTaskType()); - taskTypeManager.registerTaskType(new EnchantingTaskType()); - taskTypeManager.registerTaskType(new DealDamageTaskType()); - // TODO: FIX - // taskTypeManager.registerTaskType(new BrewingCertainTaskType()); - if (Bukkit.getPluginManager().isPluginEnabled("ASkyBlock")) { - taskTypeManager.registerTaskType(new ASkyBlockLevelType()); - } - if (Bukkit.getPluginManager().isPluginEnabled("uSkyBlock")) { - taskTypeManager.registerTaskType(new uSkyBlockLevelType()); - } - if (Bukkit.getPluginManager().isPluginEnabled("Citizens")) { - taskTypeManager.registerTaskType(new CitizensDeliverTaskType()); - taskTypeManager.registerTaskType(new CitizensInteractTaskType()); - } - if (Bukkit.getPluginManager().isPluginEnabled("MythicMobs")) { - taskTypeManager.registerTaskType(new MythicMobsKillingType()); - } + Bukkit.getScheduler().runTask(this, () -> { + taskTypeManager.registerTaskType(new MiningTaskType()); + taskTypeManager.registerTaskType(new MiningCertainTaskType()); + taskTypeManager.registerTaskType(new BuildingTaskType()); + taskTypeManager.registerTaskType(new BuildingCertainTaskType()); + taskTypeManager.registerTaskType(new MobkillingTaskType()); + taskTypeManager.registerTaskType(new MobkillingCertainTaskType()); + taskTypeManager.registerTaskType(new PlayerkillingTaskType()); + taskTypeManager.registerTaskType(new FishingTaskType()); + taskTypeManager.registerTaskType(new InventoryTaskType()); + taskTypeManager.registerTaskType(new WalkingTaskType()); + taskTypeManager.registerTaskType(new TamingTaskType()); + taskTypeManager.registerTaskType(new MilkingTaskType()); + taskTypeManager.registerTaskType(new ShearingTaskType()); + taskTypeManager.registerTaskType(new PositionTaskType()); + taskTypeManager.registerTaskType(new PlaytimeTaskType()); + taskTypeManager.registerTaskType(new BrewingTaskType()); + taskTypeManager.registerTaskType(new ExpEarnTaskType()); + taskTypeManager.registerTaskType(new BreedingTaskType()); + taskTypeManager.registerTaskType(new EnchantingTaskType()); + taskTypeManager.registerTaskType(new DealDamageTaskType()); + // TODO: FIX + // taskTypeManager.registerTaskType(new BrewingCertainTaskType()); + if (Bukkit.getPluginManager().isPluginEnabled("ASkyBlock")) { + taskTypeManager.registerTaskType(new ASkyBlockLevelType()); + } + if (Bukkit.getPluginManager().isPluginEnabled("uSkyBlock")) { + taskTypeManager.registerTaskType(new uSkyBlockLevelType()); + } + if (Bukkit.getPluginManager().isPluginEnabled("Citizens")) { + taskTypeManager.registerTaskType(new CitizensDeliverTaskType()); + taskTypeManager.registerTaskType(new CitizensInteractTaskType()); + } + if (Bukkit.getPluginManager().isPluginEnabled("MythicMobs")) { + taskTypeManager.registerTaskType(new MythicMobsKillingType()); + } - reloadQuests(); - if (!questsConfigLoader.getBrokenFiles().isEmpty()) { - Quests.this.getLogger().warning("Quests has failed to load the following files:"); - for (Map.Entry entry : questsConfigLoader.getBrokenFiles().entrySet()) { - Quests.this.getLogger().warning(" - " + entry.getKey() + ": " + entry.getValue().getMessage()); - } - Quests.this.getLogger().warning(ChatColor.GRAY.toString() + ChatColor.ITALIC + "If this is your first time using Quests, please delete the Quests folder and RESTART (not reload!) the server."); + reloadQuests(); + if (!questsConfigLoader.getBrokenFiles().isEmpty()) { + Quests.this.getLogger().warning("Quests has failed to load the following files:"); + for (Map.Entry entry : questsConfigLoader.getBrokenFiles().entrySet()) { + Quests.this.getLogger().warning(" - " + entry.getKey() + ": " + entry.getValue().getMessage()); } + Quests.this.getLogger().warning(ChatColor.GRAY.toString() + ChatColor.ITALIC + "If this is your first time using Quests, please delete the Quests folder and RESTART (not reload!) the server."); + } - for (Player player : Bukkit.getOnlinePlayers()) { - qPlayerManager.loadPlayer(player.getUniqueId()); - } + for (Player player : Bukkit.getOnlinePlayers()) { + qPlayerManager.loadPlayer(player.getUniqueId()); } - }.runTask(this); - new BukkitRunnable() { - @Override - public void run() { - for (QPlayer qPlayer : qPlayerManager.getQPlayers()) { - if (qPlayer.isOnlyDataLoaded()) { - continue; - } - qPlayer.getQuestProgressFile().saveToDisk(false); + }); + Bukkit.getScheduler().runTaskTimerAsynchronously(this, () -> { + for (QPlayer qPlayer : qPlayerManager.getQPlayers()) { + if (qPlayer.isOnlyDataLoaded()) { + continue; } + qPlayer.getQuestProgressFile().saveToDisk(false); } - }.runTaskTimerAsynchronously(this, 12000L, 12000L); - new BukkitRunnable() { - @Override - public void run() { - for (QPlayer qPlayer : qPlayerManager.getQPlayers()) { - if (qPlayer.isOnlyDataLoaded()) { - continue; - } - QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); - for (Map.Entry entry : Quests.this.getQuestManager().getQuests().entrySet()) { - Quest quest = entry.getValue(); - QuestProgress questProgress = questProgressFile.getQuestProgress(quest); - if (questProgressFile.hasStartedQuest(quest)) { - boolean complete = true; - for (Task task : quest.getTasks()) { - TaskProgress taskProgress; - if ((taskProgress = questProgress.getTaskProgress(task.getId())) == null || !taskProgress.isCompleted()) { - complete = false; - break; - } - } - if (complete) { - questProgressFile.completeQuest(quest); + }, 12000L, 12000L); + Bukkit.getScheduler().runTaskTimer(this, () -> { + for (QPlayer qPlayer : qPlayerManager.getQPlayers()) { + if (qPlayer.isOnlyDataLoaded()) { + continue; + } + QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); + for (Map.Entry entry : Quests.this.getQuestManager().getQuests().entrySet()) { + Quest quest = entry.getValue(); + QuestProgress questProgress = questProgressFile.getQuestProgress(quest); + if (questProgressFile.hasStartedQuest(quest)) { + boolean complete = true; + for (Task task : quest.getTasks()) { + TaskProgress taskProgress; + if ((taskProgress = questProgress.getTaskProgress(task.getId())) == null || !taskProgress.isCompleted()) { + complete = false; + break; } } + if (complete) { + questProgressFile.completeQuest(quest); + } } } } - }.runTaskTimer(this, 20L, 20L); - new BukkitRunnable() { - @Override - public void run() { - updater = new Updater(Quests.this); - updater.check(); - } - }.runTaskAsynchronously(this); + }, 20L, 20L); + Bukkit.getScheduler().runTaskAsynchronously(this, () -> { + updater = new Updater(Quests.this); + updater.check(); + }); } @Override @@ -261,13 +243,14 @@ public class Quests extends JavaPlugin { return getItemStack(config.getConfigurationSection(path)); } + @SuppressWarnings("deprecation") public ItemStack getItemStack(ConfigurationSection config) { String cName = config.getString("name", "name"); String cType = config.getString("type", "type"); List cLore = config.getStringList("lore"); String name; - Material type = null; + Material type; int data = 0; List lore = new ArrayList<>(); if (cLore != null) { @@ -283,7 +266,11 @@ public class Quests extends JavaPlugin { type = Material.STONE; } - ItemStack is = new ItemStack(type, 1, (short) data); + ItemStack is; + if (data == 0) + is = new ItemStack(type, 1); + else + is = new ItemStack(type, 1, (short) data); ItemMeta ism = is.getItemMeta(); ism.setLore(lore); ism.setDisplayName(name); @@ -328,9 +315,16 @@ public class Quests extends JavaPlugin { if (!config.exists()) { try { config.createNewFile(); - try (InputStream in = Quests.class.getClassLoader().getResourceAsStream("config.yml")) { + //try (InputStream in = Quests.class.getClassLoader().getResourceAsStream("config.yml")) { + try (InputStream in = this.getResource("config.yml")) { OutputStream out = new FileOutputStream(config); - ByteStreams.copy(in, out); + byte[] buffer = new byte[1024]; + int lenght = in.read(buffer); + while (lenght != -1) { + out.write(buffer, 0, lenght); + lenght = in.read(buffer); + } + //ByteStreams.copy(in, out); BETA method, data losses ahead } catch (IOException e) { e.printStackTrace(); } @@ -339,7 +333,7 @@ public class Quests extends JavaPlugin { } } - File questsDirectory = new File(String.valueOf(this.getDataFolder() + File.separator + "quests")); + File questsDirectory = new File(this.getDataFolder() + File.separator + "quests"); if (!questsDirectory.exists() && !questsDirectory.isDirectory()) { questsDirectory.mkdir(); @@ -356,9 +350,16 @@ public class Quests extends JavaPlugin { File file = new File(this.getDataFolder() + File.separator + "quests" + File.separator + name); try { file.createNewFile(); - try (InputStream in = Quests.class.getClassLoader().getResourceAsStream("quests/" + name)) { + //try (InputStream in = Quests.class.getClassLoader().getResourceAsStream("quests/" + name)) { + try (InputStream in = this.getResource("quests/" + name)) { OutputStream out = new FileOutputStream(file); - ByteStreams.copy(in, out); + byte[] buffer = new byte[1024]; + int lenght = in.read(buffer); + while (lenght != -1) { + out.write(buffer, 0, lenght); + lenght = in.read(buffer); + } + //ByteStreams.copy(in, out); BETA method, data losses ahead } catch (IOException e) { e.printStackTrace(); } -- cgit v1.2.3-70-g09d2