SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Introduced Brigadier Command System. More Formatting Coming in next commit.

Browse Source
This commit is contained in:
Driftay
2019-09-14 15:13:01 -04:00
parent b06e6e0f04
commit 3c9b606bb9
207 changed files with 4465 additions and 4017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/massivecraft/factions/shop/CmdShop.java
View File

@@ -1,7 +1,10 @@
package com.massivecraft.factions.shop;
import com.massivecraft.factions.P;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.CommandRequirements;
import com.massivecraft.factions.cmd.FCommand;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
public class CmdShop extends FCommand {
@@ -9,22 +12,19 @@ public class CmdShop extends FCommand {
public CmdShop() {
super();
this.aliases.add("shop");
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;
senderMustBeAdmin = false;
this.requirements = new CommandRequirements.Builder(Permission.SHOP)
.memberOnly()
.playerOnly()
.build();
}
@Override
public void perform() {
if (!P.p.getConfig().getBoolean("F-Shop.Enabled")) {
public void perform(CommandContext context) {
if (!FactionsPlugin.getInstance().getConfig().getBoolean("F-Shop.Enabled")) {
return;
}
ShopGUI.openShop(fme);
ShopGUI.openShop(context.fPlayer);
}
@Override

4
src/main/java/com/massivecraft/factions/shop/ShopClickPersistence.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.shop;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.P;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -41,7 +41,7 @@ public class ShopClickPersistence implements Listener {
public void click(InventoryClickEvent e) {
Inventory i = e.getClickedInventory();
Player p = (Player) e.getWhoClicked();
FileConfiguration config = P.p.getConfig();
FileConfiguration config = FactionsPlugin.getInstance().getConfig();
FPlayer fplayer = FPlayers.getInstance().getByPlayer(p);
if (e.getView().getTitle().equalsIgnoreCase(color(config.getString("F-Shop.GUI.Name")))) {

12
src/main/java/com/massivecraft/factions/shop/ShopGUI.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.shop;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.util.XMaterial;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -23,16 +23,16 @@ public class ShopGUI {
*/
public static void openShop(FPlayer p) {
FileConfiguration config = P.p.getConfig();
FileConfiguration config = FactionsPlugin.getInstance().getConfig();
Faction fac = p.getFaction();
Inventory i = Bukkit.createInventory(null, P.p.getConfig().getInt("F-Shop.GUI.Size"), color(config.getString("F-Shop.GUI.Name")));
Inventory i = Bukkit.createInventory(null, FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Size"), color(config.getString("F-Shop.GUI.Name")));
ItemStack glass = new ItemStack(XMaterial.BLACK_STAINED_GLASS_PANE.parseMaterial(), 1, (short) 7);
ItemMeta glassmeta = glass.getItemMeta();
glassmeta.setDisplayName(ChatColor.GOLD + " ");
glass.setItemMeta(glassmeta);
for (int fill = 0; fill < P.p.getConfig().getInt("F-Shop.GUI.Size"); ++fill) {
for (int fill = 0; fill < FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Size"); ++fill) {
i.setItem(fill, glass);
}
@@ -59,7 +59,7 @@ public class ShopGUI {
}
countmeta.setLore(colorList(PointInfo));
count.setItemMeta(countmeta);
i.setItem(P.p.getConfig().getInt("F-Shop.GUI.Information.slot"), count);
i.setItem(FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Information.slot"), count);
ItemStack item = new ItemStack(material);
ItemMeta meta = item.getItemMeta();
@@ -77,7 +77,7 @@ public class ShopGUI {
if (lore.contains("")) {
meta.setLore(null);
} else {
meta.setLore(P.p.colorList(lore));
meta.setLore(FactionsPlugin.getInstance().colorList(lore));
}
item.setItemMeta(meta);
i.setItem(slot, item);