Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-11-28 00:55:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

!tiny cleanup

Browse Source
This commit is contained in:
ASangarin 2020-11-25 23:27:34 +01:00
parent f9b9015790
commit c0bdf1ee12
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/MMOItems.jar
View File

Binary file not shown.

32
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -1,17 +1,5 @@
package net.Indyuce.mmocore; package net.Indyuce.mmocore;
import java.io.File;
import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandMap;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.ConfigFile;
import net.Indyuce.mmocore.api.PlayerActionBar; import net.Indyuce.mmocore.api.PlayerActionBar;
import net.Indyuce.mmocore.api.loot.LootChest; import net.Indyuce.mmocore.api.loot.LootChest;
@ -97,6 +85,17 @@ import net.Indyuce.mmocore.manager.social.PartyManager;
import net.Indyuce.mmocore.manager.social.RequestManager; import net.Indyuce.mmocore.manager.social.RequestManager;
import net.mmogroup.mmolib.comp.Metrics; import net.mmogroup.mmolib.comp.Metrics;
import net.mmogroup.mmolib.version.SpigotPlugin; import net.mmogroup.mmolib.version.SpigotPlugin;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandMap;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
import java.io.File;
import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.logging.Level;
public class MMOCore extends JavaPlugin { public class MMOCore extends JavaPlugin {
public static MMOCore plugin; public static MMOCore plugin;
@ -109,7 +108,6 @@ public class MMOCore extends JavaPlugin {
public VaultEconomy economy; public VaultEconomy economy;
public HologramSupport hologramSupport; public HologramSupport hologramSupport;
public AntiCheatSupport antiCheatSupport; public AntiCheatSupport antiCheatSupport;
public InventoryManager inventoryManager;
public RegionHandler regionHandler = new DefaultRegionHandler(); public RegionHandler regionHandler = new DefaultRegionHandler();
public FlagPlugin flagPlugin = new DefaultFlags(); public FlagPlugin flagPlugin = new DefaultFlags();
public PlaceholderParser placeholderParser = new DefaultParser(); public PlaceholderParser placeholderParser = new DefaultParser();
@ -268,8 +266,10 @@ public class MMOCore extends JavaPlugin {
/* /*
* enable debug mode for extra debug tools. * enable debug mode for extra debug tools.
*/ */
if (getConfig().contains("debug")) if (getConfig().contains("debug")) {
new DebugMode(getConfig().getInt("debug", 0)); DebugMode.setLevel(getConfig().getInt("debug", 0));
DebugMode.enableActionBar();
}
if (configManager.overrideVanillaExp = getConfig().getBoolean("override-vanilla-exp")) if (configManager.overrideVanillaExp = getConfig().getBoolean("override-vanilla-exp"))
Bukkit.getPluginManager().registerEvents(new VanillaExperienceOverride(), this); Bukkit.getPluginManager().registerEvents(new VanillaExperienceOverride(), this);
@ -412,7 +412,7 @@ public class MMOCore extends JavaPlugin {
classManager.clear(); classManager.clear();
classManager.reload(); classManager.reload();
inventoryManager = new InventoryManager(); InventoryManager.load();
questManager.clear(); questManager.clear();
questManager.reload(); questManager.reload();

5
src/main/java/net/Indyuce/mmocore/api/util/debug/DebugMode.java
View File

@ -14,8 +14,11 @@ public class DebugMode {
*/ */
public static int level = 0; public static int level = 0;
public DebugMode(int i) { public static void setLevel(int i) {
level = i; level = i;
}
public static void enableActionBar() {
if (level > 2 && MMOCore.plugin.getConfig().getBoolean("debug-action-bar.enabled")) if (level > 2 && MMOCore.plugin.getConfig().getBoolean("debug-action-bar.enabled"))
new ActionBarRunnable().runTaskTimer(MMOCore.plugin, 0, 10); new ActionBarRunnable().runTaskTimer(MMOCore.plugin, 0, 10);
} }

2
src/main/java/net/Indyuce/mmocore/manager/InventoryManager.java
View File

@ -42,7 +42,7 @@ public class InventoryManager {
public static final List<EditableInventory> list = Arrays.asList(PLAYER_STATS, ATTRIBUTE_VIEW, SKILL_LIST, CLASS_SELECT, SUBCLASS_SELECT, SUBCLASS_CONFIRM, QUEST_LIST, WAYPOINTS, CLASS_CONFIRM, FRIEND_LIST, FRIEND_REMOVAL, PARTY_VIEW, PARTY_CREATION, GUILD_VIEW, GUILD_CREATION); public static final List<EditableInventory> list = Arrays.asList(PLAYER_STATS, ATTRIBUTE_VIEW, SKILL_LIST, CLASS_SELECT, SUBCLASS_SELECT, SUBCLASS_CONFIRM, QUEST_LIST, WAYPOINTS, CLASS_CONFIRM, FRIEND_LIST, FRIEND_REMOVAL, PARTY_VIEW, PARTY_CREATION, GUILD_VIEW, GUILD_CREATION);
public InventoryManager() { public static void load() {
list.forEach(inv -> { list.forEach(inv -> {
MMOCore.plugin.configManager.loadDefaultFile("gui", inv.getId() + ".yml"); MMOCore.plugin.configManager.loadDefaultFile("gui", inv.getId() + ".yml");
try { try {