Saber Factions Initiated

This commit is contained in:
Driftay 2019-06-28 21:49:46 -04:00
parent 1fd3220e5e
commit 2c5a501d0e
120 changed files with 676 additions and 743 deletions

View File

@ -1,10 +1,10 @@
## How to contribute to SavageFactions ## How to contribute to SaberFactions
#### **Did you find a bug?** #### **Did you find a bug?**
* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/ProSavage/SavageFactions/issues). * **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/Driftay/SaberFactions/issues).
* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ProSavage/SavageFactions/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or a **snippet of the logs** demonstrating the expected behavior that is not occurring. * If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/Driftay/SaberFactions/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or a **snippet of the logs** demonstrating the expected behavior that is not occurring.
#### **Did you write a patch that fixes a bug?** #### **Did you write a patch that fixes a bug?**
@ -20,13 +20,9 @@ Please specify what changes you made to the formatting etc., as it allows us to
#### **Do you intend to add a new feature or change an existing one?** #### **Do you intend to add a new feature or change an existing one?**
* Discuss in our [discord server](https://discord.gg/UPyahX2) about your idea. * Discuss in our [discord server](https://discord.gg/Y3TFrhH) about your idea.
* Do not open a Pull Request on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes. * Do not open a Pull Request on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
SavageFactions is a volunteer effort. We encourage you to pitch in and report bugs or create pull requests! SaberFactions is a volunteer effort. We encourage you to pitch in and report bugs or create pull requests!
Thanks! :heart: :heart: :heart:
ProSavage,
SavageFactions Owner

View File

@ -1,50 +0,0 @@
# SavageFactions
SavageFactions is a fork of the popular Factions plugin FactionsUUID. The Goal of SavageFactions is to make the ultimate competitive factions experience.
The plugin contains lots of new revolutionary features, which can be looked at in further detail on the wiki.
Currently the plugin is marketed on [Spigot](https://www.spigotmc.org/forums/) , a platform for Minecraft Servers which has an API that SavageFactions uses to enhance the game.
The plugin page can be found [here](https://www.spigotmc.org/resources/savagefactions-the-ultimate-factions-plugin-1-7-1-13.52891/), it contains a few gifs which show features of the plugin.
## Users
The installation guide can be found on the [installation page](https://github.com/ProSavage/SavageFactions/wiki/Installation-Guide) of the [wiki](https://github.com/ProSavage/SavageFactions/wiki)
Dependencies
- [Essentials Or EssentialsX](https://ci.ender.zone/job/EssentialsX/)
- [Vault](https://www.spigotmc.org/resources/vault.34315/)
Soft Dependencies
- [CoreProtect (for /f inspect)](https://www.spigotmc.org/resources/coreprotect.8631/)
## Developers
This plugin has an extensive API and viewable Javadocs.
The Javadocs can be found in the javadocs folder, they are generated at every major release.
They are also hosted on my webserver and can be found [here](http://prosavage.net/factions_javadoc/)
If you would like to fork/contribute to SavageFactions I have made a video on how to compile the plugin correctly.
The video can be found [here](https://www.youtube.com/watch?v=fnDwjA2gX-E).
If you would like to use the plugin as a dependency in your project, you can use maven.
```xml
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependency>
<groupId>com.github.ProSavage</groupId>
<artifactId>SavageFactions</artifactId>
<version>1.6.x-0.1.21-gbdd5473-400</version>
<scope>provided</scope>
</dependency>
```
The {version} has to be replaced with a version you find in the [mvn-repo](https://github.com/ProSavage/SavageFactions/tree/1.6.x/mvn-repo/com/massivecraft/Factions) folder. An example version that can be used is: `1.6.9.5-U0.2.1-RC-1.5-BETA`
If you would like to learn how to use the API there are lots of examples that can be found in the [wiki](https://github.com/ProSavage/SavageFactions/wiki) on the [API-Usage](https://github.com/ProSavage/SavageFactions/wiki/API-Usage) page.

View File

@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
<li><a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="class in com.massivecraft.factions.zcore">com.massivecraft.factions.zcore.MPlugin</a></li> <li><a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="class in com.massivecraft.factions.zcore">com.massivecraft.factions.zcore.MPlugin</a></li>
<li> <li>
<ul class="inheritance"> <ul class="inheritance">
<li>com.massivecraft.factions.SavageFactions</li> <li>com.massivecraft.factions.SaberFactions</li>
</ul> </ul>
</li> </li>
</ul> </ul>

View File

@ -7,7 +7,7 @@
<version>1.6.9.5-U0.2.1-1.3-BETA</version> <version>1.6.9.5-U0.2.1-1.3-BETA</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>SavageFactionsPlus</name> <name>SaberFactions</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -69,7 +69,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version> <version>2.3.2</version>
<configuration> <configuration>
<finalName>SavageFactionsPlus</finalName> <finalName>SaberFactions</finalName>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -374,10 +374,6 @@
<id>mvdw-software</id> <id>mvdw-software</id>
<url>http://repo.mvdw-software.be/content/groups/public/</url> <url>http://repo.mvdw-software.be/content/groups/public/</url>
</repository> </repository>
<repository>
<id>ProSavage</id>
<url>https://www.myget.org/F/prosavage/maven/</url>
</repository>
<repository> <repository>
<id>papermc</id> <id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url> <url>https://papermc.io/repo/repository/maven-public/</url>

View File

@ -2,7 +2,6 @@ package com.massivecraft.factions;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.massivecraft.factions.integration.dynmap.DynmapStyle; import com.massivecraft.factions.integration.dynmap.DynmapStyle;
import com.massivecraft.factions.util.MultiversionMaterials;
import com.massivecraft.factions.zcore.fperms.DefaultPermissions; import com.massivecraft.factions.zcore.fperms.DefaultPermissions;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
@ -372,24 +371,24 @@ public class Conf {
// Config is not loading if value is empty ??? // Config is not loading if value is empty ???
territoryBypasssProtectedMaterials.add(Material.COOKIE); territoryBypasssProtectedMaterials.add(Material.COOKIE);
territoryDenyUseageMaterials.add(SavageFactions.plugin.FIREBALL); territoryDenyUseageMaterials.add(SaberFactions.plugin.FIREBALL);
territoryDenyUseageMaterials.add(Material.FLINT_AND_STEEL); territoryDenyUseageMaterials.add(Material.FLINT_AND_STEEL);
territoryDenyUseageMaterials.add(Material.BUCKET); territoryDenyUseageMaterials.add(Material.BUCKET);
territoryDenyUseageMaterials.add(Material.WATER_BUCKET); territoryDenyUseageMaterials.add(Material.WATER_BUCKET);
territoryDenyUseageMaterials.add(Material.LAVA_BUCKET); territoryDenyUseageMaterials.add(Material.LAVA_BUCKET);
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
territoryDenyUseageMaterials.add(Material.ARMOR_STAND); territoryDenyUseageMaterials.add(Material.ARMOR_STAND);
} }
territoryProtectedMaterialsWhenOffline.add(Material.BEACON); territoryProtectedMaterialsWhenOffline.add(Material.BEACON);
territoryDenyUseageMaterialsWhenOffline.add(SavageFactions.plugin.FIREBALL); territoryDenyUseageMaterialsWhenOffline.add(SaberFactions.plugin.FIREBALL);
territoryDenyUseageMaterialsWhenOffline.add(Material.FLINT_AND_STEEL); territoryDenyUseageMaterialsWhenOffline.add(Material.FLINT_AND_STEEL);
territoryDenyUseageMaterialsWhenOffline.add(Material.BUCKET); territoryDenyUseageMaterialsWhenOffline.add(Material.BUCKET);
territoryDenyUseageMaterialsWhenOffline.add(Material.WATER_BUCKET); territoryDenyUseageMaterialsWhenOffline.add(Material.WATER_BUCKET);
territoryDenyUseageMaterialsWhenOffline.add(Material.LAVA_BUCKET); territoryDenyUseageMaterialsWhenOffline.add(Material.LAVA_BUCKET);
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
territoryDenyUseageMaterialsWhenOffline.add(Material.ARMOR_STAND); territoryDenyUseageMaterialsWhenOffline.add(Material.ARMOR_STAND);
} }
safeZoneNerfedCreatureTypes.add(EntityType.BLAZE); safeZoneNerfedCreatureTypes.add(EntityType.BLAZE);
@ -416,11 +415,11 @@ public class Conf {
} }
public static void load() { public static void load() {
SavageFactions.plugin.persist.loadOrSaveDefault(i, Conf.class, "conf"); SaberFactions.plugin.persist.loadOrSaveDefault(i, Conf.class, "conf");
} }
public static void save() { public static void save() {
SavageFactions.plugin.persist.save(i); SaberFactions.plugin.persist.save(i);
} }
public enum Backend { public enum Backend {

View File

@ -47,11 +47,11 @@ import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class SavageFactions extends MPlugin { public class SaberFactions extends MPlugin {
// Our single plugin instance. // Our single plugin instance.
// Single 4 life. // Single 4 life.
public static SavageFactions plugin; public static SaberFactions plugin;
public static Permission perms = null; public static Permission perms = null;
// This plugin sets the boolean true when fully enabled. // This plugin sets the boolean true when fully enabled.
// Plugins can check this boolean while hooking in have // Plugins can check this boolean while hooking in have
@ -86,7 +86,7 @@ public class SavageFactions extends MPlugin {
private Listener[] eventsListener; private Listener[] eventsListener;
public static Economy econ = null; public static Economy econ = null;
public SavageFactions() { public SaberFactions() {
plugin = this; plugin = this;
} }
@ -147,20 +147,20 @@ public class SavageFactions extends MPlugin {
int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]); int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
switch (version) { switch (version) {
case 7: case 7:
SavageFactions.plugin.log("Minecraft Version 1.7 found, disabling banners, itemflags inside GUIs, and Titles."); SaberFactions.plugin.log("Minecraft Version 1.7 found, disabling banners, itemflags inside GUIs, and Titles.");
mc17 = true; mc17 = true;
break; break;
case 8: case 8:
SavageFactions.plugin.log("Minecraft Version 1.8 found, Title Fadeouttime etc will not be configurable."); SaberFactions.plugin.log("Minecraft Version 1.8 found, Title Fadeouttime etc will not be configurable.");
mc18 = true; mc18 = true;
break; break;
case 13: case 13:
SavageFactions.plugin.log("Minecraft Version 1.13 found, New Items will be used."); SaberFactions.plugin.log("Minecraft Version 1.13 found, New Items will be used.");
mc113 = true; mc113 = true;
changeItemIDSInConfig(); changeItemIDSInConfig();
break; break;
case 14: case 14:
SavageFactions.plugin.log("Minecraft Version 1.14 found."); SaberFactions.plugin.log("Minecraft Version 1.14 found.");
mc114 = true; mc114 = true;
changeItemIDSInConfig(); changeItemIDSInConfig();
break; break;
@ -229,7 +229,7 @@ public class SavageFactions extends MPlugin {
} }
if (getServer().getPluginManager().getPlugin("Skript") != null) { if (getServer().getPluginManager().getPlugin("Skript") != null) {
log("Skript was found! Registering SavageFactions Addon..."); log("Skript was found! Registering SaberFactions Addon...");
skriptAddon = Skript.registerAddon(this); skriptAddon = Skript.registerAddon(this);
try { try {
skriptAddon.loadClasses("com.massivecraft.factions.skript", "expressions"); skriptAddon.loadClasses("com.massivecraft.factions.skript", "expressions");
@ -262,14 +262,14 @@ public class SavageFactions extends MPlugin {
getCommand(this.refCommand).setTabCompleter(this); getCommand(this.refCommand).setTabCompleter(this);
RegisteredServiceProvider<Economy> rsp = SavageFactions.this.getServer().getServicesManager().getRegistration(Economy.class); RegisteredServiceProvider<Economy> rsp = SaberFactions.this.getServer().getServicesManager().getRegistration(Economy.class);
SavageFactions.econ = rsp.getProvider(); SaberFactions.econ = rsp.getProvider();
if (getDescription().getFullName().contains("BETA")) { if (getDescription().getFullName().contains("BETA")) {
divider(); divider();
System.out.println("You are using a BETA version of the plugin!"); System.out.println("You are using a BETA version of the plugin!");
System.out.println("This comes with risks of small bugs in newer features!"); System.out.println("This comes with risks of small bugs in newer features!");
System.out.println("For support head to: https://github.com/ProSavage/SavageFactions/issues"); System.out.println("For support head to: https://github.com/ProSavage/SaberFactions/issues");
divider(); divider();
} }
@ -277,7 +277,7 @@ public class SavageFactions extends MPlugin {
this.postEnable(); this.postEnable();
this.loadSuccessful = true; this.loadSuccessful = true;
// Set startup finished to true. to give plugins hooking in a greenlight // Set startup finished to true. to give plugins hooking in a greenlight
SavageFactions.startupFinished = true; SaberFactions.startupFinished = true;
} }
public SkriptAddon getSkriptAddon() { public SkriptAddon getSkriptAddon() {
@ -417,7 +417,7 @@ public class SavageFactions extends MPlugin {
public void replaceStringInConfig(String path, String stringToReplace, String replacementString) { public void replaceStringInConfig(String path, String stringToReplace, String replacementString) {
if (getConfig().getString(path).equals(stringToReplace)) { if (getConfig().getString(path).equals(stringToReplace)) {
// SavageFactions.plugin.log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'."); // SaberFactions.plugin.log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'.");
// log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'."); // log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'.");
getConfig().set(path, replacementString); getConfig().set(path, replacementString);
@ -522,14 +522,14 @@ public class SavageFactions extends MPlugin {
public ItemStack createLazyItem(Material material, int amount, short datavalue, String name, String lore) { public ItemStack createLazyItem(Material material, int amount, short datavalue, String name, String lore) {
ItemStack item = new ItemStack(material, amount, datavalue); ItemStack item = new ItemStack(material, amount, datavalue);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName(color(SavageFactions.plugin.getConfig().getString(name))); meta.setDisplayName(color(SaberFactions.plugin.getConfig().getString(name)));
meta.setLore(colorList(SavageFactions.plugin.getConfig().getStringList(lore))); meta.setLore(colorList(SaberFactions.plugin.getConfig().getStringList(lore)));
item.setItemMeta(meta); item.setItemMeta(meta);
return item; return item;
} }
public Economy getEcon() { public Economy getEcon() {
RegisteredServiceProvider<Economy> rsp = SavageFactions.plugin.getServer().getServicesManager().getRegistration(Economy.class); RegisteredServiceProvider<Economy> rsp = SaberFactions.plugin.getServer().getServicesManager().getRegistration(Economy.class);
Economy econ = rsp.getProvider(); Economy econ = rsp.getProvider();
return econ; return econ;
} }
@ -614,11 +614,11 @@ public class SavageFactions extends MPlugin {
as.setVisible(false); //Makes the ArmorStand invisible as.setVisible(false); //Makes the ArmorStand invisible
as.setGravity(false); //Make sure it doesn't fall as.setGravity(false); //Make sure it doesn't fall
as.setCanPickupItems(false); //I'm not sure what happens if you leave this as it is, but you might as well disable it as.setCanPickupItems(false); //I'm not sure what happens if you leave this as it is, but you might as well disable it
as.setCustomName(SavageFactions.plugin.color(text)); //Set this to the text you want as.setCustomName(SaberFactions.plugin.color(text)); //Set this to the text you want
as.setCustomNameVisible(true); //This makes the text appear no matter if your looking at the entity or not as.setCustomNameVisible(true); //This makes the text appear no matter if your looking at the entity or not
final ArmorStand armorStand = as; final ArmorStand armorStand = as;
Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> { Bukkit.getScheduler().scheduleSyncDelayedTask(SaberFactions.plugin, () -> {
armorStand.remove(); armorStand.remove();
getLogger().info("Removing Hologram."); getLogger().info("Removing Hologram.");
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -35,13 +35,13 @@ public class CmdAlts extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("f-alts.Enabled", false)) { if (!SaberFactions.plugin.getConfig().getBoolean("f-alts.Enabled", false)) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
return; return;
} }
this.commandChain.add(this); this.commandChain.add(this);
SavageFactions.plugin.cmdAutoHelp.execute(this.sender, this.args, this.commandChain); SaberFactions.plugin.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
} }
@Override @Override

View File

@ -1,16 +1,16 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.zcore.CommandVisibility; import com.massivecraft.factions.zcore.CommandVisibility;
import com.massivecraft.factions.zcore.MCommand; import com.massivecraft.factions.zcore.MCommand;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import java.util.ArrayList; import java.util.ArrayList;
public class CmdAutoHelp extends MCommand<SavageFactions> { public class CmdAutoHelp extends MCommand<SaberFactions> {
public CmdAutoHelp() { public CmdAutoHelp() {
super(SavageFactions.plugin); super(SaberFactions.plugin);
this.aliases.add("?"); this.aliases.add("?");
this.aliases.add("h"); this.aliases.add("h");
this.aliases.add("help"); this.aliases.add("help");

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.event.FPlayerLeaveEvent; import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.BanInfo; import com.massivecraft.factions.struct.BanInfo;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -81,7 +81,7 @@ public class CmdBan extends FCommand {
if (event.isCancelled()) { if (event.isCancelled()) {
// if someone cancels a ban, we'll get people complaining here. So lets log it. // if someone cancels a ban, we'll get people complaining here. So lets log it.
SavageFactions.plugin.log(Level.WARNING, "Attempted to ban {0} but someone cancelled the kick event. This isn't good.", target.getName()); SaberFactions.plugin.log(Level.WARNING, "Attempted to ban {0} but someone cancelled the kick event. This isn't good.", target.getName());
return; return;
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
@ -32,30 +32,30 @@ public class CmdBanner extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) {
msg(TL.COMMAND_BANNER_DISABLED); msg(TL.COMMAND_BANNER_DISABLED);
return; return;
} }
if (!fme.hasMoney(SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000))) { if (!fme.hasMoney(SaberFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000))) {
msg(TL.COMMAND_BANNER_NOTENOUGHMONEY); msg(TL.COMMAND_BANNER_NOTENOUGHMONEY);
return; return;
} }
takeMoney(fme, SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000)); takeMoney(fme, SaberFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000));
//ItemStack warBanner = SavageFactions.plugin.createItem(Material.BANNER, 1, (short) 1, SavageFactions.plugin.getConfig().getString("fbanners.Item.Name"), SavageFactions.plugin.getConfig().getStringList("fbanners.Item.Lore")); //ItemStack warBanner = SaberFactions.plugin.createItem(Material.BANNER, 1, (short) 1, SaberFactions.plugin.getConfig().getString("fbanners.Item.Name"), SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore"));
//BannerMeta bannerMeta = (BannerMeta) warBanner.getItemMeta(); //BannerMeta bannerMeta = (BannerMeta) warBanner.getItemMeta();
ItemStack warBanner = fme.getFaction().getBanner(); ItemStack warBanner = fme.getFaction().getBanner();
if (warBanner != null) { if (warBanner != null) {
ItemMeta warmeta = warBanner.getItemMeta(); ItemMeta warmeta = warBanner.getItemMeta();
warmeta.setDisplayName(SavageFactions.plugin.color(SavageFactions.plugin.getConfig().getString("fbanners.Item.Name"))); warmeta.setDisplayName(SaberFactions.plugin.color(SaberFactions.plugin.getConfig().getString("fbanners.Item.Name")));
warmeta.setLore(SavageFactions.plugin.colorList(SavageFactions.plugin.getConfig().getStringList("fbanners.Item.Lore"))); warmeta.setLore(SaberFactions.plugin.colorList(SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore")));
warBanner.setItemMeta(warmeta); warBanner.setItemMeta(warmeta);
} else { } else {
warBanner = SavageFactions.plugin.createItem(SavageFactions.plugin.BANNER, 1, (short) 1, SavageFactions.plugin.getConfig().getString("fbanners.Item.Name"), SavageFactions.plugin.getConfig().getStringList("fbanners.Item.Lore")); warBanner = SaberFactions.plugin.createItem(SaberFactions.plugin.BANNER, 1, (short) 1, SaberFactions.plugin.getConfig().getString("fbanners.Item.Name"), SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore"));
} }
fme.msg(TL.COMMAND_BANNER_SUCCESS); fme.msg(TL.COMMAND_BANNER_SUCCESS);
warBanner.setAmount(1); warBanner.setAmount(1);
@ -64,7 +64,7 @@ public class CmdBanner extends FCommand {
public boolean hasMoney(FPlayer fme, int amt) { public boolean hasMoney(FPlayer fme, int amt) {
Economy econ = SavageFactions.plugin.getEcon(); Economy econ = SaberFactions.plugin.getEcon();
if (econ.getBalance(fme.getPlayer()) >= amt) { if (econ.getBalance(fme.getPlayer()) >= amt) {
return true; return true;
} else { } else {
@ -75,7 +75,7 @@ public class CmdBanner extends FCommand {
public void takeMoney(FPlayer fme, int amt) { public void takeMoney(FPlayer fme, int amt) {
if (hasMoney(fme, amt)) { if (hasMoney(fme, amt)) {
Economy econ = SavageFactions.plugin.getEcon(); Economy econ = SaberFactions.plugin.getEcon();
econ.withdrawPlayer(fme.getPlayer(), amt); econ.withdrawPlayer(fme.getPlayer(), amt);
fme.sendMessage(TL.COMMAND_BANNER_MONEYTAKE.toString().replace("{amount}", amt + "")); fme.sendMessage(TL.COMMAND_BANNER_MONEYTAKE.toString().replace("{amount}", amt + ""));
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -30,10 +30,10 @@ public class CmdBypass extends FCommand {
// TODO: Move this to a transient field in the model?? // TODO: Move this to a transient field in the model??
if (fme.isAdminBypassing()) { if (fme.isAdminBypassing()) {
fme.msg(TL.COMMAND_BYPASS_ENABLE.toString()); fme.msg(TL.COMMAND_BYPASS_ENABLE.toString());
SavageFactions.plugin.log(fme.getName() + TL.COMMAND_BYPASS_ENABLELOG.toString()); SaberFactions.plugin.log(fme.getName() + TL.COMMAND_BYPASS_ENABLELOG.toString());
} else { } else {
fme.msg(TL.COMMAND_BYPASS_DISABLE.toString()); fme.msg(TL.COMMAND_BYPASS_DISABLE.toString());
SavageFactions.plugin.log(fme.getName() + TL.COMMAND_BYPASS_DISABLELOG.toString()); SaberFactions.plugin.log(fme.getName() + TL.COMMAND_BYPASS_DISABLELOG.toString());
} }
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -28,10 +28,10 @@ public class CmdChatSpy extends FCommand {
if (fme.isSpyingChat()) { if (fme.isSpyingChat()) {
fme.msg(TL.COMMAND_CHATSPY_ENABLE); fme.msg(TL.COMMAND_CHATSPY_ENABLE);
SavageFactions.plugin.log(fme.getName() + TL.COMMAND_CHATSPY_ENABLELOG.toString()); SaberFactions.plugin.log(fme.getName() + TL.COMMAND_CHATSPY_ENABLELOG.toString());
} else { } else {
fme.msg(TL.COMMAND_CHATSPY_DISABLE); fme.msg(TL.COMMAND_CHATSPY_DISABLE);
SavageFactions.plugin.log(fme.getName() + TL.COMMAND_CHATSPY_DISABLELOG.toString()); SaberFactions.plugin.log(fme.getName() + TL.COMMAND_CHATSPY_DISABLELOG.toString());
} }
} }

View File

@ -26,7 +26,7 @@ public class CmdCheckpoint extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("checkpoints.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("checkpoints.Enabled")) {
fme.msg(TL.COMMAND_CHECKPOINT_DISABLED); fme.msg(TL.COMMAND_CHECKPOINT_DISABLED);
return; return;
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
@ -30,7 +30,7 @@ public class CmdChest extends FCommand {
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fchest.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fchest.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -231,10 +231,10 @@ public class CmdConfig extends FCommand {
if (!success.isEmpty()) { if (!success.isEmpty()) {
if (sender instanceof Player) { if (sender instanceof Player) {
sendMessage(success); sendMessage(success);
SavageFactions.plugin.log(success + TL.COMMAND_CONFIG_LOG.format((Player) sender)); SaberFactions.plugin.log(success + TL.COMMAND_CONFIG_LOG.format((Player) sender));
} else // using SavageFactions.plugin.log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log } else // using SaberFactions.plugin.log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log
{ {
SavageFactions.plugin.log(success); SaberFactions.plugin.log(success);
} }
} }
// save change to disk // save change to disk

View File

@ -5,7 +5,6 @@ import com.massivecraft.factions.*;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.CornerTask; import com.massivecraft.factions.util.CornerTask;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
@ -27,7 +26,7 @@ public class CmdCorner extends FCommand {
@Override @Override
public void perform() { public void perform() {
FLocation to = new FLocation(me.getLocation()); FLocation to = new FLocation(me.getLocation());
if (SavageFactions.plugin.getFactionsPlayerListener().getCorners().contains(to)) { if (SaberFactions.plugin.getFactionsPlayerListener().getCorners().contains(to)) {
Faction cornerAt = Board.getInstance().getFactionAt(to); Faction cornerAt = Board.getInstance().getFactionAt(to);
if (cornerAt != null && cornerAt.isNormal() && !cornerAt.equals(fme.getFaction())) { if (cornerAt != null && cornerAt.isNormal() && !cornerAt.equals(fme.getFaction())) {
msg(TL.COMMAND_CORNER_CANT_CLAIM); msg(TL.COMMAND_CORNER_CANT_CLAIM);
@ -49,7 +48,7 @@ public class CmdCorner extends FCommand {
if (surrounding.isEmpty()) { if (surrounding.isEmpty()) {
msg(TL.COMMAND_CORNER_CANT_CLAIM); msg(TL.COMMAND_CORNER_CANT_CLAIM);
} else { } else {
new CornerTask(fme, surrounding).runTaskTimer(SavageFactions.plugin, 1L, 1L); new CornerTask(fme, surrounding).runTaskTimer(SaberFactions.plugin, 1L, 1L);
} }
} }
} else { } else {

View File

@ -97,7 +97,7 @@ public class CmdCreate extends FCommand {
// That way we don't have to mess up deleting more stuff. // That way we don't have to mess up deleting more stuff.
// And prevent the user from being returned to NORMAL after deleting his old faction. // And prevent the user from being returned to NORMAL after deleting his old faction.
fme.setRole(Role.LEADER); fme.setRole(Role.LEADER);
if (SavageFactions.plugin.getConfig().getBoolean("faction-creation-broadcast", true)) { if (SaberFactions.plugin.getConfig().getBoolean("faction-creation-broadcast", true)) {
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) { for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
follower.msg(TL.COMMAND_CREATE_CREATED, fme.describeTo(follower, true), faction.getTag(follower)); follower.msg(TL.COMMAND_CREATE_CREATED, fme.describeTo(follower, true), faction.getTag(follower));
} }
@ -109,13 +109,13 @@ public class CmdCreate extends FCommand {
} }
if (Conf.logFactionCreate) { if (Conf.logFactionCreate) {
SavageFactions.plugin.log(fme.getName() + TL.COMMAND_CREATE_CREATEDLOG.toString() + tag); SaberFactions.plugin.log(fme.getName() + TL.COMMAND_CREATE_CREATEDLOG.toString() + tag);
} }
if (SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { if (SaberFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
this.fme.msg(TL.COMMAND_PAYPALSET_CREATED); this.fme.msg(TL.COMMAND_PAYPALSET_CREATED);
} }
fme.setCooldown("create", System.currentTimeMillis() + (SavageFactions.plugin.getConfig().getInt("fcooldowns.f-create") * 1000)); fme.setCooldown("create", System.currentTimeMillis() + (SaberFactions.plugin.getConfig().getInt("fcooldowns.f-create") * 1000));
if (Conf.useCustomDefaultPermissions) { if (Conf.useCustomDefaultPermissions) {
faction.setDefaultPerms(); faction.setDefaultPerms();

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -35,7 +35,7 @@ public class CmdDelFWarp extends FCommand {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
return !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.delwarp", 5), TL.COMMAND_DELFWARP_TODELETE.toString(), TL.COMMAND_DELFWARP_FORDELETE.toString()); return !SaberFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SaberFactions.plugin.getConfig().getDouble("warp-cost.delwarp", 5), TL.COMMAND_DELFWARP_TODELETE.toString(), TL.COMMAND_DELFWARP_FORDELETE.toString());
} }
@Override @Override

View File

@ -87,15 +87,15 @@ public class CmdDisband extends FCommand {
if (!disbandMap.containsKey(me.getUniqueId().toString()) && faction.getTnt() > 0) { if (!disbandMap.containsKey(me.getUniqueId().toString()) && faction.getTnt() > 0) {
msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + "")); msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + ""));
disbandMap.put(me.getUniqueId().toString(), faction.getId()); disbandMap.put(me.getUniqueId().toString(), faction.getId());
Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> disbandMap.remove(me.getUniqueId().toString()), 200L); Bukkit.getScheduler().scheduleSyncDelayedTask(SaberFactions.plugin, () -> disbandMap.remove(me.getUniqueId().toString()), 200L);
} else if (faction.getId().equals(disbandMap.get(me.getUniqueId().toString())) || faction.getTnt() == 0) { } else if (faction.getId().equals(disbandMap.get(me.getUniqueId().toString())) || faction.getTnt() == 0) {
if (SavageFactions.plugin.getConfig().getBoolean("faction-disband-broadcast", true)) { if (SaberFactions.plugin.getConfig().getBoolean("faction-disband-broadcast", true)) {
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) { for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
String amountString = senderIsConsole ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(follower); String amountString = senderIsConsole ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(follower);
UtilFly.checkFly(this.fme, Board.getInstance().getFactionAt(new FLocation(follower))); UtilFly.checkFly(this.fme, Board.getInstance().getFactionAt(new FLocation(follower)));
if (follower.getFaction() == faction) { if (follower.getFaction() == faction) {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString); follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
fme.setCooldown("disband", System.currentTimeMillis() + (SavageFactions.plugin.getConfig().getInt("fcooldowns.f-disband") * 1000)); fme.setCooldown("disband", System.currentTimeMillis() + (SaberFactions.plugin.getConfig().getInt("fcooldowns.f-disband") * 1000));
} else { } else {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower)); follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.WarmUpUtil; import com.massivecraft.factions.util.WarmUpUtil;
@ -80,7 +80,7 @@ public class CmdFWarp extends FCommand {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
return !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.warp", 5), TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString()); return !SaberFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SaberFactions.plugin.getConfig().getDouble("warp-cost.warp", 5), TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
} }
@Override @Override

View File

@ -39,11 +39,11 @@ public class CmdFly extends FCommand {
public static void startParticles() { public static void startParticles() {
// Just a secondary check. // Just a secondary check.
if (!SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
return; return;
} }
id = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { id = Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> {
for (String name : flyMap.keySet()) { for (String name : flyMap.keySet()) {
Player player = Bukkit.getPlayer(name); Player player = Bukkit.getPlayer(name);
if (player == null) { if (player == null) {
@ -52,7 +52,7 @@ public class CmdFly extends FCommand {
if (!player.isFlying()) { if (!player.isFlying()) {
continue; continue;
} }
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
if (player.getGameMode() == GameMode.SPECTATOR) { if (player.getGameMode() == GameMode.SPECTATOR) {
continue; continue;
} }
@ -61,12 +61,12 @@ public class CmdFly extends FCommand {
if (FPlayers.getInstance().getByPlayer(player).isVanished()) { if (FPlayers.getInstance().getByPlayer(player).isVanished()) {
// Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation. // Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation.
// But we can keep it as a config. // But we can keep it as a config.
if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enable-While-Vanished")) { if (SaberFactions.plugin.getConfig().getBoolean("ffly.Particles.Enable-While-Vanished")) {
return; return;
} }
continue; continue;
} }
if (SavageFactions.plugin.useNonPacketParticles) { if (SaberFactions.plugin.useNonPacketParticles) {
// 1.9+ based servers will use the built in particleAPI instead of packet based. // 1.9+ based servers will use the built in particleAPI instead of packet based.
// any particle amount higher than 0 made them go everywhere, and the offset at 0 was not working. // any particle amount higher than 0 made them go everywhere, and the offset at 0 was not working.
// So setting the amount to 0 spawns 1 in the precise location // So setting the amount to 0 spawns 1 in the precise location
@ -84,7 +84,7 @@ public class CmdFly extends FCommand {
} }
public static void startFlyCheck() { public static void startFlyCheck() {
flyid = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { //threw the exception for now, until I recode fly :( Cringe. flyid = Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> { //threw the exception for now, until I recode fly :( Cringe.
checkTaskState(); checkTaskState();
if (flyMap.keySet().size() != 0) { if (flyMap.keySet().size() != 0) {
for (String name : flyMap.keySet()) { for (String name : flyMap.keySet()) {
@ -95,7 +95,7 @@ public class CmdFly extends FCommand {
if (player == null if (player == null
|| !player.isFlying() || !player.isFlying()
|| player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.CREATIVE
|| !SavageFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) { || !SaberFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
continue; continue;
} }
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player); FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
@ -171,7 +171,7 @@ public class CmdFly extends FCommand {
@Override @Override
public void perform() { public void perform() {
// Disabled by default. // Disabled by default.
if (!SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight", false)) { if (!SaberFactions.plugin.getConfig().getBoolean("enable-faction-flight", false)) {
fme.msg(TL.COMMAND_FLY_DISABLED); fme.msg(TL.COMMAND_FLY_DISABLED);
return; return;
} }
@ -212,7 +212,7 @@ public class CmdFly extends FCommand {
fme.setFlying(true); fme.setFlying(true);
flyMap.put(player.getName(), true); flyMap.put(player.getName(), true);
if (id == -1) { if (id == -1) {
if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) { if (SaberFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
startParticles(); startParticles();
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.scoreboards.FTeamWrapper; import com.massivecraft.factions.scoreboards.FTeamWrapper;
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;
@ -24,7 +24,7 @@ public class CmdFocus
} }
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("ffocus.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("ffocus.Enabled")) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
return; return;
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
import org.bukkit.Location; import org.bukkit.Location;
@ -27,12 +27,12 @@ public class CmdGetVault extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fvault.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fvault.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }
Location vaultLocation = fme.getFaction().getVault(); Location vaultLocation = fme.getFaction().getVault();
ItemStack vault = SavageFactions.plugin.createItem(Material.CHEST, 1, (short) 0, SavageFactions.plugin.color(SavageFactions.plugin.getConfig().getString("fvault.Item.Name")), SavageFactions.plugin.colorList(SavageFactions.plugin.getConfig().getStringList("fvault.Item.Lore"))); ItemStack vault = SaberFactions.plugin.createItem(Material.CHEST, 1, (short) 0, SaberFactions.plugin.color(SaberFactions.plugin.getConfig().getString("fvault.Item.Name")), SaberFactions.plugin.colorList(SaberFactions.plugin.getConfig().getStringList("fvault.Item.Lore")));
//check if vault is set //check if vault is set
@ -43,7 +43,7 @@ public class CmdGetVault extends FCommand {
//has enough money? //has enough money?
int amount = SavageFactions.plugin.getConfig().getInt("fvault.Price"); int amount = SaberFactions.plugin.getConfig().getInt("fvault.Price");
if (!fme.hasMoney(amount)) { if (!fme.hasMoney(amount)) {
return; return;
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -23,7 +23,7 @@ public class CmdGrace extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
return; return;
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
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;
@ -40,7 +40,7 @@ public class CmdHelp extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (SavageFactions.plugin.getConfig().getBoolean("use-old-help", true)) { if (SaberFactions.plugin.getConfig().getBoolean("use-old-help", true)) {
if (helpPages == null) { if (helpPages == null) {
updateHelp(); updateHelp();
} }
@ -57,9 +57,9 @@ public class CmdHelp extends FCommand {
sendMessage(helpPages.get(page)); sendMessage(helpPages.get(page));
return; return;
} }
ConfigurationSection help = SavageFactions.plugin.getConfig().getConfigurationSection("help"); ConfigurationSection help = SaberFactions.plugin.getConfig().getConfigurationSection("help");
if (help == null) { if (help == null) {
help = SavageFactions.plugin.getConfig().createSection("help"); // create new help section help = SaberFactions.plugin.getConfig().createSection("help"); // create new help section
List<String> error = new ArrayList<>(); List<String> error = new ArrayList<>();
error.add("&cUpdate help messages in config.yml!"); error.add("&cUpdate help messages in config.yml!");
error.add("&cSet use-old-help for legacy help messages"); error.add("&cSet use-old-help for legacy help messages");
@ -72,7 +72,7 @@ public class CmdHelp extends FCommand {
return; return;
} }
for (String helpLine : page) { for (String helpLine : page) {
sendMessage(SavageFactions.plugin.txt.parse(helpLine)); sendMessage(SaberFactions.plugin.txt.parse(helpLine));
} }
} }
@ -189,7 +189,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.cmdBase.cmdSafeunclaimall.getUseageTemplate(true)); pageLines.add(p.cmdBase.cmdSafeunclaimall.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdWarunclaimall.getUseageTemplate(true)); pageLines.add(p.cmdBase.cmdWarunclaimall.getUseageTemplate(true));
//TODO:TL //TODO:TL
pageLines.add(p.txt.parse("<i>Note: " + p.cmdBase.cmdUnclaim.getUseageTemplate(false) + SavageFactions.plugin.txt.parse("<i>") + " works on safe/war zones as well.")); pageLines.add(p.txt.parse("<i>Note: " + p.cmdBase.cmdUnclaim.getUseageTemplate(false) + SaberFactions.plugin.txt.parse("<i>") + " works on safe/war zones as well."));
pageLines.add(p.cmdBase.cmdPeaceful.getUseageTemplate(true)); pageLines.add(p.cmdBase.cmdPeaceful.getUseageTemplate(true));
helpPages.add(pageLines); helpPages.add(pageLines);

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
@ -32,7 +32,7 @@ public class CmdInviteAlt extends FCommand {
@Override @Override
public void perform() { public void perform() {
if(!SavageFactions.plugin.getConfig().getBoolean("f-alts.Enabled", false)){ if(!SaberFactions.plugin.getConfig().getBoolean("f-alts.Enabled", false)){
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
return; return;
} }

View File

@ -83,7 +83,7 @@ public class CmdJoin extends FCommand {
if (level == 0) { if (level == 0) {
limit = Conf.factionMemberLimit; limit = Conf.factionMemberLimit;
} else { } else {
limit = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Members.Members-Limit.level-" + level); limit = SaberFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Members.Members-Limit.level-" + level);
} }
if (limit > 0 && faction.getFPlayers().size() >= limit && !faction.altInvited(fme)) { if (limit > 0 && faction.getFPlayers().size() >= limit && !faction.altInvited(fme)) {
@ -145,9 +145,9 @@ public class CmdJoin extends FCommand {
if (Conf.logFactionJoin) { if (Conf.logFactionJoin) {
if (samePlayer) { if (samePlayer) {
SavageFactions.plugin.log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag()); SaberFactions.plugin.log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());
} else { } else {
SavageFactions.plugin.log(TL.COMMAND_JOIN_MOVEDLOG.toString(), fme.getName(), fplayer.getName(), faction.getTag()); SaberFactions.plugin.log(TL.COMMAND_JOIN_MOVEDLOG.toString(), fme.getName(), fplayer.getName(), faction.getTag());
} }
} }
} }

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.event.FPlayerLeaveEvent; import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
@ -68,8 +68,8 @@ public class CmdKick extends FCommand {
} }
if(toKick.isAlt()){ if(toKick.isAlt()){
msg(SavageFactions.plugin.color("&cToo few arguments, &eUse like this:")); msg(SaberFactions.plugin.color("&cToo few arguments, &eUse like this:"));
msg(SavageFactions.plugin.color("&b/f alts,alt kick &3<player name>")); msg(SaberFactions.plugin.color("&b/f alts,alt kick &3<player name>"));
return; return;
} }
@ -129,7 +129,7 @@ public class CmdKick extends FCommand {
fme.msg(TL.COMMAND_KICK_KICKS, toKick.describeTo(fme), toKickFaction.describeTo(fme)); fme.msg(TL.COMMAND_KICK_KICKS, toKick.describeTo(fme), toKickFaction.describeTo(fme));
} }
if (Conf.logFactionKick) { if (Conf.logFactionKick) {
SavageFactions.plugin.log((senderIsConsole ? "A console command" : fme.getName()) + " kicked " + toKick.getName() + " from the faction: " + toKickFaction.getTag()); SaberFactions.plugin.log((senderIsConsole ? "A console command" : fme.getName()) + " kicked " + toKick.getName() + " from the faction: " + toKickFaction.getTag());
} }
if (toKick.getRole() == Role.LEADER) { if (toKick.getRole() == Role.LEADER) {
toKickFaction.promoteNewLeader(); toKickFaction.promoteNewLeader();

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.event.FPlayerLeaveEvent; import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
@ -32,7 +32,7 @@ public class CmdKickAlt extends FCommand{
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("f-alts.Enabled", false)) { if (!SaberFactions.plugin.getConfig().getBoolean("f-alts.Enabled", false)) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
return; return;
} }
@ -126,7 +126,7 @@ public class CmdKickAlt extends FCommand{
} }
if (Conf.logFactionKick) { if (Conf.logFactionKick) {
SavageFactions.plugin.log((senderIsConsole ? "A console command" : fme.getName()) + " kicked " + toKick.getName() + " from the faction: " SaberFactions.plugin.log((senderIsConsole ? "A console command" : fme.getName()) + " kicked " + toKick.getName() + " from the faction: "
+ toKickFaction.getTag()); + toKickFaction.getTag());
} }
// SHOULD NOT BE POSSIBLE BUT KEPT INCASE // SHOULD NOT BE POSSIBLE BUT KEPT INCASE

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
import com.massivecraft.factions.zcore.util.TagUtil; import com.massivecraft.factions.zcore.util.TagUtil;
@ -51,7 +51,7 @@ public class CmdList extends FCommand {
// remove exempt factions // remove exempt factions
if (fme != null && fme.getPlayer() != null && !fme.getPlayer().hasPermission("factions.show.bypassexempt")) { if (fme != null && fme.getPlayer() != null && !fme.getPlayer().hasPermission("factions.show.bypassexempt")) {
List<String> exemptFactions = SavageFactions.plugin.getConfig().getStringList("show-exempt"); List<String> exemptFactions = SaberFactions.plugin.getConfig().getStringList("show-exempt");
factionList.removeIf(next -> exemptFactions.contains(next.getTag())); factionList.removeIf(next -> exemptFactions.contains(next.getTag()));
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
public class CmdMoney extends FCommand { public class CmdMoney extends FCommand {
@ -41,7 +41,7 @@ public class CmdMoney extends FCommand {
@Override @Override
public void perform() { public void perform() {
this.commandChain.add(this); this.commandChain.add(this);
SavageFactions.plugin.cmdAutoHelp.execute(this.sender, this.args, this.commandChain); SaberFactions.plugin.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
} }
@Override @Override

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -39,7 +39,7 @@ public class CmdMoneyDeposit extends FCommand {
boolean success = Econ.transferMoney(fme, fme, faction, amount); boolean success = Econ.transferMoney(fme, fme, faction, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {
SavageFactions.plugin.log(ChatColor.stripColor(SavageFactions.plugin.txt.parse(TL.COMMAND_MONEYDEPOSIT_DEPOSITED.toString(), fme.getName(), Econ.moneyString(amount), faction.describeTo(null)))); SaberFactions.plugin.log(ChatColor.stripColor(SaberFactions.plugin.txt.parse(TL.COMMAND_MONEYDEPOSIT_DEPOSITED.toString(), fme.getName(), Econ.moneyString(amount), faction.describeTo(null))));
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -50,7 +50,7 @@ public class CmdMoneyTransferFf extends FCommand {
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {
String name = sender instanceof Player ? fme.getName() : sender.getName(); String name = sender instanceof Player ? fme.getName() : sender.getName();
SavageFactions.plugin.log(ChatColor.stripColor(SavageFactions.plugin.txt.parse(TL.COMMAND_MONEYTRANSFERFF_TRANSFER.toString(), name, Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); SaberFactions.plugin.log(ChatColor.stripColor(SaberFactions.plugin.txt.parse(TL.COMMAND_MONEYTRANSFERFF_TRANSFER.toString(), name, Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -49,7 +49,7 @@ public class CmdMoneyTransferFp extends FCommand {
boolean success = Econ.transferMoney(fme, from, to, amount); boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {
SavageFactions.plugin.log(ChatColor.stripColor(SavageFactions.plugin.txt.parse(TL.COMMAND_MONEYTRANSFERFP_TRANSFER.toString(), fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); SaberFactions.plugin.log(ChatColor.stripColor(SaberFactions.plugin.txt.parse(TL.COMMAND_MONEYTRANSFERFP_TRANSFER.toString(), fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -49,7 +49,7 @@ public class CmdMoneyTransferPf extends FCommand {
boolean success = Econ.transferMoney(fme, from, to, amount); boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {
SavageFactions.plugin.log(ChatColor.stripColor(SavageFactions.plugin.txt.parse(TL.COMMAND_MONEYTRANSFERPF_TRANSFER.toString(), fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); SaberFactions.plugin.log(ChatColor.stripColor(SaberFactions.plugin.txt.parse(TL.COMMAND_MONEYTRANSFERPF_TRANSFER.toString(), fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
} }
} }

View File

@ -1,8 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.SavageFactions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -54,7 +53,7 @@ public class CmdMoneyWithdraw extends FCommand {
boolean success = Econ.transferMoney(fme, faction, fme, amount); boolean success = Econ.transferMoney(fme, faction, fme, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {
SavageFactions.plugin.log(ChatColor.stripColor(SavageFactions.plugin.txt.parse(TL.COMMAND_MONEYWITHDRAW_WITHDRAW.toString(), fme.getName(), Econ.moneyString(amount), faction.describeTo(null)))); SaberFactions.plugin.log(ChatColor.stripColor(SaberFactions.plugin.txt.parse(TL.COMMAND_MONEYWITHDRAW_WITHDRAW.toString(), fme.getName(), Econ.moneyString(amount), faction.describeTo(null))));
} }
} }

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -26,12 +26,12 @@ public class CmdNear extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fnear.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fnear.Enabled")) {
fme.msg(TL.COMMAND_NEAR_DISABLED_MSG); fme.msg(TL.COMMAND_NEAR_DISABLED_MSG);
return; return;
} }
double range = SavageFactions.plugin.getConfig().getInt("fnear.Radius"); double range = SaberFactions.plugin.getConfig().getInt("fnear.Radius");
String format = TL.COMMAND_NEAR_FORMAT.toString(); String format = TL.COMMAND_NEAR_FORMAT.toString();
fme.msg(TL.COMMAND_NEAR_USE_MSG); fme.msg(TL.COMMAND_NEAR_USE_MSG);
for (Entity e : me.getNearbyEntities(range, 255, range)) { for (Entity e : me.getNearbyEntities(range, 255, range)) {

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -52,7 +52,7 @@ public class CmdOpen extends FCommand {
} }
fplayer.msg(TL.COMMAND_OPEN_CHANGED, myFaction.getTag(fplayer.getFaction()), open); fplayer.msg(TL.COMMAND_OPEN_CHANGED, myFaction.getTag(fplayer.getFaction()), open);
} }
fme.setCooldown("open", System.currentTimeMillis() + (SavageFactions.plugin.getConfig().getInt("fcooldowns.f-open") * 1000)); fme.setCooldown("open", System.currentTimeMillis() + (SaberFactions.plugin.getConfig().getInt("fcooldowns.f-open") * 1000));
} }
@Override @Override

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -23,7 +23,7 @@ public class CmdPaypalSee extends FCommand {
} }
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
return; return;
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -22,7 +22,7 @@ public class CmdPaypalSet extends FCommand {
} }
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
fme.msg(TL.GENERIC_DISABLED); fme.msg(TL.GENERIC_DISABLED);
return; return;
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
@ -105,7 +105,7 @@ public class CmdPerm extends FCommand {
} }
fme.msg(TL.COMMAND_PERM_SET, argAsString(1), access.name(), argAsString(0)); fme.msg(TL.COMMAND_PERM_SET, argAsString(1), access.name(), argAsString(0));
SavageFactions.plugin.log(String.format(TL.COMMAND_PERM_SET.toString(), argAsString(1), access.name(), argAsString(0)) + " for faction " + fme.getTag()); SaberFactions.plugin.log(String.format(TL.COMMAND_PERM_SET.toString(), argAsString(1), access.name(), argAsString(0)) + " for faction " + fme.getTag());
} }
private Permissable getPermissable(String name) { private Permissable getPermissable(String name) {

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -43,7 +43,7 @@ public class CmdPermanent extends FCommand {
faction.setPermanent(true); faction.setPermanent(true);
} }
SavageFactions.plugin.log((fme == null ? "A server admin" : fme.getName()) + " " + change + " the faction \"" + faction.getTag() + "\"."); SaberFactions.plugin.log((fme == null ? "A server admin" : fme.getName()) + " " + change + " the faction \"" + faction.getTag() + "\".");
// Inform all players // Inform all players
for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -77,7 +77,7 @@ public class CmdPowerBoost extends FCommand {
int roundedPower = (int) Math.round(targetPower); int roundedPower = (int) Math.round(targetPower);
msg(TL.COMMAND_POWERBOOST_BOOST, target, roundedPower); msg(TL.COMMAND_POWERBOOST_BOOST, target, roundedPower);
if (!senderIsConsole) { if (!senderIsConsole) {
SavageFactions.plugin.log(TL.COMMAND_POWERBOOST_BOOSTLOG.toString(), fme.getName(), target, roundedPower); SaberFactions.plugin.log(TL.COMMAND_POWERBOOST_BOOSTLOG.toString(), fme.getName(), target, roundedPower);
} }
} }

View File

@ -1,9 +1,8 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.Particles.ReflectionUtils;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
public class CmdReload extends FCommand { public class CmdReload extends FCommand {
@ -27,13 +26,13 @@ public class CmdReload extends FCommand {
long timeInitStart = System.currentTimeMillis(); long timeInitStart = System.currentTimeMillis();
Conf.load(); Conf.load();
Conf.save(); Conf.save();
SavageFactions.plugin.reloadConfig(); SaberFactions.plugin.reloadConfig();
SavageFactions.plugin.changeItemIDSInConfig(); SaberFactions.plugin.changeItemIDSInConfig();
SavageFactions.plugin.loadLang(); SaberFactions.plugin.loadLang();
if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) { if (SaberFactions.plugin.getConfig().getBoolean("enable-faction-flight")) {
SavageFactions.plugin.factionsFlight = true; SaberFactions.plugin.factionsFlight = true;
} }
long timeReload = (System.currentTimeMillis() - timeInitStart); long timeReload = (System.currentTimeMillis() - timeInitStart);

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -29,19 +29,19 @@ public class CmdRules extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("frules.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("frules.Enabled")) {
fme.msg(TL.COMMAND_RULES_DISABLED_MSG); fme.msg(TL.COMMAND_RULES_DISABLED_MSG);
return; return;
} }
if (this.args.size() == 0) { if (this.args.size() == 0) {
HashMap<Integer, String> rules = fme.getFaction().getRulesMap(); HashMap<Integer, String> rules = fme.getFaction().getRulesMap();
if (rules.size() == 0) { if (rules.size() == 0) {
List<String> ruleList = SavageFactions.plugin.getConfig().getStringList("frules.default-rules"); List<String> ruleList = SaberFactions.plugin.getConfig().getStringList("frules.default-rules");
fme.sendMessage(SavageFactions.plugin.colorList(ruleList)); fme.sendMessage(SaberFactions.plugin.colorList(ruleList));
} else { } else {
for (int i = 0; i <= rules.size() - 1; i++) { for (int i = 0; i <= rules.size() - 1; i++) {
fme.sendMessage(SavageFactions.plugin.color(rules.get(i))); fme.sendMessage(SaberFactions.plugin.color(rules.get(i)));
} }
} }

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -50,7 +50,7 @@ public class CmdSafeunclaimall extends FCommand {
msg(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMED); msg(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMED);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
SavageFactions.plugin.log(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMEDLOG.format(sender.getName())); SaberFactions.plugin.log(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMEDLOG.format(sender.getName()));
} }
} }

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.Particles.ParticleEffect; import com.massivecraft.factions.util.Particles.ParticleEffect;
import com.massivecraft.factions.util.VisualizeUtil; import com.massivecraft.factions.util.VisualizeUtil;
@ -40,7 +40,7 @@ public class CmdSeeChunk extends FCommand {
this.useParticles = p.getConfig().getBoolean("see-chunk.particles", true); this.useParticles = p.getConfig().getBoolean("see-chunk.particles", true);
interval = SavageFactions.plugin.getConfig().getLong("see-chunk.interval", 10L); interval = SaberFactions.plugin.getConfig().getLong("see-chunk.interval", 10L);
if (effect == null) { if (effect == null) {
effect = ParticleEffect.REDSTONE; effect = ParticleEffect.REDSTONE;
} }
@ -71,7 +71,7 @@ public class CmdSeeChunk extends FCommand {
} }
private void startTask() { private void startTask() {
taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> {
Iterator<String> itr = seeChunkMap.keySet().iterator(); Iterator<String> itr = seeChunkMap.keySet().iterator();
while (itr.hasNext()) { while (itr.hasNext()) {
Object nameObject = itr.next(); Object nameObject = itr.next();
@ -117,10 +117,10 @@ public class CmdSeeChunk extends FCommand {
continue; continue;
} }
if (useParticles) { if (useParticles) {
if (SavageFactions.plugin.useNonPacketParticles) { if (SaberFactions.plugin.useNonPacketParticles) {
// Dust options only exists in the 1.13 API, so we use an // Dust options only exists in the 1.13 API, so we use an
// alternative method to achieve this in lower versions. // alternative method to achieve this in lower versions.
if (SavageFactions.plugin.mc113) { if (SaberFactions.plugin.mc113) {
player.spawnParticle(Particle.REDSTONE, loc, 0, new Particle.DustOptions(Color.RED, 1)); player.spawnParticle(Particle.REDSTONE, loc, 0, new Particle.DustOptions(Color.RED, 1));
} else { } else {
player.getWorld().spawnParticle(Particle.REDSTONE, loc, 0, 255, 0, 0, 1); player.getWorld().spawnParticle(Particle.REDSTONE, loc, 0, 255, 0, 0, 1);
@ -132,7 +132,7 @@ public class CmdSeeChunk extends FCommand {
} else { } else {
Material type = blockY % 5 == 0 ? SavageFactions.plugin.REDSTONE_LAMP_ON : SavageFactions.plugin.STAINED_GLASS; Material type = blockY % 5 == 0 ? SaberFactions.plugin.REDSTONE_LAMP_ON : SaberFactions.plugin.STAINED_GLASS;
VisualizeUtil.addLocation(player, loc, type); VisualizeUtil.addLocation(player, loc, type);
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
@ -51,7 +51,7 @@ public class CmdSetFWarp extends FCommand {
// Checks if warp with same name already exists and ignores maxWarp check if it does. // Checks if warp with same name already exists and ignores maxWarp check if it does.
boolean warpExists = myFaction.isWarp(warp); boolean warpExists = myFaction.isWarp(warp);
int maxWarps = SavageFactions.plugin.getConfig().getInt("max-warps", 5); int maxWarps = SaberFactions.plugin.getConfig().getInt("max-warps", 5);
boolean tooManyWarps = maxWarps <= myFaction.getWarps().size(); boolean tooManyWarps = maxWarps <= myFaction.getWarps().size();
if (tooManyWarps && !warpExists) { if (tooManyWarps && !warpExists) {
fme.msg(TL.COMMAND_SETFWARP_LIMIT, maxWarps); fme.msg(TL.COMMAND_SETFWARP_LIMIT, maxWarps);
@ -73,7 +73,7 @@ public class CmdSetFWarp extends FCommand {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
return !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SavageFactions.plugin.getConfig().getDouble("warp-cost.setwarp", 5), TL.COMMAND_SETFWARP_TOSET.toString(), TL.COMMAND_SETFWARP_FORSET.toString()); return !SaberFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SaberFactions.plugin.getConfig().getDouble("warp-cost.setwarp", 5), TL.COMMAND_SETFWARP_TOSET.toString(), TL.COMMAND_SETFWARP_FORSET.toString());
} }
@Override @Override

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
import com.massivecraft.factions.zcore.util.TagReplacer; import com.massivecraft.factions.zcore.util.TagReplacer;
@ -57,7 +57,7 @@ public class CmdShow extends FCommand {
return; return;
if (fme != null && !fme.getPlayer().hasPermission("factions.show.bypassexempt") if (fme != null && !fme.getPlayer().hasPermission("factions.show.bypassexempt")
&& SavageFactions.plugin.getConfig().getStringList("show-exempt").contains(faction.getTag())) { && SaberFactions.plugin.getConfig().getStringList("show-exempt").contains(faction.getTag())) {
msg(TL.COMMAND_SHOW_EXEMPT); msg(TL.COMMAND_SHOW_EXEMPT);
return; return;
} }
@ -67,7 +67,7 @@ public class CmdShow extends FCommand {
return; return;
} }
List<String> show = SavageFactions.plugin.getConfig().getStringList("show"); List<String> show = SaberFactions.plugin.getConfig().getStringList("show");
if (show == null || show.isEmpty()) if (show == null || show.isEmpty())
show = defaults; show = defaults;

View File

@ -35,11 +35,11 @@ public class CmdStuck extends FCommand {
final Player player = fme.getPlayer(); final Player player = fme.getPlayer();
final Location sentAt = player.getLocation(); final Location sentAt = player.getLocation();
final FLocation chunk = fme.getLastStoodAt(); final FLocation chunk = fme.getLastStoodAt();
final long delay = SavageFactions.plugin.getConfig().getLong("hcf.stuck.delay", 30); final long delay = SaberFactions.plugin.getConfig().getLong("hcf.stuck.delay", 30);
final int radius = SavageFactions.plugin.getConfig().getInt("hcf.stuck.radius", 10); final int radius = SaberFactions.plugin.getConfig().getInt("hcf.stuck.radius", 10);
if (SavageFactions.plugin.getStuckMap().containsKey(player.getUniqueId())) { if (SaberFactions.plugin.getStuckMap().containsKey(player.getUniqueId())) {
long wait = SavageFactions.plugin.getTimers().get(player.getUniqueId()) - System.currentTimeMillis(); long wait = SaberFactions.plugin.getTimers().get(player.getUniqueId()) - System.currentTimeMillis();
String time = DurationFormatUtils.formatDuration(wait, TL.COMMAND_STUCK_TIMEFORMAT.toString(), true); String time = DurationFormatUtils.formatDuration(wait, TL.COMMAND_STUCK_TIMEFORMAT.toString(), true);
msg(TL.COMMAND_STUCK_EXISTS, time); msg(TL.COMMAND_STUCK_EXISTS, time);
} else { } else {
@ -49,11 +49,11 @@ public class CmdStuck extends FCommand {
return; return;
} }
final int id = Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, new BukkitRunnable() { final int id = Bukkit.getScheduler().runTaskLater(SaberFactions.plugin, new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (!SavageFactions.plugin.getStuckMap().containsKey(player.getUniqueId())) { if (!SaberFactions.plugin.getStuckMap().containsKey(player.getUniqueId())) {
return; return;
} }
@ -61,8 +61,8 @@ public class CmdStuck extends FCommand {
final World world = chunk.getWorld(); final World world = chunk.getWorld();
if (world.getUID() != player.getWorld().getUID() || sentAt.distance(player.getLocation()) > radius) { if (world.getUID() != player.getWorld().getUID() || sentAt.distance(player.getLocation()) > radius) {
msg(TL.COMMAND_STUCK_OUTSIDE.format(radius)); msg(TL.COMMAND_STUCK_OUTSIDE.format(radius));
SavageFactions.plugin.getTimers().remove(player.getUniqueId()); SaberFactions.plugin.getTimers().remove(player.getUniqueId());
SavageFactions.plugin.getStuckMap().remove(player.getUniqueId()); SaberFactions.plugin.getStuckMap().remove(player.getUniqueId());
return; return;
} }
@ -74,18 +74,18 @@ public class CmdStuck extends FCommand {
public boolean work() { public boolean work() {
FLocation chunk = currentFLocation(); FLocation chunk = currentFLocation();
Faction faction = board.getFactionAt(chunk); Faction faction = board.getFactionAt(chunk);
int buffer = SavageFactions.plugin.getConfig().getInt("world-border.buffer", 0); int buffer = SaberFactions.plugin.getConfig().getInt("world-border.buffer", 0);
if (faction.isWilderness() && !chunk.isOutsideWorldBorder(buffer)) { if (faction.isWilderness() && !chunk.isOutsideWorldBorder(buffer)) {
int cx = FLocation.chunkToBlock((int) chunk.getX()); int cx = FLocation.chunkToBlock((int) chunk.getX());
int cz = FLocation.chunkToBlock((int) chunk.getZ()); int cz = FLocation.chunkToBlock((int) chunk.getZ());
int y = world.getHighestBlockYAt(cx, cz); int y = world.getHighestBlockYAt(cx, cz);
Location tp = new Location(world, cx, y, cz); Location tp = new Location(world, cx, y, cz);
msg(TL.COMMAND_STUCK_TELEPORT, tp.getBlockX(), tp.getBlockY(), tp.getBlockZ()); msg(TL.COMMAND_STUCK_TELEPORT, tp.getBlockX(), tp.getBlockY(), tp.getBlockZ());
SavageFactions.plugin.getTimers().remove(player.getUniqueId()); SaberFactions.plugin.getTimers().remove(player.getUniqueId());
SavageFactions.plugin.getStuckMap().remove(player.getUniqueId()); SaberFactions.plugin.getStuckMap().remove(player.getUniqueId());
if (!Essentials.handleTeleport(player, tp)) { if (!Essentials.handleTeleport(player, tp)) {
player.teleport(tp); player.teleport(tp);
SavageFactions.plugin.debug("/f stuck used regular teleport, not essentials!"); SaberFactions.plugin.debug("/f stuck used regular teleport, not essentials!");
} }
this.stop(); this.stop();
return false; return false;
@ -96,11 +96,11 @@ public class CmdStuck extends FCommand {
} }
}, delay * 20).getTaskId(); }, delay * 20).getTaskId();
SavageFactions.plugin.getTimers().put(player.getUniqueId(), System.currentTimeMillis() + (delay * 1000)); SaberFactions.plugin.getTimers().put(player.getUniqueId(), System.currentTimeMillis() + (delay * 1000));
long wait = SavageFactions.plugin.getTimers().get(player.getUniqueId()) - System.currentTimeMillis(); long wait = SaberFactions.plugin.getTimers().get(player.getUniqueId()) - System.currentTimeMillis();
String time = DurationFormatUtils.formatDuration(wait, TL.COMMAND_STUCK_TIMEFORMAT.toString(), true); String time = DurationFormatUtils.formatDuration(wait, TL.COMMAND_STUCK_TIMEFORMAT.toString(), true);
msg(TL.COMMAND_STUCK_START, time); msg(TL.COMMAND_STUCK_START, time);
SavageFactions.plugin.getStuckMap().put(player.getUniqueId(), id); SaberFactions.plugin.getStuckMap().put(player.getUniqueId(), id);
} }
} }

View File

@ -86,7 +86,7 @@ public class CmdTag extends FCommand {
fplayer.msg(TL.COMMAND_TAG_CHANGED, fme.getColorTo(faction) + oldtag, myFaction.getTag(faction)); fplayer.msg(TL.COMMAND_TAG_CHANGED, fme.getColorTo(faction) + oldtag, myFaction.getTag(faction));
} }
} }
fme.setCooldown("tag", System.currentTimeMillis() + (SavageFactions.plugin.getConfig().getInt("fcooldowns.f-tag") * 1000)); fme.setCooldown("tag", System.currentTimeMillis() + (SaberFactions.plugin.getConfig().getInt("fcooldowns.f-tag") * 1000));
FTeamWrapper.updatePrefixes(myFaction); FTeamWrapper.updatePrefixes(myFaction);
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
@ -32,7 +32,7 @@ public class CmdTnt extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("ftnt.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("ftnt.Enabled")) {
fme.msg(TL.COMMAND_TNT_DISABLED_MSG); fme.msg(TL.COMMAND_TNT_DISABLED_MSG);
return; return;
} }
@ -73,7 +73,7 @@ public class CmdTnt extends FCommand {
return; return;
} }
ItemStack tnt = new ItemStack(Material.TNT, amount); ItemStack tnt = new ItemStack(Material.TNT, amount);
if (fme.getFaction().getTnt() + amount > SavageFactions.plugin.getConfig().getInt("ftnt.Bank-Limit")) { if (fme.getFaction().getTnt() + amount > SaberFactions.plugin.getConfig().getInt("ftnt.Bank-Limit")) {
msg(TL.COMMAND_TNT_EXCEEDLIMIT); msg(TL.COMMAND_TNT_EXCEEDLIMIT);
return; return;
} }
@ -82,7 +82,7 @@ public class CmdTnt extends FCommand {
fme.getFaction().addTnt(amount); fme.getFaction().addTnt(amount);
fme.msg(TL.COMMAND_TNT_DEPOSIT_SUCCESS); fme.msg(TL.COMMAND_TNT_DEPOSIT_SUCCESS);
fme.sendMessage(SavageFactions.plugin.color(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", fme.getFaction().getTnt() + ""))); fme.sendMessage(SaberFactions.plugin.color(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", fme.getFaction().getTnt() + "")));
return; return;
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
@ -35,7 +35,7 @@ public class CmdTntFill extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("Tntfill.enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("Tntfill.enabled")) {
this.fme.msg(TL.GENERIC_DISABLED); this.fme.msg(TL.GENERIC_DISABLED);
return; return;
} }
@ -51,12 +51,12 @@ public class CmdTntFill extends FCommand {
msg(TL.COMMAND_TNTFILL_HEADER); msg(TL.COMMAND_TNTFILL_HEADER);
int radius = argAsInt(0, 16); int radius = argAsInt(0, 16);
int amount = argAsInt(1, 16); int amount = argAsInt(1, 16);
if (radius > SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius")) { if (radius > SaberFactions.plugin.getConfig().getInt("Tntfill.max-radius")) {
fme.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius") + "")); fme.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", SaberFactions.plugin.getConfig().getInt("Tntfill.max-radius") + ""));
return; return;
} }
if (amount > SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount")) { if (amount > SaberFactions.plugin.getConfig().getInt("Tntfill.max-amount")) {
fme.msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount") + "")); fme.msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", SaberFactions.plugin.getConfig().getInt("Tntfill.max-amount") + ""));
return; return;
} }
@ -181,7 +181,7 @@ public class CmdTntFill extends FCommand {
return; return;
} }
ItemStack tnt = new ItemStack(Material.TNT, amount); ItemStack tnt = new ItemStack(Material.TNT, amount);
if (fme.getFaction().getTnt() + amount > SavageFactions.plugin.getConfig().getInt("ftnt.Bank-Limit")) { if (fme.getFaction().getTnt() + amount > SaberFactions.plugin.getConfig().getInt("ftnt.Bank-Limit")) {
msg(TL.COMMAND_TNT_EXCEEDLIMIT); msg(TL.COMMAND_TNT_EXCEEDLIMIT);
return; return;
} }

View File

@ -1,8 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.listeners.FactionsBlockListener; import com.massivecraft.factions.listeners.FactionsBlockListener;
import com.massivecraft.factions.listeners.FactionsPlayerListener;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.WarmUpUtil; import com.massivecraft.factions.util.WarmUpUtil;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
@ -26,7 +25,7 @@ public class CmdTpBanner extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) {
return; return;
} }

View File

@ -84,7 +84,7 @@ public class CmdUnclaim extends FCommand {
msg(TL.COMMAND_UNCLAIM_SAFEZONE_SUCCESS); msg(TL.COMMAND_UNCLAIM_SAFEZONE_SUCCESS);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
SavageFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag())); SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
} }
return true; return true;
} else { } else {
@ -97,7 +97,7 @@ public class CmdUnclaim extends FCommand {
msg(TL.COMMAND_UNCLAIM_WARZONE_SUCCESS); msg(TL.COMMAND_UNCLAIM_WARZONE_SUCCESS);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
SavageFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag())); SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
} }
return true; return true;
} else { } else {
@ -119,7 +119,7 @@ public class CmdUnclaim extends FCommand {
msg(TL.COMMAND_UNCLAIM_UNCLAIMS); msg(TL.COMMAND_UNCLAIM_UNCLAIMS);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
SavageFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag())); SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
} }
return true; return true;
@ -170,7 +170,7 @@ public class CmdUnclaim extends FCommand {
myFaction.msg(TL.COMMAND_UNCLAIM_FACTIONUNCLAIMED, fme.describeTo(myFaction, true)); myFaction.msg(TL.COMMAND_UNCLAIM_FACTIONUNCLAIMED, fme.describeTo(myFaction, true));
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
SavageFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag())); SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
} }
return true; return true;

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.event.LandUnclaimAllEvent; import com.massivecraft.factions.event.LandUnclaimAllEvent;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -53,7 +53,7 @@ public class CmdUnclaimall extends FCommand {
myFaction.msg(TL.COMMAND_UNCLAIMALL_UNCLAIMED, fme.describeTo(myFaction, true)); myFaction.msg(TL.COMMAND_UNCLAIMALL_UNCLAIMED, fme.describeTo(myFaction, true));
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
SavageFactions.plugin.log(TL.COMMAND_UNCLAIMALL_LOG.format(fme.getName(), myFaction.getTag())); SaberFactions.plugin.log(TL.COMMAND_UNCLAIMALL_LOG.format(fme.getName(), myFaction.getTag()));
} }
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.fupgrades.FUpgradesGUI; import com.massivecraft.factions.zcore.fupgrades.FUpgradesGUI;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
@ -26,7 +26,7 @@ public class CmdUpgrades extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fupgrades.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fupgrades.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction; import com.massivecraft.factions.zcore.fperms.PermissableAction;
@ -33,7 +33,7 @@ public class CmdVault extends FCommand {
@Override @Override
public void perform() { public void perform() {
if (!SavageFactions.plugin.getConfig().getBoolean("fvault.Enabled")) { if (!SaberFactions.plugin.getConfig().getBoolean("fvault.Enabled")) {
fme.sendMessage("This command is disabled!"); fme.sendMessage("This command is disabled!");
return; return;
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
@ -25,8 +25,8 @@ public class CmdVersion extends FCommand {
@Override @Override
public void perform() { public void perform() {
msg(TL.COMMAND_VERSION_NAME); // Did this so people can differentiate between SavageFactions and FactionsUUID (( Requested Feature )) msg(TL.COMMAND_VERSION_NAME); // Did this so people can differentiate between SaberFactions and FactionsUUID (( Requested Feature ))
msg(TL.COMMAND_VERSION_VERSION, SavageFactions.plugin.getDescription().getFullName()); msg(TL.COMMAND_VERSION_VERSION, SaberFactions.plugin.getDescription().getFullName());
} }
@Override @Override

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
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;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -49,7 +49,7 @@ public class CmdWarunclaimall extends FCommand {
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
SavageFactions.plugin.log(TL.COMMAND_WARUNCLAIMALL_LOG.format(fme.getName())); SaberFactions.plugin.log(TL.COMMAND_WARUNCLAIMALL_LOG.format(fme.getName()));
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -228,35 +228,35 @@ public class FCmdRoot extends FCommand {
this.addSubCommand(this.cmdCorner); this.addSubCommand(this.cmdCorner);
if(SavageFactions.plugin.getConfig().getBoolean("f-alts.Enabled")){ if(SaberFactions.plugin.getConfig().getBoolean("f-alts.Enabled")){
this.addSubCommand(cmdAlts); this.addSubCommand(cmdAlts);
} }
if (SavageFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) { if (SaberFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) {
this.addSubCommand(this.cmdGrace); this.addSubCommand(this.cmdGrace);
} }
if (Bukkit.getServer().getPluginManager().getPlugin("CoreProtect") != null) { if (Bukkit.getServer().getPluginManager().getPlugin("CoreProtect") != null) {
SavageFactions.plugin.log("Found CoreProtect, enabling Inspect"); SaberFactions.plugin.log("Found CoreProtect, enabling Inspect");
this.addSubCommand(this.cmdInspect); this.addSubCommand(this.cmdInspect);
} else { } else {
SavageFactions.plugin.log("CoreProtect not found, disabling Inspect"); SaberFactions.plugin.log("CoreProtect not found, disabling Inspect");
} }
if (SavageFactions.plugin.getConfig().getBoolean("ffocus.Enabled")) { if (SaberFactions.plugin.getConfig().getBoolean("ffocus.Enabled")) {
addSubCommand(this.cmdFocus); addSubCommand(this.cmdFocus);
} }
if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight", false)) { if (SaberFactions.plugin.getConfig().getBoolean("enable-faction-flight", false)) {
this.addSubCommand(this.cmdFly); this.addSubCommand(this.cmdFly);
} }
if (Bukkit.getServer().getPluginManager().getPlugin("FactionsTop") != null || Bukkit.getServer().getPluginManager().getPlugin("SavageFTOP") != null) { if (Bukkit.getServer().getPluginManager().getPlugin("FactionsTop") != null || Bukkit.getServer().getPluginManager().getPlugin("SavageFTOP") != null) {
SavageFactions.plugin.log(Level.INFO, "Found FactionsTop plugin. Disabling our own /f top command."); SaberFactions.plugin.log(Level.INFO, "Found FactionsTop plugin. Disabling our own /f top command.");
} else { } else {
SavageFactions.plugin.log(Level.INFO, "Enabling FactionsTop command, this is a very basic /f top please get a dedicated /f top resource if you want land calculation etc."); SaberFactions.plugin.log(Level.INFO, "Enabling FactionsTop command, this is a very basic /f top please get a dedicated /f top resource if you want land calculation etc.");
this.addSubCommand(this.cmdTop); this.addSubCommand(this.cmdTop);
} }
if (SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) { if (SaberFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
this.addSubCommand(this.cmdPaypalSet); this.addSubCommand(this.cmdPaypalSet);
this.addSubCommand(this.cmdPaypalSee); this.addSubCommand(this.cmdPaypalSee);
} }

View File

@ -13,7 +13,7 @@ import java.text.SimpleDateFormat;
import java.util.List; import java.util.List;
public abstract class FCommand extends MCommand<SavageFactions> { public abstract class FCommand extends MCommand<SaberFactions> {
public static final SimpleDateFormat sdf = new SimpleDateFormat(TL.DATE_FORMAT.toString()); public static final SimpleDateFormat sdf = new SimpleDateFormat(TL.DATE_FORMAT.toString());
@ -31,7 +31,7 @@ public abstract class FCommand extends MCommand<SavageFactions> {
public boolean isMoneyCommand; public boolean isMoneyCommand;
public FCommand() { public FCommand() {
super(SavageFactions.plugin); super(SaberFactions.plugin);
// Due to safety reasons it defaults to disable on lock. // Due to safety reasons it defaults to disable on lock.
disableOnLock = true; disableOnLock = true;

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.event.FactionRelationEvent; import com.massivecraft.factions.event.FactionRelationEvent;
import com.massivecraft.factions.event.FactionRelationWishEvent; import com.massivecraft.factions.event.FactionRelationWishEvent;
import com.massivecraft.factions.scoreboards.FTeamWrapper; import com.massivecraft.factions.scoreboards.FTeamWrapper;
@ -103,8 +103,8 @@ public abstract class FRelationCommand extends FCommand {
} }
private boolean hasMaxRelations(Faction them, Relation targetRelation) { private boolean hasMaxRelations(Faction them, Relation targetRelation) {
int max = SavageFactions.plugin.getConfig().getInt("max-relations." + targetRelation.toString(), -1); int max = SaberFactions.plugin.getConfig().getInt("max-relations." + targetRelation.toString(), -1);
if (SavageFactions.plugin.getConfig().getBoolean("max-relations.enabled", false)) { if (SaberFactions.plugin.getConfig().getBoolean("max-relations.enabled", false)) {
if (max != -1) { if (max != -1) {
if (myFaction.getRelationCount(targetRelation) >= max) { if (myFaction.getRelationCount(targetRelation) >= max) {
msg(TL.COMMAND_RELATIONS_EXCEEDS_ME, max, targetRelation.getPluralTranslation()); msg(TL.COMMAND_RELATIONS_EXCEEDS_ME, max, targetRelation.getPluralTranslation());

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.integration;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
@ -34,24 +34,24 @@ public class Econ {
String integrationFail = "Economy integration is " + (Conf.econEnabled ? "enabled, but" : "disabled, and") + " the plugin \"Vault\" "; String integrationFail = "Economy integration is " + (Conf.econEnabled ? "enabled, but" : "disabled, and") + " the plugin \"Vault\" ";
if (Bukkit.getServer().getPluginManager().getPlugin("Vault") == null) { if (Bukkit.getServer().getPluginManager().getPlugin("Vault") == null) {
SavageFactions.plugin.log(integrationFail + "is not installed."); SaberFactions.plugin.log(integrationFail + "is not installed.");
return; return;
} }
RegisteredServiceProvider<Economy> rsp = Bukkit.getServer().getServicesManager().getRegistration(Economy.class); RegisteredServiceProvider<Economy> rsp = Bukkit.getServer().getServicesManager().getRegistration(Economy.class);
if (rsp == null) { if (rsp == null) {
SavageFactions.plugin.log(integrationFail + "is not hooked into an economy plugin."); SaberFactions.plugin.log(integrationFail + "is not hooked into an economy plugin.");
return; return;
} }
econ = rsp.getProvider(); econ = rsp.getProvider();
SavageFactions.plugin.log("Economy integration through Vault plugin successful."); SaberFactions.plugin.log("Economy integration through Vault plugin successful.");
if (!Conf.econEnabled) { if (!Conf.econEnabled) {
SavageFactions.plugin.log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true"); SaberFactions.plugin.log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true");
} }
SavageFactions.plugin.cmdBase.cmdHelp.updateHelp(); SaberFactions.plugin.cmdBase.cmdHelp.updateHelp();
} }
public static boolean shouldBeUsed() { public static boolean shouldBeUsed() {
@ -82,7 +82,7 @@ public class Econ {
public static void sendBalanceInfo(FPlayer to, EconomyParticipator about) { public static void sendBalanceInfo(FPlayer to, EconomyParticipator about) {
if (!shouldBeUsed()) { if (!shouldBeUsed()) {
SavageFactions.plugin.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin."); SaberFactions.plugin.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
return; return;
} }
to.msg("<a>%s's<i> balance is <h>%s<i>.", about.describeTo(to, true), Econ.moneyString(econ.getBalance(about.getAccountId()))); to.msg("<a>%s's<i> balance is <h>%s<i>.", about.describeTo(to, true), Econ.moneyString(econ.getBalance(about.getAccountId())));

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.integration; package com.massivecraft.factions.integration;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
@ -38,11 +38,11 @@ public class Worldguard {
if (wgplug == null || !(wgplug instanceof WorldGuardPlugin)) { if (wgplug == null || !(wgplug instanceof WorldGuardPlugin)) {
enabled = false; enabled = false;
wg = null; wg = null;
SavageFactions.plugin.log("Could not hook to WorldGuard. WorldGuard checks are disabled."); SaberFactions.plugin.log("Could not hook to WorldGuard. WorldGuard checks are disabled.");
} else { } else {
wg = (WorldGuardPlugin) wgplug; wg = (WorldGuardPlugin) wgplug;
enabled = true; enabled = true;
SavageFactions.plugin.log("Successfully hooked to WorldGuard."); SaberFactions.plugin.log("Successfully hooked to WorldGuard.");
} }
} }

View File

@ -113,7 +113,7 @@ public class EngineDynmap {
} }
// Shedule non thread safe sync at the end! // Shedule non thread safe sync at the end!
Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> {
final Map<String, TempMarker> homes = createHomes(); final Map<String, TempMarker> homes = createHomes();
final Map<String, TempAreaMarker> areas = createAreas(); final Map<String, TempAreaMarker> areas = createAreas();

View File

@ -86,7 +86,7 @@ public class FactionsBlockListener implements Listener {
return false; return false;
} else if (!otherFaction.getId().equals(myFaction.getId())) { // If the faction target is not my own } else if (!otherFaction.getId().equals(myFaction.getId())) { // If the faction target is not my own
if (SavageFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && otherFaction.getLandRounded() > otherFaction.getPowerRounded()) if (SaberFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && otherFaction.getLandRounded() > otherFaction.getPowerRounded())
return true; return true;
// Get faction pain build access relation to me // Get faction pain build access relation to me
boolean pain = !justCheck && otherFaction.getAccess(me, PermissableAction.PAIN_BUILD) == Access.ALLOW; boolean pain = !justCheck && otherFaction.getAccess(me, PermissableAction.PAIN_BUILD) == Access.ALLOW;
@ -173,7 +173,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onVaultPlace(BlockPlaceEvent e) { public void onVaultPlace(BlockPlaceEvent e) {
if (e.getItemInHand().getType() == Material.CHEST) { if (e.getItemInHand().getType() == Material.CHEST) {
ItemStack vault = SavageFactions.plugin.createItem(Material.CHEST, 1, (short) 0, SavageFactions.plugin.color(SavageFactions.plugin.getConfig().getString("fvault.Item.Name")), SavageFactions.plugin.colorList(SavageFactions.plugin.getConfig().getStringList("fvault.Item.Lore"))); ItemStack vault = SaberFactions.plugin.createItem(Material.CHEST, 1, (short) 0, SaberFactions.plugin.color(SaberFactions.plugin.getConfig().getString("fvault.Item.Name")), SaberFactions.plugin.colorList(SaberFactions.plugin.getConfig().getStringList("fvault.Item.Lore")));
if (e.getItemInHand().isSimilar(vault)) { if (e.getItemInHand().isSimilar(vault)) {
FPlayer fme = FPlayers.getInstance().getByPlayer(e.getPlayer()); FPlayer fme = FPlayers.getInstance().getByPlayer(e.getPlayer());
if (fme.getFaction().getVault() != null) { if (fme.getFaction().getVault() != null) {
@ -199,7 +199,7 @@ public class FactionsBlockListener implements Listener {
Material blockMaterial = blockLoc.getBlock().getType(); Material blockMaterial = blockLoc.getBlock().getType();
if (blockMaterial == Material.CHEST || (SavageFactions.plugin.getConfig().getBoolean("fvault.No-Hoppers-near-vault") && blockMaterial == Material.HOPPER)) { if (blockMaterial == Material.CHEST || (SaberFactions.plugin.getConfig().getBoolean("fvault.No-Hoppers-near-vault") && blockMaterial == Material.HOPPER)) {
e.setCancelled(true); e.setCancelled(true);
fme.msg(TL.COMMAND_GETVAULT_CHESTNEAR); fme.msg(TL.COMMAND_GETVAULT_CHESTNEAR);
return; return;
@ -218,7 +218,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onHopperPlace(BlockPlaceEvent e) { public void onHopperPlace(BlockPlaceEvent e) {
if (e.getItemInHand().getType() != Material.HOPPER && !SavageFactions.plugin.getConfig().getBoolean("fvault.No-Hoppers-near-vault")) { if (e.getItemInHand().getType() != Material.HOPPER && !SaberFactions.plugin.getConfig().getBoolean("fvault.No-Hoppers-near-vault")) {
return; return;
} }
@ -265,7 +265,7 @@ public class FactionsBlockListener implements Listener {
Faction otherFaction = Board.getInstance().getFactionAt(new FLocation(targetLoc)); Faction otherFaction = Board.getInstance().getFactionAt(new FLocation(targetLoc));
// Check if the piston is moving in a faction's territory. This disables pistons entirely in faction territory. // Check if the piston is moving in a faction's territory. This disables pistons entirely in faction territory.
if (otherFaction.isNormal() && SavageFactions.plugin.getConfig().getBoolean("disable-pistons-in-territory", false)) { if (otherFaction.isNormal() && SaberFactions.plugin.getConfig().getBoolean("disable-pistons-in-territory", false)) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -284,21 +284,21 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onBannerPlace(BlockPlaceEvent e) { public void onBannerPlace(BlockPlaceEvent e) {
if (SavageFactions.plugin.mc17) { if (SaberFactions.plugin.mc17) {
return; return;
} }
if (e.getItemInHand().getType() == SavageFactions.plugin.BANNER) { if (e.getItemInHand().getType() == SaberFactions.plugin.BANNER) {
ItemStack bannerInHand = e.getItemInHand(); ItemStack bannerInHand = e.getItemInHand();
FPlayer fme = FPlayers.getInstance().getByPlayer(e.getPlayer()); FPlayer fme = FPlayers.getInstance().getByPlayer(e.getPlayer());
ItemStack warBanner = fme.getFaction().getBanner(); ItemStack warBanner = fme.getFaction().getBanner();
if (warBanner != null) { if (warBanner != null) {
ItemMeta warmeta = warBanner.getItemMeta(); ItemMeta warmeta = warBanner.getItemMeta();
warmeta.setDisplayName(SavageFactions.plugin.color(SavageFactions.plugin.getConfig().getString("fbanners.Item.Name"))); warmeta.setDisplayName(SaberFactions.plugin.color(SaberFactions.plugin.getConfig().getString("fbanners.Item.Name")));
warmeta.setLore(SavageFactions.plugin.colorList(SavageFactions.plugin.getConfig().getStringList("fbanners.Item.Lore"))); warmeta.setLore(SaberFactions.plugin.colorList(SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore")));
warBanner.setItemMeta(warmeta); warBanner.setItemMeta(warmeta);
} else { } else {
warBanner = SavageFactions.plugin.createItem(SavageFactions.plugin.BANNER, 1, (short) 1, SavageFactions.plugin.getConfig().getString("fbanners.Item.Name"), SavageFactions.plugin.getConfig().getStringList("fbanners.Item.Lore")); warBanner = SaberFactions.plugin.createItem(SaberFactions.plugin.BANNER, 1, (short) 1, SaberFactions.plugin.getConfig().getString("fbanners.Item.Name"), SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore"));
} }
if (warBanner.isSimilar(bannerInHand)) { if (warBanner.isSimilar(bannerInHand)) {
@ -307,12 +307,12 @@ public class FactionsBlockListener implements Listener {
e.setCancelled(true); e.setCancelled(true);
return; return;
} }
int bannerTime = SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Time") * 20; int bannerTime = SaberFactions.plugin.getConfig().getInt("fbanners.Banner-Time") * 20;
Location placedLoc = e.getBlockPlaced().getLocation(); Location placedLoc = e.getBlockPlaced().getLocation();
FLocation fplacedLoc = new FLocation(placedLoc); FLocation fplacedLoc = new FLocation(placedLoc);
if ((Board.getInstance().getFactionAt(fplacedLoc).isWarZone() && SavageFactions.plugin.getConfig().getBoolean("fbanners.Placeable.Warzone")) if ((Board.getInstance().getFactionAt(fplacedLoc).isWarZone() && SaberFactions.plugin.getConfig().getBoolean("fbanners.Placeable.Warzone"))
|| (fme.getFaction().getRelationTo(Board.getInstance().getFactionAt(fplacedLoc)) == Relation.ENEMY) && SavageFactions.plugin.getConfig().getBoolean("fbanners.Placeable.Enemy")) { || (fme.getFaction().getRelationTo(Board.getInstance().getFactionAt(fplacedLoc)) == Relation.ENEMY) && SaberFactions.plugin.getConfig().getBoolean("fbanners.Placeable.Enemy")) {
if (bannerCooldownMap.containsKey(fme.getTag())) { if (bannerCooldownMap.containsKey(fme.getTag())) {
fme.msg(TL.WARBANNER_COOLDOWN); fme.msg(TL.WARBANNER_COOLDOWN);
e.setCancelled(true); e.setCancelled(true);
@ -320,29 +320,29 @@ public class FactionsBlockListener implements Listener {
} }
for (FPlayer fplayer : fme.getFaction().getFPlayers()) { for (FPlayer fplayer : fme.getFaction().getFPlayers()) {
// if (fplayer == fme) { continue; } //Idk if I wanna not send the title to the player // if (fplayer == fme) { continue; } //Idk if I wanna not send the title to the player
fplayer.getPlayer().sendTitle(SavageFactions.plugin.color(fme.getTag() + " Placed A WarBanner!"), SavageFactions.plugin.color("&7use &c/f tpbanner&7 to tp to the banner!"), 10, 70, 20); fplayer.getPlayer().sendTitle(SaberFactions.plugin.color(fme.getTag() + " Placed A WarBanner!"), SaberFactions.plugin.color("&7use &c/f tpbanner&7 to tp to the banner!"), 10, 70, 20);
} }
bannerCooldownMap.put(fme.getTag(), true); bannerCooldownMap.put(fme.getTag(), true);
bannerLocations.put(fme.getTag(), e.getBlockPlaced().getLocation()); bannerLocations.put(fme.getTag(), e.getBlockPlaced().getLocation());
int bannerCooldown = SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Place-Cooldown"); int bannerCooldown = SaberFactions.plugin.getConfig().getInt("fbanners.Banner-Place-Cooldown");
ArmorStand as = (ArmorStand) e.getBlockPlaced().getLocation().add(0.5, 1, 0.5).getWorld().spawnEntity(e.getBlockPlaced().getLocation().add(0.5, 1, 0.5), EntityType.ARMOR_STAND); //Spawn the ArmorStand ArmorStand as = (ArmorStand) e.getBlockPlaced().getLocation().add(0.5, 1, 0.5).getWorld().spawnEntity(e.getBlockPlaced().getLocation().add(0.5, 1, 0.5), EntityType.ARMOR_STAND); //Spawn the ArmorStand
as.setVisible(false); //Makes the ArmorStand invisible as.setVisible(false); //Makes the ArmorStand invisible
as.setGravity(false); //Make sure it doesn't fall as.setGravity(false); //Make sure it doesn't fall
as.setCanPickupItems(false); //I'm not sure what happens if you leave this as it is, but you might as well disable it as.setCanPickupItems(false); //I'm not sure what happens if you leave this as it is, but you might as well disable it
as.setCustomName(SavageFactions.plugin.color(SavageFactions.plugin.getConfig().getString("fbanners.BannerHolo").replace("{Faction}", fme.getTag()))); //Set this to the text you want as.setCustomName(SaberFactions.plugin.color(SaberFactions.plugin.getConfig().getString("fbanners.BannerHolo").replace("{Faction}", fme.getTag()))); //Set this to the text you want
as.setCustomNameVisible(true); //This makes the text appear no matter if your looking at the entity or not as.setCustomNameVisible(true); //This makes the text appear no matter if your looking at the entity or not
ArmorStand armorStand = as; ArmorStand armorStand = as;
String tag = fme.getTag(); String tag = fme.getTag();
Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> bannerCooldownMap.remove(tag), Long.parseLong(bannerCooldown + "")); Bukkit.getScheduler().scheduleSyncDelayedTask(SaberFactions.plugin, () -> bannerCooldownMap.remove(tag), Long.parseLong(bannerCooldown + ""));
Block banner = e.getBlockPlaced(); Block banner = e.getBlockPlaced();
Material bannerType = banner.getType(); Material bannerType = banner.getType();
Faction bannerFaction = fme.getFaction(); Faction bannerFaction = fme.getFaction();
banner.getWorld().strikeLightningEffect(banner.getLocation()); banner.getWorld().strikeLightningEffect(banner.getLocation());
// e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.ENTITY_LIGHTNING_IMPACT,2.0F,0.5F); // e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.ENTITY_LIGHTNING_IMPACT,2.0F,0.5F);
int radius = SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Effect-Radius"); int radius = SaberFactions.plugin.getConfig().getInt("fbanners.Banner-Effect-Radius");
List<String> effects = SavageFactions.plugin.getConfig().getStringList("fbanners.Effects"); List<String> effects = SaberFactions.plugin.getConfig().getStringList("fbanners.Effects");
int affectorTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { int affectorTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> {
for (Entity e1 : banner.getLocation().getWorld().getNearbyEntities(banner.getLocation(), radius, 255, radius)) { for (Entity e1 : banner.getLocation().getWorld().getNearbyEntities(banner.getLocation(), radius, 255, radius)) {
if (e1 instanceof Player) { if (e1 instanceof Player) {
@ -363,7 +363,7 @@ public class FactionsBlockListener implements Listener {
} }
} }
}, 0L, 20L); }, 0L, 20L);
Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> { Bukkit.getScheduler().scheduleSyncDelayedTask(SaberFactions.plugin, () -> {
banner.setType(Material.AIR); banner.setType(Material.AIR);
as.remove(); as.remove();
banner.getWorld().strikeLightningEffect(banner.getLocation()); banner.getWorld().strikeLightningEffect(banner.getLocation());
@ -402,7 +402,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onFallingBlock(EntityChangeBlockEvent event) { public void onFallingBlock(EntityChangeBlockEvent event) {
if(!SavageFactions.plugin.getConfig().getBoolean("Falling-Block-Fix.Enabled")) if(!SaberFactions.plugin.getConfig().getBoolean("Falling-Block-Fix.Enabled"))
return; return;
Faction faction = Board.getInstance().getFactionAt(new FLocation(event.getBlock())); Faction faction = Board.getInstance().getFactionAt(new FLocation(event.getBlock()));
@ -415,7 +415,7 @@ public class FactionsBlockListener implements Listener {
//Grace //Grace
@EventHandler @EventHandler
public void onBreak(EntityExplodeEvent e) { public void onBreak(EntityExplodeEvent e) {
if (!SavageFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) if (!SaberFactions.plugin.getConfig().getBoolean("f-grace.Enabled"))
return; return;
if (!graceisEnabled()) { if (!graceisEnabled()) {
@ -425,7 +425,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void entityDamage(EntityDamageEvent e) { public void entityDamage(EntityDamageEvent e) {
if (!SavageFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) if (!SaberFactions.plugin.getConfig().getBoolean("f-grace.Enabled"))
return; return;
if (!graceisEnabled()) { if (!graceisEnabled()) {
@ -440,7 +440,7 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onTNTPlace(BlockPlaceEvent e1) { public void onTNTPlace(BlockPlaceEvent e1) {
FPlayer fp = FPlayers.getInstance().getByPlayer(e1.getPlayer()); FPlayer fp = FPlayers.getInstance().getByPlayer(e1.getPlayer());
if (!SavageFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) if (!SaberFactions.plugin.getConfig().getBoolean("f-grace.Enabled"))
return; return;
if (!graceisEnabled() && !fp.isAdminBypassing()) { if (!graceisEnabled() && !fp.isAdminBypassing()) {
@ -491,7 +491,7 @@ public class FactionsBlockListener implements Listener {
if (!fme.hasFaction()) { if (!fme.hasFaction()) {
return; return;
} }
if (event.getBlock().getType() == SavageFactions.plugin.MOB_SPANWER) { if (event.getBlock().getType() == SaberFactions.plugin.MOB_SPANWER) {
if (!fme.isAdminBypassing()) { if (!fme.isAdminBypassing()) {
Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER); Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) { if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {

View File

@ -180,9 +180,9 @@ public class FactionsChatListener implements Listener {
listeningPlayer.sendMessage(String.format(yourFormat, talkingPlayer.getDisplayName(), msg)); listeningPlayer.sendMessage(String.format(yourFormat, talkingPlayer.getDisplayName(), msg));
} catch (UnknownFormatConversionException ex) { } catch (UnknownFormatConversionException ex) {
Conf.chatTagInsertIndex = 0; Conf.chatTagInsertIndex = 0;
SavageFactions.plugin.log(Level.SEVERE, "Critical error in chat message formatting!"); SaberFactions.plugin.log(Level.SEVERE, "Critical error in chat message formatting!");
SavageFactions.plugin.log(Level.SEVERE, "NOTE: This has been automatically fixed right now by setting chatTagInsertIndex to 0."); SaberFactions.plugin.log(Level.SEVERE, "NOTE: This has been automatically fixed right now by setting chatTagInsertIndex to 0.");
SavageFactions.plugin.log(Level.SEVERE, "For a more proper fix, please read this regarding chat configuration: http://massivecraft.com/plugins/factions/config#Chat_configuration"); SaberFactions.plugin.log(Level.SEVERE, "For a more proper fix, please read this regarding chat configuration: http://massivecraft.com/plugins/factions/config#Chat_configuration");
return; return;
} }
} }
@ -202,7 +202,7 @@ public class FactionsChatListener implements Listener {
player.teleport(fme.getFaction().getWarp(warp).getLocation()); player.teleport(fme.getFaction().getWarp(warp).getLocation());
fme.msg(TL.COMMAND_FWARP_WARPED, warp); fme.msg(TL.COMMAND_FWARP_WARPED, warp);
} }
}, SavageFactions.plugin.getConfig().getLong("warmups.f-warp", 0)); }, SaberFactions.plugin.getConfig().getLong("warmups.f-warp", 0));
} }
} }

View File

@ -227,9 +227,9 @@ public class FactionsEntityListener implements Listener {
return; return;
} }
UUID uuid = player.getUniqueId(); UUID uuid = player.getUniqueId();
if (SavageFactions.plugin.getStuckMap().containsKey(uuid)) { if (SaberFactions.plugin.getStuckMap().containsKey(uuid)) {
FPlayers.getInstance().getByPlayer(player).msg(TL.COMMAND_STUCK_CANCELLED); FPlayers.getInstance().getByPlayer(player).msg(TL.COMMAND_STUCK_CANCELLED);
SavageFactions.plugin.getStuckMap().remove(uuid); SaberFactions.plugin.getStuckMap().remove(uuid);
} }
} }
@ -644,7 +644,7 @@ public class FactionsEntityListener implements Listener {
@EventHandler @EventHandler
public void onTravel(PlayerPortalEvent event) { public void onTravel(PlayerPortalEvent event) {
if (!SavageFactions.plugin.getConfig().getBoolean("portals.limit", false)) { if (!SaberFactions.plugin.getConfig().getBoolean("portals.limit", false)) {
return; // Don't do anything if they don't want us to. return; // Don't do anything if they don't want us to.
} }
@ -663,7 +663,7 @@ public class FactionsEntityListener implements Listener {
} }
FPlayer fp = FPlayers.getInstance().getByPlayer(event.getPlayer()); FPlayer fp = FPlayers.getInstance().getByPlayer(event.getPlayer());
String mininumRelation = SavageFactions.plugin.getConfig().getString("portals.minimum-relation", "MEMBER"); // Defaults to Neutral if typed wrong. String mininumRelation = SaberFactions.plugin.getConfig().getString("portals.minimum-relation", "MEMBER"); // Defaults to Neutral if typed wrong.
if (!fp.getFaction().getRelationTo(faction).isAtLeast(Relation.fromString(mininumRelation))) { if (!fp.getFaction().getRelationTo(faction).isAtLeast(Relation.fromString(mininumRelation))) {
event.setCancelled(true); event.setCancelled(true);
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.listeners; package com.massivecraft.factions.listeners;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -49,9 +49,9 @@ public class FactionsExploitListener implements Listener {
// blocks who occupy less than 1 block width or length wise need to be handled differently // blocks who occupy less than 1 block width or length wise need to be handled differently
Material mat = event.getTo().getBlock().getType(); Material mat = event.getTo().getBlock().getType();
if (((mat == SavageFactions.plugin.THIN_GLASS if (((mat == SaberFactions.plugin.THIN_GLASS
|| mat == SavageFactions.plugin.IRON_FENCE) && clippingThrough(target, from, 0.65)) || mat == SaberFactions.plugin.IRON_FENCE) && clippingThrough(target, from, 0.65))
|| ((mat == SavageFactions.plugin.FENCE || mat == SavageFactions.plugin.NETHER_FENCE) && clippingThrough(target, from, 0.45))) { || ((mat == SaberFactions.plugin.FENCE || mat == SaberFactions.plugin.NETHER_FENCE) && clippingThrough(target, from, 0.45))) {
event.setTo(from); event.setTo(from);
return; return;
} }

View File

@ -53,10 +53,10 @@ public class FactionsPlayerListener implements Listener {
public FactionsPlayerListener() { public FactionsPlayerListener() {
this.corners = new HashSet<>(); this.corners = new HashSet<>();
for (Player player : SavageFactions.plugin.getServer().getOnlinePlayers()) { for (Player player : SaberFactions.plugin.getServer().getOnlinePlayers()) {
initPlayer(player); initPlayer(player);
} }
for (World world : SavageFactions.plugin.getServer().getWorlds()) { for (World world : SaberFactions.plugin.getServer().getWorlds()) {
WorldBorder border = world.getWorldBorder(); WorldBorder border = world.getWorldBorder();
if (border != null) { if (border != null) {
int cornerCoord = (int) ((border.getSize() - 1.0) / 2.0); int cornerCoord = (int) ((border.getSize() - 1.0) / 2.0);
@ -99,7 +99,7 @@ public class FactionsPlayerListener implements Listener {
return false; return false;
} }
if (SavageFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && otherFaction.getLandRounded() > otherFaction.getPowerRounded()) { if (SaberFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && otherFaction.getLandRounded() > otherFaction.getPowerRounded()) {
return true; return true;
} }
@ -181,7 +181,7 @@ public class FactionsPlayerListener implements Listener {
return false; return false;
} }
if (SavageFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && otherFaction.getLandRounded() > otherFaction.getPowerRounded()) if (SaberFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && otherFaction.getLandRounded() > otherFaction.getPowerRounded())
return true; return true;
if (otherFaction.getId().equals(myFaction.getId()) && me.getRole() == Role.LEADER) return true; if (otherFaction.getId().equals(myFaction.getId()) && me.getRole() == Role.LEADER) return true;
@ -303,15 +303,15 @@ public class FactionsPlayerListener implements Listener {
me.login(); // set kills / deaths me.login(); // set kills / deaths
// Check for Faction announcements. Let's delay this so they actually see it. // Check for Faction announcements. Let's delay this so they actually see it.
Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, () -> { Bukkit.getScheduler().runTaskLater(SaberFactions.plugin, () -> {
if (me.isOnline()) { if (me.isOnline()) {
me.getFaction().sendUnreadAnnouncements(me); me.getFaction().sendUnreadAnnouncements(me);
} }
}, 33L); // Don't ask me why. }, 33L); // Don't ask me why.
if (SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-enabled", false)) { if (SaberFactions.plugin.getConfig().getBoolean("scoreboard.default-enabled", false)) {
FScoreboard.init(me); FScoreboard.init(me);
FScoreboard.get(me).setDefaultSidebar(new FDefaultSidebar(), SavageFactions.plugin.getConfig().getInt("scoreboard.default-update-interval", 20)); FScoreboard.get(me).setDefaultSidebar(new FDefaultSidebar(), SaberFactions.plugin.getConfig().getInt("scoreboard.default-update-interval", 20));
FScoreboard.get(me).setSidebarVisibility(me.showScoreboard()); FScoreboard.get(me).setSidebarVisibility(me.showScoreboard());
} }
@ -326,17 +326,17 @@ public class FactionsPlayerListener implements Listener {
fallMap.put(me.getPlayer(), false); fallMap.put(me.getPlayer(), false);
Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> fallMap.remove(me.getPlayer()), 180L); Bukkit.getScheduler().scheduleSyncDelayedTask(SaberFactions.plugin, () -> fallMap.remove(me.getPlayer()), 180L);
if (me.isSpyingChat() && !player.hasPermission(Permission.CHATSPY.node)) { if (me.isSpyingChat() && !player.hasPermission(Permission.CHATSPY.node)) {
me.setSpyingChat(false); me.setSpyingChat(false);
SavageFactions.plugin.log(Level.INFO, "Found %s spying chat without permission on login. Disabled their chat spying.", player.getName()); SaberFactions.plugin.log(Level.INFO, "Found %s spying chat without permission on login. Disabled their chat spying.", player.getName());
} }
if (me.isAdminBypassing() && !player.hasPermission(Permission.BYPASS.node)) { if (me.isAdminBypassing() && !player.hasPermission(Permission.BYPASS.node)) {
me.setIsAdminBypassing(false); me.setIsAdminBypassing(false);
SavageFactions.plugin.log(Level.INFO, "Found %s on admin Bypass without permission on login. Disabled it for them.", player.getName()); SaberFactions.plugin.log(Level.INFO, "Found %s on admin Bypass without permission on login. Disabled it for them.", player.getName());
} }
@ -370,10 +370,10 @@ public class FactionsPlayerListener implements Listener {
me.logout(); // cache kills / deaths me.logout(); // cache kills / deaths
// if player is waiting for fstuck teleport but leaves, remove // if player is waiting for fstuck teleport but leaves, remove
if (SavageFactions.plugin.getStuckMap().containsKey(me.getPlayer().getUniqueId())) { if (SaberFactions.plugin.getStuckMap().containsKey(me.getPlayer().getUniqueId())) {
FPlayers.getInstance().getByPlayer(me.getPlayer()).msg(TL.COMMAND_STUCK_CANCELLED); FPlayers.getInstance().getByPlayer(me.getPlayer()).msg(TL.COMMAND_STUCK_CANCELLED);
SavageFactions.plugin.getStuckMap().remove(me.getPlayer().getUniqueId()); SaberFactions.plugin.getStuckMap().remove(me.getPlayer().getUniqueId());
SavageFactions.plugin.getTimers().remove(me.getPlayer().getUniqueId()); SaberFactions.plugin.getTimers().remove(me.getPlayer().getUniqueId());
} }
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
@ -408,12 +408,12 @@ public class FactionsPlayerListener implements Listener {
} }
public void enableFly(FPlayer me) { public void enableFly(FPlayer me) {
if (SavageFactions.plugin.getConfig().getBoolean("ffly.AutoEnable")) { if (SaberFactions.plugin.getConfig().getBoolean("ffly.AutoEnable")) {
me.setFlying(true); me.setFlying(true);
CmdFly.flyMap.put(me.getName(), true); CmdFly.flyMap.put(me.getName(), true);
if (CmdFly.id == -1) { if (CmdFly.id == -1) {
if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) { if (SaberFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
CmdFly.startParticles(); CmdFly.startParticles();
} }
} }
@ -529,19 +529,19 @@ public class FactionsPlayerListener implements Listener {
if (changedFaction) { if (changedFaction) {
Bukkit.getServer().getPluginManager().callEvent(new FPlayerEnteredFactionEvent(factionTo, factionFrom, me)); Bukkit.getServer().getPluginManager().callEvent(new FPlayerEnteredFactionEvent(factionTo, factionFrom, me));
if (SavageFactions.plugin.getConfig().getBoolean("Title.Show-Title")) { if (SaberFactions.plugin.getConfig().getBoolean("Title.Show-Title")) {
String title = SavageFactions.plugin.getConfig().getString("Title.Format.Title"); String title = SaberFactions.plugin.getConfig().getString("Title.Format.Title");
title = title.replace("{Faction}", factionTo.getColorTo(me) + factionTo.getTag()); title = title.replace("{Faction}", factionTo.getColorTo(me) + factionTo.getTag());
title = parseAllPlaceholders(title, factionTo, player); title = parseAllPlaceholders(title, factionTo, player);
String subTitle = SavageFactions.plugin.getConfig().getString("Title.Format.Subtitle").replace("{Description}", factionTo.getDescription()).replace("{Faction}", factionTo.getColorTo(me) + factionTo.getTag()); String subTitle = SaberFactions.plugin.getConfig().getString("Title.Format.Subtitle").replace("{Description}", factionTo.getDescription()).replace("{Faction}", factionTo.getColorTo(me) + factionTo.getTag());
subTitle = parseAllPlaceholders(subTitle, factionTo, player); subTitle = parseAllPlaceholders(subTitle, factionTo, player);
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
if (!SavageFactions.plugin.mc18) { if (!SaberFactions.plugin.mc18) {
me.getPlayer().sendTitle(SavageFactions.plugin.color(title), SavageFactions.plugin.color(subTitle), SavageFactions.plugin.getConfig().getInt("Title.Options.FadeInTime"), me.getPlayer().sendTitle(SaberFactions.plugin.color(title), SaberFactions.plugin.color(subTitle), SaberFactions.plugin.getConfig().getInt("Title.Options.FadeInTime"),
SavageFactions.plugin.getConfig().getInt("Title.Options.ShowTime"), SaberFactions.plugin.getConfig().getInt("Title.Options.ShowTime"),
SavageFactions.plugin.getConfig().getInt("Title.Options.FadeOutTime")); SaberFactions.plugin.getConfig().getInt("Title.Options.FadeOutTime"));
} else { } else {
me.getPlayer().sendTitle(SavageFactions.plugin.color(title), SavageFactions.plugin.color(subTitle)); me.getPlayer().sendTitle(SaberFactions.plugin.color(title), SaberFactions.plugin.color(subTitle));
} }
@ -549,7 +549,7 @@ public class FactionsPlayerListener implements Listener {
} }
if (!SavageFactions.plugin.factionsFlight) { if (!SaberFactions.plugin.factionsFlight) {
return; return;
} }
@ -577,12 +577,12 @@ public class FactionsPlayerListener implements Listener {
if (me.isMapAutoUpdating()) { if (me.isMapAutoUpdating()) {
if (showTimes.containsKey(player.getUniqueId()) && (showTimes.get(player.getUniqueId()) > System.currentTimeMillis())) { if (showTimes.containsKey(player.getUniqueId()) && (showTimes.get(player.getUniqueId()) > System.currentTimeMillis())) {
if (SavageFactions.plugin.getConfig().getBoolean("findfactionsexploit.log", false)) { if (SaberFactions.plugin.getConfig().getBoolean("findfactionsexploit.log", false)) {
SavageFactions.plugin.log(Level.WARNING, "%s tried to show a faction map too soon and triggered exploit blocker.", player.getName()); SaberFactions.plugin.log(Level.WARNING, "%s tried to show a faction map too soon and triggered exploit blocker.", player.getName());
} }
} else { } else {
me.sendFancyMessage(Board.getInstance().getMap(me, to, player.getLocation().getYaw())); me.sendFancyMessage(Board.getInstance().getMap(me, to, player.getLocation().getYaw()));
showTimes.put(player.getUniqueId(), System.currentTimeMillis() + SavageFactions.plugin.getConfig().getLong("findfactionsexploit.cooldown", 2000)); showTimes.put(player.getUniqueId(), System.currentTimeMillis() + SaberFactions.plugin.getConfig().getLong("findfactionsexploit.cooldown", 2000));
} }
} else { } else {
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
@ -843,7 +843,7 @@ public class FactionsPlayerListener implements Listener {
return PermissableAction.DOOR; return PermissableAction.DOOR;
if (material.name().toUpperCase().contains("BUTTON") || material.name().toUpperCase().contains("PRESSURE")) if (material.name().toUpperCase().contains("BUTTON") || material.name().toUpperCase().contains("PRESSURE"))
return PermissableAction.BUTTON; return PermissableAction.BUTTON;
if (SavageFactions.plugin.mc113) { if (SaberFactions.plugin.mc113) {
switch (material) { switch (material) {
case LEVER: case LEVER:
return PermissableAction.LEVER; return PermissableAction.LEVER;

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.scoreboards;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -109,7 +109,7 @@ public class FScoreboard {
updateObjective(); updateObjective();
} }
} }
}.runTaskTimer(SavageFactions.plugin, updateInterval, updateInterval); }.runTaskTimer(SaberFactions.plugin, updateInterval, updateInterval);
} }
public void setTemporarySidebar(final FSidebarProvider provider) { public void setTemporarySidebar(final FSidebarProvider provider) {
@ -132,7 +132,7 @@ public class FScoreboard {
updateObjective(); updateObjective();
} }
} }
}.runTaskLater(SavageFactions.plugin, SavageFactions.plugin.getConfig().getInt("scoreboard.expiration", 7) * 20); }.runTaskLater(SaberFactions.plugin, SaberFactions.plugin.getConfig().getInt("scoreboard.expiration", 7) * 20);
} }
private void updateObjective() { private void updateObjective() {

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.scoreboards;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TagUtil; import com.massivecraft.factions.zcore.util.TagUtil;
@ -36,6 +36,6 @@ public abstract class FSidebarProvider {
// we assume it's broken up into two lines, so returning our tl will suffice. // we assume it's broken up into two lines, so returning our tl will suffice.
return TL.COMMAND_SHOW_NOHOME.toString(); return TL.COMMAND_SHOW_NOHOME.toString();
} }
return SavageFactions.plugin.txt.parse(line); // finally add color :) return SaberFactions.plugin.txt.parse(line); // finally add color :)
} }
} }

View File

@ -39,13 +39,13 @@ public class FTeamWrapper {
return; return;
} }
if (!SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false) || SavageFactions.plugin.getConfig().getBoolean("See-Invisible-Faction-Members")) { if (!SaberFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false) || SaberFactions.plugin.getConfig().getBoolean("See-Invisible-Faction-Members")) {
return; return;
} }
if (updating.add(faction)) { if (updating.add(faction)) {
Bukkit.getScheduler().runTask(SavageFactions.plugin, () -> { Bukkit.getScheduler().runTask(SaberFactions.plugin, () -> {
updating.remove(faction); updating.remove(faction);
applyUpdates(faction); applyUpdates(faction);
}); });
@ -61,7 +61,7 @@ public class FTeamWrapper {
return; return;
} }
if (!SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false) || SavageFactions.plugin.getConfig().getBoolean("See-Invisible-Faction-Members")) { if (!SaberFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false) || SaberFactions.plugin.getConfig().getBoolean("See-Invisible-Faction-Members")) {
return; return;
} }
@ -153,7 +153,7 @@ public class FTeamWrapper {
} }
private void updatePrefixes() { private void updatePrefixes() {
if (SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) { if (SaberFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
for (FScoreboard fboard : teams.keySet()) { for (FScoreboard fboard : teams.keySet()) {
updatePrefix(fboard); updatePrefix(fboard);
} }
@ -161,19 +161,19 @@ public class FTeamWrapper {
} }
private void updatePrefix(FScoreboard fboard) { private void updatePrefix(FScoreboard fboard) {
if (SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) { if (SaberFactions.plugin.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
FPlayer fplayer = fboard.getFPlayer(); FPlayer fplayer = fboard.getFPlayer();
Team team = teams.get(fboard); Team team = teams.get(fboard);
boolean focused = false; boolean focused = false;
if (SavageFactions.plugin.getConfig().getBoolean("See-Invisible-Faction-Members", false)) { if (SaberFactions.plugin.getConfig().getBoolean("See-Invisible-Faction-Members", false)) {
team.setCanSeeFriendlyInvisibles(true); team.setCanSeeFriendlyInvisibles(true);
} }
if ((SavageFactions.plugin.getConfig().getBoolean("ffocus.Enabled")) && (fplayer.getFaction() != null) && (fplayer.getFaction().getFocused() != null)) { if ((SaberFactions.plugin.getConfig().getBoolean("ffocus.Enabled")) && (fplayer.getFaction() != null) && (fplayer.getFaction().getFocused() != null)) {
for (FPlayer fp : faction.getFPlayersWhereOnline(true)) { for (FPlayer fp : faction.getFPlayersWhereOnline(true)) {
if (fplayer.getFaction().getFocused().equalsIgnoreCase(fp.getName())) { if (fplayer.getFaction().getFocused().equalsIgnoreCase(fp.getName())) {
team.setPrefix(ChatColor.translateAlternateColorCodes('&', SavageFactions.plugin.getConfig().getString("ffocus.Prefix", "&7»&b"))); team.setPrefix(ChatColor.translateAlternateColorCodes('&', SaberFactions.plugin.getConfig().getString("ffocus.Prefix", "&7»&b")));
focused = true; focused = true;
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.scoreboards.sidebar; package com.massivecraft.factions.scoreboards.sidebar;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.scoreboards.FSidebarProvider; import com.massivecraft.factions.scoreboards.FSidebarProvider;
import java.util.ArrayList; import java.util.ArrayList;
@ -12,21 +12,21 @@ public class FDefaultSidebar extends FSidebarProvider {
@Override @Override
public String getTitle(FPlayer fplayer) { public String getTitle(FPlayer fplayer) {
return replaceTags(fplayer, SavageFactions.plugin.getConfig().getString("scoreboard.default-title", "{name}")); return replaceTags(fplayer, SaberFactions.plugin.getConfig().getString("scoreboard.default-title", "{name}"));
} }
@Override @Override
public List<String> getLines(FPlayer fplayer) { public List<String> getLines(FPlayer fplayer) {
if (fplayer.hasFaction()) { if (fplayer.hasFaction()) {
return getOutput(fplayer, "scoreboard.default"); return getOutput(fplayer, "scoreboard.default");
} else if (SavageFactions.plugin.getConfig().getBoolean("scoreboard.factionless-enabled", false)) { } else if (SaberFactions.plugin.getConfig().getBoolean("scoreboard.factionless-enabled", false)) {
return getOutput(fplayer, "scoreboard.factionless"); return getOutput(fplayer, "scoreboard.factionless");
} }
return getOutput(fplayer, "scoreboard.default"); // no faction, factionless-board disabled return getOutput(fplayer, "scoreboard.default"); // no faction, factionless-board disabled
} }
public List<String> getOutput(FPlayer fplayer, String list) { public List<String> getOutput(FPlayer fplayer, String list) {
List<String> lines = SavageFactions.plugin.getConfig().getStringList(list); List<String> lines = SaberFactions.plugin.getConfig().getStringList(list);
if (lines == null || lines.isEmpty()) { if (lines == null || lines.isEmpty()) {
return new ArrayList<>(); return new ArrayList<>();

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.scoreboards.sidebar;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.scoreboards.FSidebarProvider; import com.massivecraft.factions.scoreboards.FSidebarProvider;
import java.util.List; import java.util.List;
@ -22,7 +22,7 @@ public class FInfoSidebar extends FSidebarProvider {
@Override @Override
public List<String> getLines(FPlayer fplayer) { public List<String> getLines(FPlayer fplayer) {
List<String> lines = SavageFactions.plugin.getConfig().getStringList("scoreboard.finfo"); List<String> lines = SaberFactions.plugin.getConfig().getStringList("scoreboard.finfo");
ListIterator<String> it = lines.listIterator(); ListIterator<String> it = lines.listIterator();
while (it.hasNext()) { while (it.hasNext()) {

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.struct; package com.massivecraft.factions.struct;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public enum Permission { public enum Permission {
@ -121,7 +121,7 @@ public enum Permission {
} }
public boolean has(CommandSender sender, boolean informSenderIfNot) { public boolean has(CommandSender sender, boolean informSenderIfNot) {
return SavageFactions.plugin.perm.has(sender, this.node, informSenderIfNot); return SaberFactions.plugin.perm.has(sender, this.node, informSenderIfNot);
} }
public boolean has(CommandSender sender) { public boolean has(CommandSender sender) {

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.struct; package com.massivecraft.factions.struct;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.util.MultiversionMaterials; import com.massivecraft.factions.util.MultiversionMaterials;
import com.massivecraft.factions.zcore.fperms.Permissable; import com.massivecraft.factions.zcore.fperms.Permissable;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
@ -199,7 +199,7 @@ public enum Relation implements Permissable {
// Utility method to build items for F Perm GUI // Utility method to build items for F Perm GUI
@Override @Override
public ItemStack buildItem() { public ItemStack buildItem() {
final ConfigurationSection RELATION_CONFIG = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.relation"); final ConfigurationSection RELATION_CONFIG = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.relation");
String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", "")); String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", ""));
List<String> lore = new ArrayList<>(); List<String> lore = new ArrayList<>();

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.struct; package com.massivecraft.factions.struct;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.util.MultiversionMaterials; import com.massivecraft.factions.util.MultiversionMaterials;
import com.massivecraft.factions.zcore.fperms.Permissable; import com.massivecraft.factions.zcore.fperms.Permissable;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
@ -113,7 +113,7 @@ public enum Role implements Permissable {
// Utility method to build items for F Perm GUI // Utility method to build items for F Perm GUI
@Override @Override
public ItemStack buildItem() { public ItemStack buildItem() {
final ConfigurationSection RELATION_CONFIG = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.relation"); final ConfigurationSection RELATION_CONFIG = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.relation");
String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", "")); String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", ""));
List<String> lore = new ArrayList<>(); List<String> lore = new ArrayList<>();
@ -132,7 +132,7 @@ public enum Role implements Permissable {
itemMeta.setDisplayName(displayName); itemMeta.setDisplayName(displayName);
itemMeta.setLore(lore); itemMeta.setLore(lore);
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -50,13 +50,13 @@ public class AutoLeaveProcessTask extends BukkitRunnable {
// Check if they should be exempt from this. // Check if they should be exempt from this.
if (!fplayer.willAutoLeave()) { if (!fplayer.willAutoLeave()) {
SavageFactions.plugin.debug(Level.INFO, fplayer.getName() + " was going to be auto-removed but was set not to."); SaberFactions.plugin.debug(Level.INFO, fplayer.getName() + " was going to be auto-removed but was set not to.");
continue; continue;
} }
if (fplayer.isOffline() && now - fplayer.getLastLoginTime() > toleranceMillis) { if (fplayer.isOffline() && now - fplayer.getLastLoginTime() > toleranceMillis) {
if (Conf.logFactionLeave || Conf.logFactionKick) { if (Conf.logFactionLeave || Conf.logFactionKick) {
SavageFactions.plugin.log("Player " + fplayer.getName() + " was auto-removed due to inactivity."); SaberFactions.plugin.log("Player " + fplayer.getName() + " was auto-removed due to inactivity.");
} }
// if player is faction admin, sort out the faction since he's going away // if player is faction admin, sort out the faction since he's going away

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.util; package com.massivecraft.factions.util;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
public class AutoLeaveTask implements Runnable { public class AutoLeaveTask implements Runnable {
@ -18,11 +18,11 @@ public class AutoLeaveTask implements Runnable {
} }
task = new AutoLeaveProcessTask(); task = new AutoLeaveProcessTask();
task.runTaskTimer(SavageFactions.plugin, 1, 1); task.runTaskTimer(SaberFactions.plugin, 1, 1);
// maybe setting has been changed? if so, restart this task at new rate // maybe setting has been changed? if so, restart this task at new rate
if (this.rate != Conf.autoLeaveRoutineRunsEveryXMinutes) { if (this.rate != Conf.autoLeaveRoutineRunsEveryXMinutes) {
SavageFactions.plugin.startAutoLeaveTask(true); SaberFactions.plugin.startAutoLeaveTask(true);
} }
} }
} }

View File

@ -35,7 +35,7 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
// Return the plugin version since this expansion is bundled with the dependency // Return the plugin version since this expansion is bundled with the dependency
@Override @Override
public String getVersion() { public String getVersion() {
return SavageFactions.plugin.getDescription().getVersion(); return SaberFactions.plugin.getDescription().getVersion();
} }
@ -80,7 +80,7 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
String humanized = DurationFormatUtils.formatDurationWords(System.currentTimeMillis() - fPlayer.getLastLoginTime(), true, true) + TL.COMMAND_STATUS_AGOSUFFIX; String humanized = DurationFormatUtils.formatDurationWords(System.currentTimeMillis() - fPlayer.getLastLoginTime(), true, true) + TL.COMMAND_STATUS_AGOSUFFIX;
return fPlayer.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() : (System.currentTimeMillis() - fPlayer.getLastLoginTime() < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized); return fPlayer.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() : (System.currentTimeMillis() - fPlayer.getLastLoginTime() < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized);
case "player_group": case "player_group":
return SavageFactions.plugin.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(fPlayer.getId()))); return SaberFactions.plugin.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(fPlayer.getId())));
case "player_balance": case "player_balance":
return Econ.isSetup() ? Econ.getFriendlyBalance(fPlayer) : TL.ECON_OFF.format("balance"); return Econ.isSetup() ? Econ.getFriendlyBalance(fPlayer) : TL.ECON_OFF.format("balance");
case "player_power": case "player_power":
@ -121,7 +121,7 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
case "faction_warps": case "faction_warps":
return String.valueOf(faction.getWarps().size()); return String.valueOf(faction.getWarps().size());
case "faction_raidable": case "faction_raidable":
boolean raid = SavageFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && faction.getLandRounded() >= faction.getPowerRounded(); boolean raid = SaberFactions.plugin.getConfig().getBoolean("hcf.raidable", false) && faction.getLandRounded() >= faction.getPowerRounded();
return raid ? TL.RAIDABLE_TRUE.toString() : TL.RAIDABLE_FALSE.toString(); return raid ? TL.RAIDABLE_TRUE.toString() : TL.RAIDABLE_FALSE.toString();
case "faction_home_world": case "faction_home_world":
return faction.hasHome() ? faction.getHome().getWorld().getName() : ""; return faction.hasHome() ? faction.getHome().getWorld().getName() : "";

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.util; package com.massivecraft.factions.util;
import com.google.gson.*; import com.google.gson.*;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@ -21,7 +21,7 @@ public class LocationTypeAdapter implements JsonSerializer<Location>, JsonDeseri
return object; return object;
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while serializing a Location."); SaberFactions.plugin.log(Level.WARNING, "Error encountered while serializing a Location.");
return object; return object;
} }
} }
@ -38,7 +38,7 @@ public class LocationTypeAdapter implements JsonSerializer<Location>, JsonDeseri
object.get("z").getAsDouble()); object.get("z").getAsDouble());
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while" + SaberFactions.plugin.log(Level.WARNING, "Error encountered while" +
" deserializing a Location."); " deserializing a Location.");
return null; return null;
} }

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.util;
import com.google.gson.*; import com.google.gson.*;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.HashSet; import java.util.HashSet;
@ -52,7 +52,7 @@ public class MapFLocToStringSetTypeAdapter implements JsonDeserializer<Map<FLoca
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while deserializing a Map of FLocations to String Sets."); SaberFactions.plugin.log(Level.WARNING, "Error encountered while deserializing a Map of FLocations to String Sets.");
return null; return null;
} }
} }
@ -97,7 +97,7 @@ public class MapFLocToStringSetTypeAdapter implements JsonDeserializer<Map<FLoca
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while serializing a Map of FLocations to String Sets."); SaberFactions.plugin.log(Level.WARNING, "Error encountered while serializing a Map of FLocations to String Sets.");
return obj; return obj;
} }
} }

View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.util;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -68,16 +68,16 @@ public class MiscUtil {
ArrayList<String> errors = new ArrayList<>(); ArrayList<String> errors = new ArrayList<>();
if (getComparisonString(str).length() < Conf.factionTagLengthMin) { if (getComparisonString(str).length() < Conf.factionTagLengthMin) {
errors.add(SavageFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_TOOSHORT.toString(), Conf.factionTagLengthMin)); errors.add(SaberFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_TOOSHORT.toString(), Conf.factionTagLengthMin));
} }
if (str.length() > Conf.factionTagLengthMax) { if (str.length() > Conf.factionTagLengthMax) {
errors.add(SavageFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_TOOLONG.toString(), Conf.factionTagLengthMax)); errors.add(SaberFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_TOOLONG.toString(), Conf.factionTagLengthMax));
} }
for (char c : str.toCharArray()) { for (char c : str.toCharArray()) {
if (!substanceChars.contains(String.valueOf(c))) { if (!substanceChars.contains(String.valueOf(c))) {
errors.add(SavageFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_ALPHANUMERIC.toString(), c)); errors.add(SaberFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_ALPHANUMERIC.toString(), c));
} }
} }
@ -96,7 +96,7 @@ public class MiscUtil {
// Fix for some data being broken when we added the recruit rank. // Fix for some data being broken when we added the recruit rank.
if (player.getRole() == null) { if (player.getRole() == null) {
player.setRole(Role.NORMAL); player.setRole(Role.NORMAL);
SavageFactions.plugin.log(Level.WARNING, String.format("Player %s had null role. Setting them to normal. This isn't good D:", player.getName())); SaberFactions.plugin.log(Level.WARNING, String.format("Player %s had null role. Setting them to normal. This isn't good D:", player.getName()));
} }
switch (player.getRole()) { switch (player.getRole()) {

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.util; package com.massivecraft.factions.util;
import com.google.gson.*; import com.google.gson.*;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.logging.Level; import java.util.logging.Level;
@ -32,7 +32,7 @@ public class MyLocationTypeAdapter implements JsonDeserializer<LazyLocation>, Js
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while deserializing a LazyLocation."); SaberFactions.plugin.log(Level.WARNING, "Error encountered while deserializing a LazyLocation.");
return null; return null;
} }
} }
@ -52,7 +52,7 @@ public class MyLocationTypeAdapter implements JsonDeserializer<LazyLocation>, Js
return obj; return obj;
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while serializing a LazyLocation."); SaberFactions.plugin.log(Level.WARNING, "Error encountered while serializing a LazyLocation.");
return obj; return obj;
} }
} }

View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.util.Particles; package com.massivecraft.factions.util.Particles;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Location; import org.bukkit.Location;
@ -451,7 +451,7 @@ public enum ParticleEffect {
*/ */
private static boolean isWater(Location location) { private static boolean isWater(Location location) {
Material material = location.getBlock().getType(); Material material = location.getBlock().getType();
return material == Material.WATER || material == SavageFactions.plugin.STATIONARY_WATER; return material == Material.WATER || material == SaberFactions.plugin.STATIONARY_WATER;
} }
/** /**

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.util; package com.massivecraft.factions.util;
import com.google.gson.*; import com.google.gson.*;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
@ -62,7 +62,7 @@ public class PermissionsMapTypeAdapter implements JsonDeserializer<Map<Permissab
return permissionsMap; return permissionsMap;
} catch (Exception ex) { } catch (Exception ex) {
SavageFactions.plugin.log(Level.WARNING, "Error encountered while deserializing a PermissionsMap."); SaberFactions.plugin.log(Level.WARNING, "Error encountered while deserializing a PermissionsMap.");
ex.printStackTrace(); ex.printStackTrace();
return null; return null;
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.util; package com.massivecraft.factions.util;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
@ -45,7 +45,7 @@ public abstract class SpiralTask implements Runnable {
this.world = Bukkit.getWorld(fLocation.getWorldName()); this.world = Bukkit.getWorld(fLocation.getWorldName());
if (this.world == null) { if (this.world == null) {
SavageFactions.plugin.log(Level.WARNING, "[SpiralTask] A valid world must be specified!"); SaberFactions.plugin.log(Level.WARNING, "[SpiralTask] A valid world must be specified!");
this.stop(); this.stop();
return; return;
} }
@ -56,7 +56,7 @@ public abstract class SpiralTask implements Runnable {
this.readyToGo = true; this.readyToGo = true;
// get this party started // get this party started
this.setTaskID(Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, this, 2, 2)); this.setTaskID(Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, this, 2, 2));
} }
private static long now() { private static long now() {
@ -187,7 +187,7 @@ public abstract class SpiralTask implements Runnable {
// for successful completion // for successful completion
public void finish() { public void finish() {
// SavageFactions.plugin.log("SpiralTask successfully completed!"); // SaberFactions.plugin.log("SpiralTask successfully completed!");
this.stop(); this.stop();
} }

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.util;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -12,18 +12,18 @@ import org.bukkit.Bukkit;
public class UtilFly { public class UtilFly {
public static void run() { public static void run() {
if (!SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) if (!SaberFactions.plugin.getConfig().getBoolean("enable-faction-flight"))
return; return;
Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> {
for (FPlayer fp : FPlayers.getInstance().getOnlinePlayers()) { for (FPlayer fp : FPlayers.getInstance().getOnlinePlayers()) {
if (fp.isFlying()) fp.checkIfNearbyEnemies(); if (fp.isFlying()) fp.checkIfNearbyEnemies();
} }
}, 0, SavageFactions.plugin.getConfig().getInt("fly-task-interval", 10)); }, 0, SaberFactions.plugin.getConfig().getInt("fly-task-interval", 10));
} }
public static void setFly(FPlayer fp, boolean fly, boolean silent, boolean damage) { public static void setFly(FPlayer fp, boolean fly, boolean silent, boolean damage) {
if (!SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) if (!SaberFactions.plugin.getConfig().getBoolean("enable-faction-flight"))
return; return;
fp.getPlayer().setAllowFlight(fly); fp.getPlayer().setAllowFlight(fly);
@ -43,7 +43,7 @@ public class UtilFly {
} }
public static void checkFly(FPlayer me, Faction factionTo) { public static void checkFly(FPlayer me, Faction factionTo) {
if (!SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) if (!SaberFactions.plugin.getConfig().getBoolean("enable-faction-flight"))
return; return;
if (me.isAdminBypassing() && me.isFlying()) if (me.isAdminBypassing() && me.isFlying())
@ -81,13 +81,13 @@ public class UtilFly {
public static void setFallDamage(FPlayer fp, boolean fly, boolean damage) { public static void setFallDamage(FPlayer fp, boolean fly, boolean damage) {
if (!fly) { if (!fly) {
if (!damage) { if (!damage) {
fp.sendMessage(TL.COMMAND_FLY_COOLDOWN.toString().replace("{amount}", SavageFactions.plugin.getConfig().getInt("fly-falldamage-cooldown", 3) + "")); fp.sendMessage(TL.COMMAND_FLY_COOLDOWN.toString().replace("{amount}", SaberFactions.plugin.getConfig().getInt("fly-falldamage-cooldown", 3) + ""));
} }
int cooldown = SavageFactions.plugin.getConfig().getInt("fly-falldamage-cooldown", 3); int cooldown = SaberFactions.plugin.getConfig().getInt("fly-falldamage-cooldown", 3);
if (cooldown > 0) { if (cooldown > 0) {
fp.setTakeFallDamage(false); fp.setTakeFallDamage(false);
Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, () -> fp.setTakeFallDamage(true), 20L * cooldown); Bukkit.getScheduler().runTaskLater(SaberFactions.plugin, () -> fp.setTakeFallDamage(true), 20L * cooldown);
} }
} }
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.util; package com.massivecraft.factions.util;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
public class WarmUpUtil { public class WarmUpUtil {
@ -21,7 +21,7 @@ public class WarmUpUtil {
player.msg(TL.WARMUPS_ALREADY); player.msg(TL.WARMUPS_ALREADY);
} else { } else {
player.msg(translationKey.format(action, delay)); player.msg(translationKey.format(action, delay));
int id = SavageFactions.plugin.getServer().getScheduler().runTaskLater(SavageFactions.plugin, () -> { int id = SaberFactions.plugin.getServer().getScheduler().runTaskLater(SaberFactions.plugin, () -> {
player.stopWarmup(); player.stopWarmup();
runnable.run(); runnable.run();
}, delay * 20).getTaskId(); }, delay * 20).getTaskId();

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.util;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -34,14 +34,14 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
public WarpGUI(FPlayer fme) { public WarpGUI(FPlayer fme) {
this.fme = fme; this.fme = fme;
this.section = SavageFactions.plugin.getConfig().getConfigurationSection("fwarp-gui"); this.section = SaberFactions.plugin.getConfig().getConfigurationSection("fwarp-gui");
} }
@Override @Override
public void build() { public void build() {
if (section == null) { if (section == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f warp GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f warp GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return; return;
} }
@ -49,14 +49,14 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
guiSize = section.getInt("rows", 3); guiSize = section.getInt("rows", 3);
if (guiSize > 6) { if (guiSize > 6) {
guiSize = 6; guiSize = 6;
SavageFactions.plugin.log(Level.INFO, "Warp GUI size out of bounds, defaulting to 6"); SaberFactions.plugin.log(Level.INFO, "Warp GUI size out of bounds, defaulting to 6");
} }
guiSize *= 9; guiSize *= 9;
String guiName = ChatColor.translateAlternateColorCodes('&', section.getString("name", "FactionPermissions")); String guiName = ChatColor.translateAlternateColorCodes('&', section.getString("name", "FactionPermissions"));
warpGUI = Bukkit.createInventory(this, guiSize, guiName); warpGUI = Bukkit.createInventory(this, guiSize, guiName);
maxWarps = SavageFactions.plugin.getConfig().getInt("max-warps", 5); maxWarps = SaberFactions.plugin.getConfig().getInt("max-warps", 5);
Set<String> factionWarps = fme.getFaction().getWarps().keySet(); Set<String> factionWarps = fme.getFaction().getWarps().keySet();
List<Integer> warpOpenSlots = section.getIntegerList("warp-slots"); List<Integer> warpOpenSlots = section.getIntegerList("warp-slots");
@ -64,7 +64,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
buildDummyItems(); buildDummyItems();
if (maxWarps != warpOpenSlots.size()) { if (maxWarps != warpOpenSlots.size()) {
SavageFactions.plugin.log(Level.SEVERE, "Invalid warp slots for GUI, Please use same value as max warps"); SaberFactions.plugin.log(Level.SEVERE, "Invalid warp slots for GUI, Please use same value as max warps");
return; return;
} }
@ -102,12 +102,12 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
} else { } else {
fme.setEnteringPassword(true, warp); fme.setEnteringPassword(true, warp);
fme.msg(TL.COMMAND_FWARP_PASSWORD_REQUIRED); fme.msg(TL.COMMAND_FWARP_PASSWORD_REQUIRED);
Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, () -> { Bukkit.getScheduler().runTaskLater(SaberFactions.plugin, () -> {
if (fme.isEnteringPassword()) { if (fme.isEnteringPassword()) {
fme.msg(TL.COMMAND_FWARP_PASSWORD_TIMEOUT); fme.msg(TL.COMMAND_FWARP_PASSWORD_TIMEOUT);
fme.setEnteringPassword(false, ""); fme.setEnteringPassword(false, "");
} }
}, SavageFactions.plugin.getConfig().getInt("fwarp-gui.password-timeout", 5) * 20); }, SaberFactions.plugin.getConfig().getInt("fwarp-gui.password-timeout", 5) * 20);
} }
} }
} }
@ -119,15 +119,15 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
player.teleport(fme.getFaction().getWarp(warp).getLocation()); player.teleport(fme.getFaction().getWarp(warp).getLocation());
fme.msg(TL.COMMAND_FWARP_WARPED, warp); fme.msg(TL.COMMAND_FWARP_WARPED, warp);
} }
}, SavageFactions.plugin.getConfig().getLong("warmups.f-warp", 0)); }, SaberFactions.plugin.getConfig().getLong("warmups.f-warp", 0));
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
if (!SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing()) { if (!SaberFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing()) {
return true; return true;
} }
double cost = SavageFactions.plugin.getConfig().getDouble("warp-cost.warp", 5); double cost = SaberFactions.plugin.getConfig().getDouble("warp-cost.warp", 5);
if (!Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) { if (!Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) {
return true; return true;
@ -143,8 +143,8 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
private ItemStack buildItem(String warp) { private ItemStack buildItem(String warp) {
ConfigurationSection warpItemSection = section.getConfigurationSection("warp-item"); ConfigurationSection warpItemSection = section.getConfigurationSection("warp-item");
if (warpItemSection == null) { if (warpItemSection == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f warp GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f warp GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return new ItemStack(Material.AIR); return new ItemStack(Material.AIR);
} }
@ -177,7 +177,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
string = ChatColor.translateAlternateColorCodes('&', string); string = ChatColor.translateAlternateColorCodes('&', string);
string = string.replace("{warp}", warp); string = string.replace("{warp}", warp);
string = string.replace("{warp-protected}", faction.hasWarpPassword(warp) ? "Enabled" : "Disabled"); string = string.replace("{warp-protected}", faction.hasWarpPassword(warp) ? "Enabled" : "Disabled");
string = string.replace("{warp-cost}", !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) ? "Disabled" : Integer.toString(SavageFactions.plugin.getConfig().getInt("warp-cost.warp", 5))); string = string.replace("{warp-cost}", !SaberFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) ? "Disabled" : Integer.toString(SaberFactions.plugin.getConfig().getInt("warp-cost.warp", 5)));
return string; return string;
} }
@ -187,7 +187,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
try { try {
dummyId = Integer.parseInt(key); dummyId = Integer.parseInt(key);
} catch (NumberFormatException exception) { } catch (NumberFormatException exception) {
SavageFactions.plugin.log(Level.WARNING, "Invalid dummy item id: " + key.toUpperCase()); SaberFactions.plugin.log(Level.WARNING, "Invalid dummy item id: " + key.toUpperCase());
continue; continue;
} }
@ -199,7 +199,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
List<Integer> dummyIdSlots = section.getIntegerList("dummy-slots." + key); List<Integer> dummyIdSlots = section.getIntegerList("dummy-slots." + key);
for (Integer slot : dummyIdSlots) { for (Integer slot : dummyIdSlots) {
if (slot + 1 > guiSize || slot < 0) { if (slot + 1 > guiSize || slot < 0) {
SavageFactions.plugin.log(Level.WARNING, "Invalid slot: " + slot + " for dummy item: " + key); SaberFactions.plugin.log(Level.WARNING, "Invalid slot: " + slot + " for dummy item: " + key);
continue; continue;
} }
dummySlots.add(slot); dummySlots.add(slot);
@ -212,14 +212,14 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
final ConfigurationSection dummySection = section.getConfigurationSection("dummy-items." + id); final ConfigurationSection dummySection = section.getConfigurationSection("dummy-items." + id);
if (dummySection == null) { if (dummySection == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f warp GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f warp GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return new ItemStack(Material.AIR); return new ItemStack(Material.AIR);
} }
Material material = Material.matchMaterial(dummySection.getString("material", "")); Material material = Material.matchMaterial(dummySection.getString("material", ""));
if (material == null) { if (material == null) {
SavageFactions.plugin.log(Level.WARNING, "Invalid material for dummy item: " + id); SaberFactions.plugin.log(Level.WARNING, "Invalid material for dummy item: " + id);
return null; return null;
} }
@ -237,7 +237,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
ItemMeta itemMeta = itemStack.getItemMeta(); ItemMeta itemMeta = itemStack.getItemMeta();
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.zcore;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;
@ -311,7 +311,7 @@ public abstract class MCommand<T extends MPlugin> {
s = s.replace("{power}", power); s = s.replace("{power}", power);
} }
if (s.contains("{group}")) { if (s.contains("{group}")) {
String group = SavageFactions.plugin.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(player.getId()))); String group = SaberFactions.plugin.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(player.getId())));
s = s.replace("{group}", group); s = s.replace("{group}", group);
} }
return s; return s;

View File

@ -171,7 +171,7 @@ public abstract class MPlugin extends JavaPlugin {
conf.save(lang); conf.save(lang);
} catch (IOException e) { } catch (IOException e) {
getLogger().log(Level.WARNING, "Factions: Failed to save lang.yml."); getLogger().log(Level.WARNING, "Factions: Failed to save lang.yml.");
getLogger().log(Level.WARNING, "Factions: Report this stack trace to prosavage."); getLogger().log(Level.WARNING, "Factions: Report this stack trace to Driftay.");
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -242,7 +242,7 @@ public abstract class MPlugin extends JavaPlugin {
// COMMAND HANDLING // COMMAND HANDLING
// -------------------------------------------- // // -------------------------------------------- //
// can be overridden by SavageFactions method, to provide option // can be overridden by SaberFactions method, to provide option
public boolean logPlayerCommands() { public boolean logPlayerCommands() {
return true; return true;
} }

View File

@ -40,7 +40,7 @@ public class MPluginSecretPlayerListener implements Listener {
/* Should be handled by stuff in FactionsChatListener /* Should be handled by stuff in FactionsChatListener
Player speaker = event.getPlayer(); Player speaker = event.getPlayer();
String format = event.getFormat(); String format = event.getFormat();
format = format.replace(Conf.chatTagReplaceString, SavageFactions.plugin.getPlayerFactionTag(speaker)).replace("[FACTION_TITLE]", SavageFactions.plugin.getPlayerTitle(speaker)); format = format.replace(Conf.chatTagReplaceString, SaberFactions.plugin.getPlayerFactionTag(speaker)).replace("[FACTION_TITLE]", SaberFactions.plugin.getPlayerTitle(speaker));
event.setFormat(format); event.setFormat(format);
*/ */
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.zcore.fperms; package com.massivecraft.factions.zcore.fperms;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.util.MultiversionMaterials; import com.massivecraft.factions.util.MultiversionMaterials;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Material; import org.bukkit.Material;
@ -93,11 +93,11 @@ public enum PermissableAction {
// Utility method to build items for F Perm GUI // Utility method to build items for F Perm GUI
public ItemStack buildItem(FPlayer fme, Permissable permissable) { public ItemStack buildItem(FPlayer fme, Permissable permissable) {
final ConfigurationSection section = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.action"); final ConfigurationSection section = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.action");
if (section == null) { if (section == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return new ItemStack(Material.AIR); return new ItemStack(Material.AIR);
} }
@ -109,7 +109,7 @@ public enum PermissableAction {
} }
Material material = Material.matchMaterial(section.getString("materials." + name().toLowerCase().replace('_', '-'))); Material material = Material.matchMaterial(section.getString("materials." + name().toLowerCase().replace('_', '-')));
if (material == null) { if (material == null) {
material = MultiversionMaterials.fromString(SavageFactions.plugin.getConfig().getString("fperm-gui.action.materials")).parseMaterial(); material = MultiversionMaterials.fromString(SaberFactions.plugin.getConfig().getString("fperm-gui.action.materials")).parseMaterial();
} }
Access access = fme.getFaction().getAccess(permissable, this); Access access = fme.getFaction().getAccess(permissable, this);
@ -135,7 +135,7 @@ public enum PermissableAction {
} }
// If under the 1.13 version we will use the colorable option. // If under the 1.13 version we will use the colorable option.
if (!SavageFactions.plugin.mc113) { if (!SaberFactions.plugin.mc113) {
DyeColor dyeColor = null; DyeColor dyeColor = null;
try { try {
@ -148,14 +148,14 @@ public enum PermissableAction {
} }
} else { } else {
// so this is in 1.13 mode, our config will automatically be updated to a material instead of color because of it being removed in the new api // so this is in 1.13 mode, our config will automatically be updated to a material instead of color because of it being removed in the new api
item.setType(Material.valueOf(SavageFactions.plugin.getConfig().getString("fperm-gui.action.access." + accessValue))); item.setType(Material.valueOf(SaberFactions.plugin.getConfig().getString("fperm-gui.action.access." + accessValue)));
} }
for (String loreLine : section.getStringList("placeholder-item.lore")) { for (String loreLine : section.getStringList("placeholder-item.lore")) {
lore.add(replacePlaceholders(loreLine, fme, permissable)); lore.add(replacePlaceholders(loreLine, fme, permissable));
} }
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.zcore.fperms.gui; package com.massivecraft.factions.zcore.fperms.gui;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.util.FactionGUI; import com.massivecraft.factions.util.FactionGUI;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.Permissable; import com.massivecraft.factions.zcore.fperms.Permissable;
@ -36,20 +36,20 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
public PermissableActionGUI(FPlayer fme, Permissable permissable) { public PermissableActionGUI(FPlayer fme, Permissable permissable) {
this.fme = fme; this.fme = fme;
this.permissable = permissable; this.permissable = permissable;
this.section = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.action"); this.section = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.action");
} }
public void build() { public void build() {
if (section == null) { if (section == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return; return;
} }
guiSize = section.getInt("rows", 3); guiSize = section.getInt("rows", 3);
if (guiSize > 6) { if (guiSize > 6) {
guiSize = 6; guiSize = 6;
SavageFactions.plugin.log(Level.INFO, "Action GUI size out of bounds, defaulting to 6"); SaberFactions.plugin.log(Level.INFO, "Action GUI size out of bounds, defaulting to 6");
} }
guiSize *= 9; guiSize *= 9;
@ -63,7 +63,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
continue; continue;
} }
if (slot + 1 > guiSize || slot < 0) { if (slot + 1 > guiSize || slot < 0) {
SavageFactions.plugin.log(Level.WARNING, "Invalid slot for: " + key.toUpperCase()); SaberFactions.plugin.log(Level.WARNING, "Invalid slot for: " + key.toUpperCase());
continue; continue;
} }
@ -74,7 +74,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
PermissableAction permissableAction = PermissableAction.fromString(key.toUpperCase().replace('-', '_')); PermissableAction permissableAction = PermissableAction.fromString(key.toUpperCase().replace('-', '_'));
if (permissableAction == null) { if (permissableAction == null) {
SavageFactions.plugin.log(Level.WARNING, "Invalid permissable action: " + key.toUpperCase()); SaberFactions.plugin.log(Level.WARNING, "Invalid permissable action: " + key.toUpperCase());
continue; continue;
} }
@ -101,7 +101,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
actionSlots.put(slot, action); actionSlots.put(slot, action);
} }
} }
SavageFactions.plugin.log(Level.WARNING, "Missing action: " + action.name()); SaberFactions.plugin.log(Level.WARNING, "Missing action: " + action.name());
} }
} }
@ -147,7 +147,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
actionGUI.setItem(slot, action.buildItem(fme, permissable)); actionGUI.setItem(slot, action.buildItem(fme, permissable));
fme.msg(TL.COMMAND_PERM_SET, action.name(), access.name(), permissable.name()); fme.msg(TL.COMMAND_PERM_SET, action.name(), access.name(), permissable.name());
SavageFactions.plugin.log(String.format(TL.COMMAND_PERM_SET.toString(), action.name(), access.name(), permissable.name()) + " for faction " + fme.getTag()); SaberFactions.plugin.log(String.format(TL.COMMAND_PERM_SET.toString(), action.name(), access.name(), permissable.name()) + " for faction " + fme.getTag());
} }
private void buildItems() { private void buildItems() {
@ -157,7 +157,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
ItemStack item = permissableAction.buildItem(fme, permissable); ItemStack item = permissableAction.buildItem(fme, permissable);
if (item == null) { if (item == null) {
SavageFactions.plugin.log(Level.WARNING, "Invalid item for: " + permissableAction.toString().toUpperCase()); SaberFactions.plugin.log(Level.WARNING, "Invalid item for: " + permissableAction.toString().toUpperCase());
continue; continue;
} }
@ -173,8 +173,8 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
private ItemStack getSpecialItem(SpecialItem specialItem) { private ItemStack getSpecialItem(SpecialItem specialItem) {
if (section == null) { if (section == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return new ItemStack(Material.AIR); return new ItemStack(Material.AIR);
} }
@ -182,7 +182,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
case RELATION: case RELATION:
return permissable.buildItem(); return permissable.buildItem();
case BACK: case BACK:
ConfigurationSection backButtonConfig = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.back-item"); ConfigurationSection backButtonConfig = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.back-item");
ItemStack backButton = new ItemStack(Material.matchMaterial(backButtonConfig.getString("material"))); ItemStack backButton = new ItemStack(Material.matchMaterial(backButtonConfig.getString("material")));
ItemMeta backButtonMeta = backButton.getItemMeta(); ItemMeta backButtonMeta = backButton.getItemMeta();
@ -194,7 +194,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
backButtonMeta.setLore(lore); backButtonMeta.setLore(lore);
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
backButtonMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); backButtonMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }
@ -208,8 +208,8 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
private void buildDummyItems() { private void buildDummyItems() {
if (section == null) { if (section == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return; return;
} }
@ -218,7 +218,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
try { try {
dummyId = Integer.parseInt(key); dummyId = Integer.parseInt(key);
} catch (NumberFormatException exception) { } catch (NumberFormatException exception) {
SavageFactions.plugin.log(Level.WARNING, "Invalid dummy item id: " + key.toUpperCase()); SaberFactions.plugin.log(Level.WARNING, "Invalid dummy item id: " + key.toUpperCase());
continue; continue;
} }
@ -228,7 +228,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
ItemMeta meta = dummyItem.getItemMeta(); ItemMeta meta = dummyItem.getItemMeta();
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }
@ -237,7 +237,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
List<Integer> dummySlots = section.getIntegerList("dummy-items." + key); List<Integer> dummySlots = section.getIntegerList("dummy-items." + key);
for (Integer slot : dummySlots) { for (Integer slot : dummySlots) {
if (slot + 1 > guiSize || slot < 0) { if (slot + 1 > guiSize || slot < 0) {
SavageFactions.plugin.log(Level.WARNING, "Invalid slot: " + slot + " for dummy item: " + key); SaberFactions.plugin.log(Level.WARNING, "Invalid slot: " + slot + " for dummy item: " + key);
continue; continue;
} }
usedDummySlots.add(slot); usedDummySlots.add(slot);
@ -247,17 +247,17 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
private ItemStack buildDummyItem(int id) { private ItemStack buildDummyItem(int id) {
final ConfigurationSection dummySection = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.dummy-items." + id); final ConfigurationSection dummySection = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.dummy-items." + id);
if (dummySection == null) { if (dummySection == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build dummy items for F PERM GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build dummy items for F PERM GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return new ItemStack(Material.AIR); return new ItemStack(Material.AIR);
} }
Material material = Material.matchMaterial(dummySection.getString("material", "")); Material material = Material.matchMaterial(dummySection.getString("material", ""));
if (material == null) { if (material == null) {
SavageFactions.plugin.log(Level.WARNING, "Invalid material for dummy item: " + id); SaberFactions.plugin.log(Level.WARNING, "Invalid material for dummy item: " + id);
return null; return null;
} }
@ -283,7 +283,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
} }
itemMeta.setLore(lore); itemMeta.setLore(lore);
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.zcore.fperms.gui; package com.massivecraft.factions.zcore.fperms.gui;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.FactionGUI; import com.massivecraft.factions.util.FactionGUI;
@ -35,13 +35,13 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
public PermissableRelationGUI(FPlayer fme) { public PermissableRelationGUI(FPlayer fme) {
this.fme = fme; this.fme = fme;
this.section = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.relation"); this.section = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.relation");
} }
public void build() { public void build() {
if (section == null) { if (section == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return; return;
} }
@ -49,7 +49,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
guiSize = section.getInt("rows", 3); guiSize = section.getInt("rows", 3);
if (guiSize > 5) { if (guiSize > 5) {
guiSize = 5; guiSize = 5;
SavageFactions.plugin.log(Level.INFO, "Relation GUI size out of bounds, defaulting to 5"); SaberFactions.plugin.log(Level.INFO, "Relation GUI size out of bounds, defaulting to 5");
} }
guiSize *= 9; guiSize *= 9;
@ -62,12 +62,12 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
continue; continue;
} }
if (slot + 1 > guiSize && slot > 0) { if (slot + 1 > guiSize && slot > 0) {
SavageFactions.plugin.log(Level.WARNING, "Invalid slot of " + key.toUpperCase() + " in relation GUI skipping it"); SaberFactions.plugin.log(Level.WARNING, "Invalid slot of " + key.toUpperCase() + " in relation GUI skipping it");
continue; continue;
} }
if (getPermissable(key) == null) { if (getPermissable(key) == null) {
SavageFactions.plugin.log(Level.WARNING, "Invalid permissable " + key.toUpperCase() + " skipping it"); SaberFactions.plugin.log(Level.WARNING, "Invalid permissable " + key.toUpperCase() + " skipping it");
continue; continue;
} }
@ -112,7 +112,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
ItemStack item = permissable.buildItem(); ItemStack item = permissable.buildItem();
if (item == null) { if (item == null) {
SavageFactions.plugin.log(Level.WARNING, "Invalid material for " + permissable.toString().toUpperCase() + " skipping it"); SaberFactions.plugin.log(Level.WARNING, "Invalid material for " + permissable.toString().toUpperCase() + " skipping it");
continue; continue;
} }
@ -122,8 +122,8 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
private void buildDummyItems() { private void buildDummyItems() {
if (section == null) { if (section == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return; return;
} }
@ -132,7 +132,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
try { try {
dummyId = Integer.parseInt(key); dummyId = Integer.parseInt(key);
} catch (NumberFormatException exception) { } catch (NumberFormatException exception) {
SavageFactions.plugin.log(Level.WARNING, "Invalid dummy item id: " + key.toUpperCase()); SaberFactions.plugin.log(Level.WARNING, "Invalid dummy item id: " + key.toUpperCase());
continue; continue;
} }
@ -142,7 +142,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
} }
ItemMeta meta = dummyItem.getItemMeta(); ItemMeta meta = dummyItem.getItemMeta();
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }
@ -151,7 +151,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
List<Integer> dummySlots = section.getIntegerList("dummy-items." + key); List<Integer> dummySlots = section.getIntegerList("dummy-items." + key);
for (Integer slot : dummySlots) { for (Integer slot : dummySlots) {
if (slot + 1 > guiSize || slot < 0) { if (slot + 1 > guiSize || slot < 0) {
SavageFactions.plugin.log(Level.WARNING, "Invalid slot: " + slot + " for dummy item: " + key); SaberFactions.plugin.log(Level.WARNING, "Invalid slot: " + slot + " for dummy item: " + key);
continue; continue;
} }
relationGUI.setItem(slot, dummyItem); relationGUI.setItem(slot, dummyItem);
@ -160,17 +160,17 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
} }
private ItemStack buildDummyItem(int id) { private ItemStack buildDummyItem(int id) {
final ConfigurationSection dummySection = SavageFactions.plugin.getConfig().getConfigurationSection("fperm-gui.dummy-items." + id); final ConfigurationSection dummySection = SaberFactions.plugin.getConfig().getConfigurationSection("fperm-gui.dummy-items." + id);
if (dummySection == null) { if (dummySection == null) {
SavageFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present."); SaberFactions.plugin.log(Level.WARNING, "Attempted to build f perm GUI but config section not present.");
SavageFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config."); SaberFactions.plugin.log(Level.WARNING, "Copy your config, allow the section to generate, then copy it back to your old config.");
return new ItemStack(Material.AIR); return new ItemStack(Material.AIR);
} }
Material material = Material.matchMaterial(dummySection.getString("material", "")); Material material = Material.matchMaterial(dummySection.getString("material", ""));
if (material == null) { if (material == null) {
SavageFactions.plugin.log(Level.WARNING, "Invalid material for dummy item: " + id); SaberFactions.plugin.log(Level.WARNING, "Invalid material for dummy item: " + id);
return null; return null;
} }
@ -196,7 +196,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
} }
itemMeta.setLore(lore); itemMeta.setLore(lore);
if (!SavageFactions.plugin.mc17) { if (!SaberFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
} }

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.zcore.fupgrades;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.CropState; import org.bukkit.CropState;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -29,13 +29,13 @@ public class CropUpgrades implements Listener {
switch (level) { switch (level) {
case 1: case 1:
chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-1"); chance = SaberFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-1");
break; break;
case 2: case 2:
chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-2"); chance = SaberFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-2");
break; break;
case 3: case 3:
chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-3"); chance = SaberFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-3");
break; break;
} }
@ -50,7 +50,7 @@ public class CropUpgrades implements Listener {
private void growCrop(BlockGrowEvent e) { private void growCrop(BlockGrowEvent e) {
if (e.getBlock().getType().equals(SavageFactions.plugin.CROPS)) { if (e.getBlock().getType().equals(SaberFactions.plugin.CROPS)) {
e.setCancelled(true); e.setCancelled(true);
Crops c = new Crops(CropState.RIPE); Crops c = new Crops(CropState.RIPE);
BlockState bs = e.getBlock().getState(); BlockState bs = e.getBlock().getState();
@ -60,11 +60,11 @@ public class CropUpgrades implements Listener {
Block below = e.getBlock().getLocation().subtract(0, 1, 0).getBlock(); Block below = e.getBlock().getLocation().subtract(0, 1, 0).getBlock();
if (below.getType() == SavageFactions.plugin.SUGAR_CANE_BLOCK) { if (below.getType() == SaberFactions.plugin.SUGAR_CANE_BLOCK) {
Block above = e.getBlock().getLocation().add(0, 1, 0).getBlock(); Block above = e.getBlock().getLocation().add(0, 1, 0).getBlock();
if (above.getType() == Material.AIR && above.getLocation().add(0, -2, 0).getBlock().getType() != Material.AIR) { if (above.getType() == Material.AIR && above.getLocation().add(0, -2, 0).getBlock().getType() != Material.AIR) {
above.setType(SavageFactions.plugin.SUGAR_CANE_BLOCK); above.setType(SaberFactions.plugin.SUGAR_CANE_BLOCK);
} }
} else if (below.getType() == Material.CACTUS) { } else if (below.getType() == Material.CACTUS) {

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.zcore.fupgrades;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SaberFactions;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -30,13 +30,13 @@ public class EXPUpgrade implements Listener {
switch (level) { switch (level) {
case 1: case 1:
multiplier = SavageFactions.plugin.getConfig().getDouble("fupgrades.MainMenu.EXP.EXP-Boost.level-1"); multiplier = SaberFactions.plugin.getConfig().getDouble("fupgrades.MainMenu.EXP.EXP-Boost.level-1");
break; break;
case 2: case 2:
multiplier = SavageFactions.plugin.getConfig().getDouble("fupgrades.MainMenu.EXP.EXP-Boost.level-2"); multiplier = SaberFactions.plugin.getConfig().getDouble("fupgrades.MainMenu.EXP.EXP-Boost.level-2");
break; break;
case 3: case 3:
multiplier = SavageFactions.plugin.getConfig().getDouble("fupgrades.MainMenu.EXP.EXP-Boost.level-3"); multiplier = SaberFactions.plugin.getConfig().getDouble("fupgrades.MainMenu.EXP.EXP-Boost.level-3");
break; break;
} }

Some files were not shown because too many files have changed in this diff Show More