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

F Upgrades GUI Rows Correctly Configurable now

This commit is contained in:
Driftay 2019-08-22 17:21:33 -04:00
parent b91d13feea
commit a10864015c
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/massivecraft/factions/P.java
View File

@ -85,6 +85,7 @@ public class P extends MPlugin {
private Listener[] eventsListener; private Listener[] eventsListener;
public static Economy econ = null; public static Economy econ = null;
public P() { public P() {
p = this; p = this;
} }

5
src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
View File

@ -4,9 +4,9 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.cmd.alts.CmdAlts; import com.massivecraft.factions.cmd.alts.CmdAlts;
import com.massivecraft.factions.cmd.chest.CmdChest; import com.massivecraft.factions.cmd.chest.CmdChest;
import com.massivecraft.factions.cmd.chest.CmdChestLogs;
import com.massivecraft.factions.cmd.claim.*; import com.massivecraft.factions.cmd.claim.*;
import com.massivecraft.factions.cmd.econ.CmdMoney; import com.massivecraft.factions.cmd.econ.CmdMoney;
import com.massivecraft.factions.cmd.grace.CmdGrace;
import com.massivecraft.factions.cmd.logout.CmdLogout; import com.massivecraft.factions.cmd.logout.CmdLogout;
import com.massivecraft.factions.cmd.points.CmdPoints; import com.massivecraft.factions.cmd.points.CmdPoints;
import com.massivecraft.factions.cmd.relational.CmdRelationAlly; import com.massivecraft.factions.cmd.relational.CmdRelationAlly;
@ -135,7 +135,7 @@ public class FCmdRoot extends FCommand {
public CmdNotifications cmdNotifications = new CmdNotifications(); public CmdNotifications cmdNotifications = new CmdNotifications();
public CmdShop cmdShop = new CmdShop(); public CmdShop cmdShop = new CmdShop();
public CmdMissions cmdMissions = new CmdMissions(); public CmdMissions cmdMissions = new CmdMissions();
public CmdChestLogs cmdChestLogs = new CmdChestLogs();
public FCmdRoot() { public FCmdRoot() {
super(); super();
@ -248,7 +248,6 @@ public class FCmdRoot extends FCommand {
this.addSubCommand(this.cmdLowPower); this.addSubCommand(this.cmdLowPower);
this.addSubCommand(this.cmdTntFill); this.addSubCommand(this.cmdTntFill);
this.addSubCommand(this.cmdChest); this.addSubCommand(this.cmdChest);
this.addSubCommand(this.cmdChestLogs);
this.addSubCommand(this.cmdSetBanner); this.addSubCommand(this.cmdSetBanner);
this.addSubCommand(this.cmdStrikeSet); this.addSubCommand(this.cmdStrikeSet);
this.addSubCommand(this.cmdSpam); this.addSubCommand(this.cmdSpam);

3
src/main/java/com/massivecraft/factions/cmd/CmdGrace.java → src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java
View File

@ -1,7 +1,8 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd.grace;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.cmd.FCommand;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;

2
src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java
View File

@ -21,7 +21,7 @@ import java.util.List;
public class FUpgradesGUI implements Listener { public class FUpgradesGUI implements Listener {
public void openMainMenu(FPlayer fme) { public void openMainMenu(FPlayer fme) {
Inventory inventory = Bukkit.createInventory(null, 45, P.p.color(P.p.getConfig().getString("fupgrades.MainMenu.Title").replace("{faction}", fme.getFaction().getTag()))); Inventory inventory = Bukkit.createInventory(null, P.p.getConfig().getInt("fupgrades.MainMenu.DummyItem.rows") * 9, P.p.color(P.p.getConfig().getString("fupgrades.MainMenu.Title").replace("{faction}", fme.getFaction().getTag())));
List<Integer> dummySlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.DummyItem.slots"); List<Integer> dummySlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.DummyItem.slots");
Material dummyMaterial = Material.getMaterial(P.p.getConfig().getString("fupgrades.MainMenu.DummyItem.Type")); Material dummyMaterial = Material.getMaterial(P.p.getConfig().getString("fupgrades.MainMenu.DummyItem.Type"));
int dummyAmount = P.p.getConfig().getInt("fupgrades.MainMenu.DummyItem.Amount"); int dummyAmount = P.p.getConfig().getInt("fupgrades.MainMenu.DummyItem.Amount");