shields added

This commit is contained in:
ImCarib
2020-06-08 05:22:50 -04:00
parent a355b1d0c8
commit e8642a3108
43 changed files with 892 additions and 2333 deletions

View File

@@ -14,6 +14,9 @@ import com.massivecraft.factions.cmd.chest.AntiChestListener;
import com.massivecraft.factions.cmd.reserve.ListParameterizedType;
import com.massivecraft.factions.cmd.reserve.ReserveAdapter;
import com.massivecraft.factions.cmd.reserve.ReserveObject;
import com.massivecraft.factions.cmd.shields.struct.ShieldTCMP;
import com.massivecraft.factions.cmd.shields.struct.frame.ShieldFrame;
import com.massivecraft.factions.cmd.shields.struct.tasks.ShieldManagement;
import com.massivecraft.factions.discord.Discord;
import com.massivecraft.factions.discord.DiscordListener;
import com.massivecraft.factions.integration.Econ;
@@ -180,7 +183,7 @@ public class FactionsPlugin extends MPlugin {
}
saveDefaultConfig();
this.reloadConfig();
reloadConfig();
//Start wait task executor
WaitExecutor.startTask();
// Load Conf from disk
@@ -193,6 +196,7 @@ public class FactionsPlugin extends MPlugin {
com.massivecraft.factions.integration.Essentials.setup();
hookedPlayervaults = setupPlayervaults();
new ShieldTCMP();
FPlayers.getInstance().load();
Factions.getInstance().load();
@@ -216,6 +220,7 @@ public class FactionsPlugin extends MPlugin {
Board.getInstance().load();
Board.getInstance().clean();
new ShieldManagement();
//Load command aliases
Aliases.load();
// Add Base Commands
@@ -425,6 +430,7 @@ public class FactionsPlugin extends MPlugin {
.registerTypeAdapter(Inventory.class, new InventoryTypeAdapter())
.registerTypeAdapter(ReserveObject.class, new ReserveAdapter())
.registerTypeAdapter(Location.class, new LocationTypeAdapter())
.registerTypeAdapter(ShieldFrame.class, new ShieldFrameAdapter())
.registerTypeAdapterFactory(EnumTypeAdapter.ENUM_FACTORY);
}
@@ -482,7 +488,6 @@ public class FactionsPlugin extends MPlugin {
Conf.save();
}
public Economy getEcon() {
RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
return rsp.getProvider();