Compare commits

..

1 Commits

Author SHA1 Message Date
Driftay
ec769a56e4 Starting Time Task for Shields 2019-11-21 07:10:56 -05:00
362 changed files with 5908 additions and 11848 deletions

View File

@ -23,7 +23,7 @@ A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Server Version (please complete the following information):**
**Server VErsion (please complete the following information):**
- Spigot Version: [e.g. Paperspigot 1.8.8]
- Factions Version [use /f version]
- Minecraft Version: [If a bug is dependent on client version]

View File

@ -1,9 +1,9 @@
# SaberFactions
![Downloads](https://img.shields.io/github/downloads/driftay/saber-factions/total.svg) [![CodeFactor](https://www.codefactor.io/repository/github/driftay/saber-factions/badge)](https://www.codefactor.io/repository/github/driftay/saber-factions) [![License](https://img.shields.io/badge/license-GNU%20General%20Public%20License%20v3.0-brightgreen)](https://github.com/SaberLLC/Saber-Factions/blob/1.6.x/LICENSE) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/SaberLLC/Saber-Factions) [![](https://jitpack.io/v/SaberLLC/Saber-Factions.svg)](https://jitpack.io/#SaberLLC/Saber-Factions)
![Downloads](https://img.shields.io/github/downloads/driftay/saber-factions/total.svg) [![CodeFactor](https://www.codefactor.io/repository/github/driftay/saber-factions/badge)](https://www.codefactor.io/repository/github/driftay/saber-factions)
SaberFactions is an exotic, performance optimized, and feature rich factions plugin that focuses on not only making the player experience as great as possibly but maintaining this aspect with the cost of NOTHING! We strive to continue development for SaberFactions as the factions community is strongly growing and seeking new players every day.
SaberFactions is a fork of both FactionsUUID and SavageFactions. Creators of those plugins include DtrShock and ProSavage. Credits to them.
SaberFactions is the newest, latest and greatest factions plugin designed for the best and most functional factions experience minecraft has seen!
## Some Exciting Features
Some of our features include the following
@ -14,12 +14,6 @@ Some of our features include the following
* More F Upgrades - Unbreakable Redstone Upgrade, Members Upgrade, and Power Upgrade.
* Factions Corner - In the corner of a world? No Problem /f corner will claim your entire buffer for you!
* Command Cooldowns - Configurable Command Cooldowns for most "spam" commands. And so Much More to Come!
* Faction Points - A point based currency that can be used for any aspect of factions gameplay!
* Faction Shop - A shop that essentially lets players buy in-game items in exchange for faction points!
* Faction Discord Integration - A discord intergrated factions bot for each faction to have their own personalized discord bot within their faction!
* Faction Audit - A full based logging system (GUI designed) to see every aspect of what happens in your faction!
* Factions Check System - An automated check system that alerts players when to check walls/buffers!
* Faction Reserves - A system designed to reserve a specific faction name for a specific player!
## Dependency With Maven
```
@ -31,9 +25,9 @@ Some of our features include the following
</repositories>
<dependency>
<groupId>com.github.SaberLLC</groupId>
<groupId>com.github.Driftay</groupId>
<artifactId>Saber-Factions</artifactId>
<version>2.3.3-STABLE</version>
<version>1.4.1</version>
</dependency>
```
## Moving Forward
@ -42,8 +36,8 @@ Moving forward we plan to take all suggestions into consideration, as they come
We Plan on Releasing the latest and greatest factions/skyblock/prison plugins minecraft has to offer and wont settle for anything less
## Support
Have a problem, question, or concer? We encourage our community to join and express any inquiry you may have
https://discord.saber.pw
Our Discord is Currently In Progress of a Massive Overhaul, but we still encourage our community to join and express any concerns/questions/suggestions they may have!
https://discord.gg/37JvmM
Look forward to a bright future and a journey with all of you!

View File

@ -128,7 +128,7 @@
<li><a href="com/massivecraft/factions/zcore/CommandVisibility.html" title="enum in com.massivecraft.factions.zcore" target="classFrame">CommandVisibility</a></li>
<li><a href="com/massivecraft/factions/Conf.html" title="class in com.massivecraft.factions" target="classFrame">Conf</a></li>
<li><a href="com/massivecraft/factions/Conf.Backend.html" title="enum in com.massivecraft.factions" target="classFrame">Conf.Backend</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">CropUpgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">CropUpgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/util/DiscUtil.html" title="class in com.massivecraft.factions.zcore.util" target="classFrame">DiscUtil</a></li>
<li><a href="com/massivecraft/factions/integration/dynmap/DynmapStyle.html" title="class in com.massivecraft.factions.integration.dynmap" target="classFrame">DynmapStyle</a></li>
<li><a href="com/massivecraft/factions/integration/Econ.html" title="class in com.massivecraft.factions.integration" target="classFrame">Econ</a></li>
@ -136,7 +136,7 @@
<li><a href="com/massivecraft/factions/integration/dynmap/EngineDynmap.html" title="class in com.massivecraft.factions.integration.dynmap" target="classFrame">EngineDynmap</a></li>
<li><a href="com/massivecraft/factions/util/EnumTypeAdapter.html" title="class in com.massivecraft.factions.util" target="classFrame">EnumTypeAdapter</a></li>
<li><a href="com/massivecraft/factions/integration/Essentials.html" title="class in com.massivecraft.factions.integration" target="classFrame">Essentials</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">EXPUpgrade</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">EXPUpgrade</a></li>
<li><a href="com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions" target="classFrame"><span class="interfaceName">Faction</span></a></li>
<li><a href="com/massivecraft/factions/event/FactionCreateEvent.html" title="class in com.massivecraft.factions.event" target="classFrame">FactionCreateEvent</a></li>
<li><a href="com/massivecraft/factions/event/FactionDisbandEvent.html" title="class in com.massivecraft.factions.event" target="classFrame">FactionDisbandEvent</a></li>
@ -171,7 +171,7 @@
<li><a href="com/massivecraft/factions/scoreboards/FScoreboard.html" title="class in com.massivecraft.factions.scoreboards" target="classFrame">FScoreboard</a></li>
<li><a href="com/massivecraft/factions/scoreboards/FSidebarProvider.html" title="class in com.massivecraft.factions.scoreboards" target="classFrame">FSidebarProvider</a></li>
<li><a href="com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards" target="classFrame">FTeamWrapper</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">FUpgradesGUI</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">FUpgradesGUI</a></li>
<li><a href="com/massivecraft/factions/zcore/nbtapi/utils/GsonWrapper.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils" target="classFrame">GsonWrapper</a></li>
<li><a href="com/massivecraft/factions/util/InventoryTypeAdapter.html" title="class in com.massivecraft.factions.util" target="classFrame">InventoryTypeAdapter</a></li>
<li><a href="com/massivecraft/factions/util/InventoryUtil.html" title="class in com.massivecraft.factions.util" target="classFrame">InventoryUtil</a></li>
@ -242,7 +242,7 @@
title="class in com.massivecraft.factions">SaberFactions</a></li>
<li><a href="com/massivecraft/factions/zcore/persist/SaveTask.html" title="class in com.massivecraft.factions.zcore.persist" target="classFrame">SaveTask</a></li>
<li><a href="com/massivecraft/factions/zcore/util/SmokeUtil.html" title="class in com.massivecraft.factions.zcore.util" target="classFrame">SmokeUtil</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
<li><a href="com/massivecraft/factions/util/SpiralTask.html" title="class in com.massivecraft.factions.util" target="classFrame">SpiralTask</a></li>
<li><a href="com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util" target="classFrame">TagReplacer</a></li>
<li><a href="com/massivecraft/factions/zcore/util/TagReplacer.TagType.html" title="enum in com.massivecraft.factions.zcore.util" target="classFrame">TagReplacer.TagType</a></li>

View File

@ -942,7 +942,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<th class="colLast" scope="row">&nbsp;</th>
</tr>
<tr class="rowColor" id="i207">
<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></td>
<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></td>
<th class="colLast" scope="row">&nbsp;</th>
</tr>
<tr class="altColor" id="i208">
@ -1364,11 +1364,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</th>
</tr>
<tr class="rowColor" id="i301">
<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></td>
<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></td>
<th class="colLast" scope="row">&nbsp;</th>
</tr>
<tr class="altColor" id="i302">
<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></td>
<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></td>
<th class="colLast" scope="row">&nbsp;</th>
</tr>
<tr class="rowColor" id="i303">

View File

@ -128,7 +128,7 @@
<li><a href="com/massivecraft/factions/zcore/CommandVisibility.html" title="enum in com.massivecraft.factions.zcore">CommandVisibility</a></li>
<li><a href="com/massivecraft/factions/Conf.html" title="class in com.massivecraft.factions">Conf</a></li>
<li><a href="com/massivecraft/factions/Conf.Backend.html" title="enum in com.massivecraft.factions">Conf.Backend</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">CropUpgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades">CropUpgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/util/DiscUtil.html" title="class in com.massivecraft.factions.zcore.util">DiscUtil</a></li>
<li><a href="com/massivecraft/factions/integration/dynmap/DynmapStyle.html" title="class in com.massivecraft.factions.integration.dynmap">DynmapStyle</a></li>
<li><a href="com/massivecraft/factions/integration/Econ.html" title="class in com.massivecraft.factions.integration">Econ</a></li>
@ -136,7 +136,7 @@
<li><a href="com/massivecraft/factions/integration/dynmap/EngineDynmap.html" title="class in com.massivecraft.factions.integration.dynmap">EngineDynmap</a></li>
<li><a href="com/massivecraft/factions/util/EnumTypeAdapter.html" title="class in com.massivecraft.factions.util">EnumTypeAdapter</a></li>
<li><a href="com/massivecraft/factions/integration/Essentials.html" title="class in com.massivecraft.factions.integration">Essentials</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">EXPUpgrade</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades">EXPUpgrade</a></li>
<li><a href="com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions"><span class="interfaceName">Faction</span></a></li>
<li><a href="com/massivecraft/factions/event/FactionCreateEvent.html" title="class in com.massivecraft.factions.event">FactionCreateEvent</a></li>
<li><a href="com/massivecraft/factions/event/FactionDisbandEvent.html" title="class in com.massivecraft.factions.event">FactionDisbandEvent</a></li>
@ -171,7 +171,7 @@
<li><a href="com/massivecraft/factions/scoreboards/FScoreboard.html" title="class in com.massivecraft.factions.scoreboards">FScoreboard</a></li>
<li><a href="com/massivecraft/factions/scoreboards/FSidebarProvider.html" title="class in com.massivecraft.factions.scoreboards">FSidebarProvider</a></li>
<li><a href="com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards">FTeamWrapper</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></li>
<li><a href="com/massivecraft/factions/zcore/nbtapi/utils/GsonWrapper.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils">GsonWrapper</a></li>
<li><a href="com/massivecraft/factions/util/InventoryTypeAdapter.html" title="class in com.massivecraft.factions.util">InventoryTypeAdapter</a></li>
<li><a href="com/massivecraft/factions/util/InventoryUtil.html" title="class in com.massivecraft.factions.util">InventoryUtil</a></li>
@ -242,7 +242,7 @@
</li>
<li><a href="com/massivecraft/factions/zcore/persist/SaveTask.html" title="class in com.massivecraft.factions.zcore.persist">SaveTask</a></li>
<li><a href="com/massivecraft/factions/zcore/util/SmokeUtil.html" title="class in com.massivecraft.factions.zcore.util">SmokeUtil</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">SpawnerUpgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades">SpawnerUpgrades</a></li>
<li><a href="com/massivecraft/factions/util/SpiralTask.html" title="class in com.massivecraft.factions.util">SpiralTask</a></li>
<li><a href="com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer</a></li>
<li><a href="com/massivecraft/factions/zcore/util/TagReplacer.TagType.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer.TagType</a></li>

View File

@ -223,7 +223,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></th>
<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">

View File

@ -630,7 +630,7 @@ extends <a href="iface/EconomyParticipator.html" title="interface in com.massive
</tr>
<tr class="altColor" id="i96">
<td class="colFirst"><code>int</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor" id="i97">
@ -1066,7 +1066,7 @@ extends <a href="iface/EconomyParticipator.html" title="interface in com.massive
</tr>
<tr class="rowColor" id="i181">
<td class="colFirst"><code>void</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
int&nbsp;level)</code></th>
<td class="colLast">&nbsp;</td>
</tr>
@ -1743,23 +1743,23 @@ extends <a href="iface/EconomyParticipator.html" title="interface in com.massive
<pre class="methodSignature">void&nbsp;deinvite&#8203;(<a href="FPlayer.html" title="interface in com.massivecraft.factions">FPlayer</a>&nbsp;fplayer)</pre>
</li>
</ul>
<a id="setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">
<a id="setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setUpgrade</h4>
<pre class="methodSignature">void&nbsp;setUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
<pre class="methodSignature">void&nbsp;setUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
int&nbsp;level)</pre>
</li>
</ul>
<a id="getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">
<a id="getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>getUpgrade</h4>
<pre class="methodSignature">int&nbsp;getUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
<pre class="methodSignature">int&nbsp;getUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
</li>
</ul>
<a id="isInvited(com.massivecraft.factions.FPlayer)">

View File

@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.zcore.frame.fdisband.FactionWarpsFrame</li>
<li>com.massivecraft.factions.util.FactionWarpsFrame</li>
</ul>
</li>
</ul>

View File

@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.util.adapters.InventoryTypeAdapter</li>
<li>com.massivecraft.factions.util.InventoryTypeAdapter</li>
</ul>
</li>
</ul>

View File

@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.util.adapters.LocationTypeAdapter</li>
<li>com.massivecraft.factions.util.LocationTypeAdapter</li>
</ul>
</li>
</ul>

View File

@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.util.adapters.MapFLocToStringSetTypeAdapter</li>
<li>com.massivecraft.factions.util.MapFLocToStringSetTypeAdapter</li>
</ul>
</li>
</ul>

View File

@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.util.adapters.MyLocationTypeAdapter</li>
<li>com.massivecraft.factions.util.MyLocationTypeAdapter</li>
</ul>
</li>
</ul>

View File

@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.util.adapters.PermissionsMapTypeAdapter</li>
<li>com.massivecraft.factions.util.PermissionsMapTypeAdapter</li>
</ul>
</li>
</ul>

View File

@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li>Prev&nbsp;Class</li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" target="_top">Frames</a></li>
@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
<!-- ========= END OF TOP NAVBAR ========= -->
<!-- ======== START OF CLASS DATA ======== -->
<div class="header">
<div class="subTitle">com.massivecraft.factions.zcore.frame.fupgrades</div>
<div class="subTitle">com.massivecraft.factions.zcore.fupgrades</div>
<h2 title="Class CropUpgrades" class="title">Class CropUpgrades</h2>
</div>
<div class="contentContainer">
@ -99,7 +99,7 @@ var activeTableTab = "activeTableTab";
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.zcore.frame.fupgrades.CropUpgrades</li>
<li>com.massivecraft.factions.zcore.fupgrades.CropUpgrades</li>
</ul>
</li>
</ul>
@ -230,7 +230,7 @@ implements org.bukkit.event.Listener</pre>
<div class="subNav">
<ul class="navList">
<li>Prev&nbsp;Class</li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" target="_top">Frames</a></li>

View File

@ -48,8 +48,8 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" target="_top">Frames</a></li>
@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
<!-- ========= END OF TOP NAVBAR ========= -->
<!-- ======== START OF CLASS DATA ======== -->
<div class="header">
<div class="subTitle">com.massivecraft.factions.zcore.frame.fupgrades</div>
<div class="subTitle">com.massivecraft.factions.zcore.fupgrades</div>
<h2 title="Class EXPUpgrade" class="title">Class EXPUpgrade</h2>
</div>
<div class="contentContainer">
@ -99,7 +99,7 @@ var activeTableTab = "activeTableTab";
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.zcore.frame.fupgrades.EXPUpgrade</li>
<li>com.massivecraft.factions.zcore.fupgrades.EXPUpgrade</li>
</ul>
</li>
</ul>
@ -229,8 +229,8 @@ implements org.bukkit.event.Listener</pre>
</div>
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" target="_top">Frames</a></li>

View File

@ -99,7 +99,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<!-- ======== START OF CLASS DATA ======== -->
<main role="main">
<div class="header">
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></div>
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></div>
<h2 title="Class FUpgradesGUI" class="title">Class FUpgradesGUI</h2>
</div>
<div class="contentContainer">
@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.zcore.frame.fupgrades.FUpgradesGUI</li>
<li>com.massivecraft.factions.zcore.fupgrades.FUpgradesGUI</li>
</ul>
</li>
</ul>

View File

@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li>Next&nbsp;Class</li>
</ul>
<ul class="navList">
@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
<!-- ========= END OF TOP NAVBAR ========= -->
<!-- ======== START OF CLASS DATA ======== -->
<div class="header">
<div class="subTitle">com.massivecraft.factions.zcore.frame.fupgrades</div>
<div class="subTitle">com.massivecraft.factions.zcore.fupgrades</div>
<h2 title="Class SpawnerUpgrades" class="title">Class SpawnerUpgrades</h2>
</div>
<div class="contentContainer">
@ -99,7 +99,7 @@ var activeTableTab = "activeTableTab";
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.zcore.frame.fupgrades.SpawnerUpgrades</li>
<li>com.massivecraft.factions.zcore.fupgrades.SpawnerUpgrades</li>
</ul>
</li>
</ul>
@ -229,7 +229,7 @@ implements org.bukkit.event.Listener</pre>
</div>
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li>Next&nbsp;Class</li>
</ul>
<ul class="navList">

View File

@ -99,7 +99,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<!-- ======== START OF CLASS DATA ======== -->
<main role="main">
<div class="header">
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></div>
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></div>
<h2 title="Enum UpgradeType" class="title">Enum UpgradeType</h2>
</div>
<div class="contentContainer">
@ -107,10 +107,10 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</li>
<li>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType</li>
<li>com.massivecraft.factions.zcore.fupgrades.UpgradeType</li>
</ul>
</li>
</ul>
@ -121,11 +121,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li class="blockList">
<dl>
<dt>All Implemented Interfaces:</dt>
<dd><code>java.io.Serializable</code>, <code>java.lang.Comparable&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</code>, <code>java.lang.constant.Constable</code></dd>
<dd><code>java.io.Serializable</code>, <code>java.lang.Comparable&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</code>, <code>java.lang.constant.Constable</code></dd>
</dl>
<hr>
<pre>public enum <span class="typeNameLabel">UpgradeType</span>
extends java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</pre>
extends java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</pre>
</li>
</ul>
</div>
@ -241,14 +241,14 @@ extends java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivec
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor" id="i1">
<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></code></td>
<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#valueOf(java.lang.String)">valueOf</a></span>&#8203;(java.lang.String&nbsp;name)</code></th>
<td class="colLast">
<div class="block">Returns the enum constant of this type with the specified name.</div>
</td>
</tr>
<tr class="altColor" id="i2">
<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>[]</code></td>
<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>[]</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#values()">values</a></span>()</code></th>
<td class="colLast">
<div class="block">Returns an array containing the constants of this enum type, in
@ -295,7 +295,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>CHEST</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> CHEST</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> CHEST</pre>
</li>
</ul>
<a id="SPAWNER">
@ -304,7 +304,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>SPAWNER</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> SPAWNER</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> SPAWNER</pre>
</li>
</ul>
<a id="EXP">
@ -313,7 +313,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>EXP</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> EXP</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> EXP</pre>
</li>
</ul>
<a id="CROP">
@ -322,7 +322,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>CROP</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> CROP</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> CROP</pre>
</li>
</ul>
<a id="POWER">
@ -331,7 +331,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>POWER</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> POWER</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> POWER</pre>
</li>
</ul>
<a id="REDSTONE">
@ -340,7 +340,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>REDSTONE</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> REDSTONE</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> REDSTONE</pre>
</li>
</ul>
<a id="MEMBERS">
@ -349,7 +349,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>MEMBERS</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> MEMBERS</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> MEMBERS</pre>
</li>
</ul>
<a id="TNT">
@ -358,7 +358,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>TNT</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> TNT</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> TNT</pre>
</li>
</ul>
<a id="WARP">
@ -367,7 +367,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>WARP</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> WARP</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> WARP</pre>
</li>
</ul>
<a id="DAMAGEINCREASE">
@ -376,7 +376,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>DAMAGEINCREASE</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> DAMAGEINCREASE</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> DAMAGEINCREASE</pre>
</li>
</ul>
<a id="DAMAGEDECREASE">
@ -385,7 +385,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>DAMAGEDECREASE</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> DAMAGEDECREASE</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> DAMAGEDECREASE</pre>
</li>
</ul>
<a id="REINFORCEDARMOR">
@ -394,7 +394,7 @@ the order they are declared.</div>
<ul class="blockListLast">
<li class="blockList">
<h4>REINFORCEDARMOR</h4>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> REINFORCEDARMOR</pre>
<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> REINFORCEDARMOR</pre>
</li>
</ul>
</li>
@ -413,7 +413,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>[]&nbsp;values()</pre>
<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>[]&nbsp;values()</pre>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared.</div>
<dl>
@ -428,7 +428,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>valueOf</h4>
<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;valueOf&#8203;(java.lang.String&nbsp;name)</pre>
<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;valueOf&#8203;(java.lang.String&nbsp;name)</pre>
<div class="block">Returns the enum constant of this type with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this type. (Extraneous whitespace characters are
@ -453,7 +453,7 @@ not permitted.)</div>
<pre class="methodSignature">public&nbsp;java.lang.String&nbsp;toString()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</code></dd>
<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</code></dd>
</dl>
</li>
</ul>

View File

@ -99,7 +99,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<!-- ======== START OF CLASS DATA ======== -->
<main role="main">
<div class="header">
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></div>
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></div>
<h2 title="Class UpgradesListener" class="title">Class UpgradesListener</h2>
</div>
<div class="contentContainer">
@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
<li>com.massivecraft.factions.zcore.frame.fupgrades.UpgradesListener</li>
<li>com.massivecraft.factions.zcore.fupgrades.UpgradesListener</li>
</ul>
</li>
</ul>

View File

@ -3,20 +3,20 @@
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_191) on Thu Dec 06 16:05:50 CST 2018 -->
<title>com.massivecraft.factions.zcore.frame.fupgrades</title>
<title>com.massivecraft.factions.zcore.fupgrades</title>
<meta content="2018-12-06" name="date">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../../script.js"></script>
</head>
<body>
<h1 class="bar"><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/package-summary.html" target="classFrame">com.massivecraft.factions.zcore.frame.fupgrades</a></h1>
<h1 class="bar"><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/package-summary.html" target="classFrame">com.massivecraft.factions.zcore.fupgrades</a></h1>
<div class="indexContainer">
<h2 title="Classes">Classes</h2>
<ul title="Classes">
<li><a href="CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">CropUpgrades</a></li>
<li><a href="EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">EXPUpgrade</a></li>
<li><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">FUpgradesGUI</a></li>
<li><a href="SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
<li><a href="CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">CropUpgrades</a></li>
<li><a href="EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">EXPUpgrade</a></li>
<li><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">FUpgradesGUI</a></li>
<li><a href="SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
</ul>
</div>
</body>

View File

@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc (12.0.1) on Fri Nov 01 13:30:56 CDT 2019 -->
<title>com.massivecraft.factions.zcore.frame.fupgrades</title>
<title>com.massivecraft.factions.zcore.fupgrades</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="dc.created" content="2019-11-01">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
@ -77,7 +77,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</header>
<main role="main">
<div class="header">
<h1 title="Package" class="title">Package&nbsp;com.massivecraft.factions.zcore.frame.fupgrades</h1>
<h1 title="Package" class="title">Package&nbsp;com.massivecraft.factions.zcore.fupgrades</h1>
</div>
<div class="contentContainer">
<ul class="blockList">
@ -91,11 +91,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</tr>
<tbody>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></th>
<th class="colFirst" scope="row"><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></th>
<th class="colFirst" scope="row"><a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></th>
<td class="colLast">&nbsp;</td>
</tr>
</tbody>
@ -112,7 +112,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</tr>
<tbody>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></th>
<th class="colFirst" scope="row"><a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></th>
<td class="colLast">&nbsp;</td>
</tr>
</tbody>

View File

@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc (12.0.1) on Fri Nov 01 13:30:56 CDT 2019 -->
<title>com.massivecraft.factions.zcore.frame.fupgrades Class Hierarchy</title>
<title>com.massivecraft.factions.zcore.fupgrades Class Hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="dc.created" content="2019-11-01">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="com.massivecraft.factions.zcore.frame.fupgrades Class Hierarchy";
parent.document.title="com.massivecraft.factions.zcore.fupgrades Class Hierarchy";
}
}
catch(err) {
@ -77,7 +77,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</header>
<main role="main">
<div class="header">
<h1 class="title">Hierarchy For Package com.massivecraft.factions.zcore.frame.fupgrades</h1>
<h1 class="title">Hierarchy For Package com.massivecraft.factions.zcore.fupgrades</h1>
<span class="packageHierarchyLabel">Package Hierarchies:</span>
<ul class="horizontal">
<li><a href="../../../../../overview-tree.html">All Packages</a></li>
@ -89,8 +89,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul>
<li class="circle">java.lang.Object
<ul>
<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
</ul>
</li>
</ul>
@ -102,7 +102,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul>
<li class="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.lang.constant.Constable, java.io.Serializable)
<ul>
<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
</ul>
</li>
</ul>

View File

@ -888,7 +888,7 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
</tr>
<tr class="altColor" id="i98">
<td class="colFirst"><code>int</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor" id="i99">
@ -1334,7 +1334,7 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
</tr>
<tr class="rowColor" id="i185">
<td class="colFirst"><code>void</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
int&nbsp;level)</code></th>
<td class="colLast">&nbsp;</td>
</tr>
@ -2455,16 +2455,16 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
</dl>
</li>
</ul>
<a id="getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">
<a id="getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>getUpgrade</h4>
<pre class="methodSignature">public&nbsp;int&nbsp;getUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
<pre class="methodSignature">public&nbsp;int&nbsp;getUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="../../Faction.html#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
<dd><code><a href="../../Faction.html#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
</dl>
</li>
</ul>
@ -2598,17 +2598,17 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
</dl>
</li>
</ul>
<a id="setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">
<a id="setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setUpgrade</h4>
<pre class="methodSignature">public&nbsp;void&nbsp;setUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
<pre class="methodSignature">public&nbsp;void&nbsp;setUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
int&nbsp;level)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="../../Faction.html#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
<dd><code><a href="../../Faction.html#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
</dl>
</li>
</ul>

File diff suppressed because one or more lines are too long

View File

@ -31,7 +31,7 @@ com.massivecraft.factions.util.Particles
com.massivecraft.factions.zcore
com.massivecraft.factions.zcore.fperms
com.massivecraft.factions.zcore.fperms.gui
com.massivecraft.factions.zcore.frame.fupgrades
com.massivecraft.factions.zcore.fupgrades
com.massivecraft.factions.zcore.nbtapi
com.massivecraft.factions.zcore.nbtapi.utils
com.massivecraft.factions.zcore.persist

View File

@ -235,7 +235,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/cmd/CommandRequirements.Builder.html#memberOnly()">memberOnly()</a></span> - Method in class com.massivecraft.factions.cmd.<a href="../com/massivecraft/factions/cmd/CommandRequirements.Builder.html" title="class in com.massivecraft.factions.cmd">CommandRequirements.Builder</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#MEMBERS">MEMBERS</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#MEMBERS">MEMBERS</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/zcore/persist/MemoryBoard.html" title="class in com.massivecraft.factions.zcore.persist"><span class="typeNameLink">MemoryBoard</span></a> - Class in <a href="../com/massivecraft/factions/zcore/persist/package-summary.html">com.massivecraft.factions.zcore.persist</a></dt>
<dd>&nbsp;</dd>

View File

@ -129,7 +129,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TagReplacer.html#OFFLINE_LIST">OFFLINE_LIST</a></span> - com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onArmorDamage(org.bukkit.event.player.PlayerItemDamageEvent)">onArmorDamage(PlayerItemDamageEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onArmorDamage(org.bukkit.event.player.PlayerItemDamageEvent)">onArmorDamage(PlayerItemDamageEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html#onBannerBreak(org.bukkit.event.block.BlockBreakEvent)">onBannerBreak(BlockBreakEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html" title="class in com.massivecraft.factions.listeners">FactionsBlockListener</a></dt>
<dd>&nbsp;</dd>
@ -163,7 +163,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/FactionGUI.html#onClick(int,org.bukkit.event.inventory.ClickType)">onClick(int, ClickType)</a></span> - Method in interface com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/FactionGUI.html" title="interface in com.massivecraft.factions.util">FactionGUI</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#onClick(org.bukkit.event.inventory.InventoryClickEvent)">onClick(InventoryClickEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#onClick(org.bukkit.event.inventory.InventoryClickEvent)">onClick(InventoryClickEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html#onClose(org.bukkit.event.inventory.InventoryCloseEvent)">onClose(InventoryCloseEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html" title="class in com.massivecraft.factions.listeners">FactionsPlayerListener</a></dt>
<dd>&nbsp;</dd>
@ -175,19 +175,19 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html#onCreeperGlitch(org.bukkit.event.entity.EntityDamageEvent)">onCreeperGlitch(EntityDamageEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html" title="class in com.massivecraft.factions.listeners">FactionsEntityListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onCropGrow(org.bukkit.event.block.BlockGrowEvent)">onCropGrow(BlockGrowEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onCropGrow(org.bukkit.event.block.BlockGrowEvent)">onCropGrow(BlockGrowEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html#onDamage(org.bukkit.event.entity.EntityDamageEvent)">onDamage(EntityDamageEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html" title="class in com.massivecraft.factions.listeners">FactionsPlayerListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageIncrease(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageIncrease(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageIncrease(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageIncrease(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageReduction(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageReduction(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageReduction(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageReduction(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FPlayer.html#onDeath()">onDeath()</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/FPlayer.html" title="interface in com.massivecraft.factions">FPlayer</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFPlayer.html#onDeath()">onDeath()</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFPlayer.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFPlayer</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDeath(org.bukkit.event.entity.EntityDeathEvent)">onDeath(EntityDeathEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDeath(org.bukkit.event.entity.EntityDeathEvent)">onDeath(EntityDeathEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FactionsPlugin.html#onDisable()">onDisable()</a></span> - Method in class com.massivecraft.factions.<a href="../com/massivecraft/factions/FactionsPlugin.html" title="class in com.massivecraft.factions">FactionsPlugin</a></dt>
<dd>&nbsp;</dd>
@ -307,7 +307,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html#onPotionSplashEvent(org.bukkit.event.entity.PotionSplashEvent)">onPotionSplashEvent(PotionSplashEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html" title="class in com.massivecraft.factions.listeners">FactionsEntityListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onSpawn(org.bukkit.event.entity.SpawnerSpawnEvent)">onSpawn(SpawnerSpawnEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onSpawn(org.bukkit.event.entity.SpawnerSpawnEvent)">onSpawn(SpawnerSpawnEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FactionsPlugin.html#onTabComplete(org.bukkit.command.CommandSender,org.bukkit.command.Command,java.lang.String,java.lang.String%5B%5D)">onTabComplete(CommandSender, Command, String, String[])</a></span> - Method in class com.massivecraft.factions.<a href="../com/massivecraft/factions/FactionsPlugin.html" title="class in com.massivecraft.factions">FactionsPlugin</a></dt>
<dd>&nbsp;</dd>
@ -319,13 +319,13 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html#onVaultPlace(org.bukkit.event.block.BlockPlaceEvent)">onVaultPlace(BlockPlaceEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html" title="class in com.massivecraft.factions.listeners">FactionsBlockListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onWaterRedstone(org.bukkit.event.block.BlockFromToEvent)">onWaterRedstone(BlockFromToEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onWaterRedstone(org.bukkit.event.block.BlockFromToEvent)">onWaterRedstone(BlockFromToEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#open">open</a></span> - Variable in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/struct/Permission.html#OPEN">OPEN</a></span> - com.massivecraft.factions.struct.<a href="../com/massivecraft/factions/struct/Permission.html" title="enum in com.massivecraft.factions.struct">Permission</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#openMainMenu(com.massivecraft.factions.FPlayer)">openMainMenu(FPlayer)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#openMainMenu(com.massivecraft.factions.FPlayer)">openMainMenu(FPlayer)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/cmd/FCommand.html#optionalArgs">optionalArgs</a></span> - Variable in class com.massivecraft.factions.cmd.<a href="../com/massivecraft/factions/cmd/FCommand.html" title="class in com.massivecraft.factions.cmd">FCommand</a></dt>
<dd>&nbsp;</dd>

View File

@ -922,7 +922,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/tag/FactionTag.html#POWER">POWER</a></span> - com.massivecraft.factions.tag.<a href="../com/massivecraft/factions/tag/FactionTag.html" title="enum in com.massivecraft.factions.tag">FactionTag</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#POWER">POWER</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#POWER">POWER</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TagReplacer.html#POWER">POWER</a></span> - com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer</a></dt>
<dd>&nbsp;</dd>

View File

@ -193,7 +193,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#REDSTONE">REDSTONE</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REDSTONE">REDSTONE</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REDSTONE">REDSTONE</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#REDSTONE_BLOCK">REDSTONE_BLOCK</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>
@ -239,7 +239,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FLocation.html#regionToChunk(int)">regionToChunk(int)</a></span> - Static method in class com.massivecraft.factions.<a href="../com/massivecraft/factions/FLocation.html" title="class in com.massivecraft.factions">FLocation</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REINFORCEDARMOR">REINFORCEDARMOR</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REINFORCEDARMOR">REINFORCEDARMOR</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/struct/Relation.html" title="enum in com.massivecraft.factions.struct"><span class="typeNameLink">Relation</span></a> - Enum in <a href="../com/massivecraft/factions/struct/package-summary.html">com.massivecraft.factions.struct</a></dt>
<dd>&nbsp;</dd>

View File

@ -757,9 +757,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>
<div class="block">This method hooks into all permission plugins we are supporting</div>
</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/Particles/ReflectionUtils.html#setValue(java.lang.Object,boolean,java.lang.String,java.lang.Object)">setValue(Object, boolean, String, Object)</a></span> - Static method in class com.massivecraft.factions.util.Particles.<a href="../com/massivecraft/factions/util/Particles/ReflectionUtils.html" title="class in com.massivecraft.factions.util.Particles">ReflectionUtils</a></dt>
<dd>
@ -1009,7 +1009,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#SPAWNER">SPAWNER</a></span> - com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#SPAWNER">SPAWNER</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#SPAWNER">SPAWNER</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Conf.html#spawnerLock">spawnerLock</a></span> - Static variable in class com.massivecraft.factions.<a href="../com/massivecraft/factions/Conf.html" title="class in com.massivecraft.factions">Conf</a></dt>
<dd>&nbsp;</dd>

View File

@ -236,7 +236,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#TNT">TNT</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#TNT">TNT</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#TNT">TNT</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#TNT_MINECART">TNT_MINECART</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>
@ -284,7 +284,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#toString()">toString()</a></span> - Method in enum com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#toString()">toString()</a></span> - Method in enum com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#toString()">toString()</a></span> - Method in enum com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/nbtapi/NBTCompound.html#toString()">toString()</a></span> - Method in class com.massivecraft.factions.zcore.nbtapi.<a href="../com/massivecraft/factions/zcore/nbtapi/NBTCompound.html" title="class in com.massivecraft.factions.zcore.nbtapi">NBTCompound</a></dt>
<dd>&nbsp;</dd>

View File

@ -139,11 +139,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/struct/Permission.html#UPGRADES">UPGRADES</a></span> - com.massivecraft.factions.struct.<a href="../com/massivecraft/factions/struct/Permission.html" title="enum in com.massivecraft.factions.struct">Permission</a></dt>
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></dt>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#%3Cinit%3E()">UpgradesListener()</a></span> - Constructor for class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#%3Cinit%3E()">UpgradesListener()</a></span> - Constructor for class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradeType</span></a> - Enum in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></dt>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradeType</span></a> - Enum in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TextUtil.html#upperCaseFirst(java.lang.String)">upperCaseFirst(String)</a></span> - Static method in class com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TextUtil.html" title="class in com.massivecraft.factions.zcore.util">TextUtil</a></dt>
<dd>&nbsp;</dd>

View File

@ -213,7 +213,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>
<div class="block">Returns the enum constant of this type with the specified name.</div>
</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>
<div class="block">Returns the enum constant of this type with the specified name.</div>
</dd>
@ -362,7 +362,7 @@ the order they are declared.</div>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared.</div>
</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#values()">values()</a></span> - Static method in enum com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#values()">values()</a></span> - Static method in enum com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared.</div>

View File

@ -123,7 +123,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#WARP">WARP</a></span> - com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#WARP">WARP</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#WARP">WARP</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#warpPasswords">warpPasswords</a></span> - Variable in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
<dd>&nbsp;</dd>

View File

@ -347,7 +347,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#CHEST">CHEST</a></span> - com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CHEST">CHEST</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CHEST">CHEST</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TL.html#CHEST_ITEM_DENIED_TRANSFER">CHEST_ITEM_DENIED_TRANSFER</a></span> - com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TL.html" title="enum in com.massivecraft.factions.zcore.util">TL</a></dt>
<dd>&nbsp;</dd>
@ -1445,7 +1445,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/zcore/fperms/gui/package-summary.html">com.massivecraft.factions.zcore.fperms.gui</a> - package com.massivecraft.factions.zcore.fperms.gui</dt>
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a> - package com.massivecraft.factions.zcore.frame.fupgrades</dt>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a> - package com.massivecraft.factions.zcore.fupgrades</dt>
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/zcore/nbtapi/package-summary.html">com.massivecraft.factions.zcore.nbtapi</a> - package com.massivecraft.factions.zcore.nbtapi</dt>
<dd>&nbsp;</dd>
@ -3103,7 +3103,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
The speed value influences the velocity at which the particle flies off
</div>
</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CROP">CROP</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CROP">CROP</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#CROSSBOW">CROSSBOW</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>

View File

@ -87,9 +87,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#DAMAGED_ANVIL">DAMAGED_ANVIL</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEDECREASE">DAMAGEDECREASE</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEDECREASE">DAMAGEDECREASE</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEINCREASE">DAMAGEINCREASE</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEINCREASE">DAMAGEINCREASE</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#DANDELION">DANDELION</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>

View File

@ -279,7 +279,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/MCommand.html#execute(org.bukkit.command.CommandSender,java.util.List,java.util.List)">execute(CommandSender, List&lt;String&gt;, List&lt;MCommand&lt;?&gt;&gt;)</a></span> - Method in class com.massivecraft.factions.zcore.<a href="../com/massivecraft/factions/zcore/MCommand.html" title="class in com.massivecraft.factions.zcore">MCommand</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#EXP">EXP</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#EXP">EXP</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#EXPERIENCE_BOTTLE">EXPERIENCE_BOTTLE</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>

View File

@ -533,9 +533,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards"><span class="typeNameLink">FTeamWrapper</span></a> - Class in <a href="../com/massivecraft/factions/scoreboards/package-summary.html">com.massivecraft.factions.scoreboards</a></dt>
<dd>&nbsp;</dd>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></dt>
<dt><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#%3Cinit%3E()">FUpgradesGUI()</a></span> - Constructor for class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#%3Cinit%3E()">FUpgradesGUI()</a></span> - Constructor for class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#FURNACE">FURNACE</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
<dd>&nbsp;</dd>

View File

@ -1528,9 +1528,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/nbtapi/utils/MethodNames.html#getTypeMethodName()">getTypeMethodName()</a></span> - Static method in class com.massivecraft.factions.zcore.nbtapi.utils.<a href="../com/massivecraft/factions/zcore/nbtapi/utils/MethodNames.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils">MethodNames</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/cmd/FCommand.html#getUsageTemplate(com.massivecraft.factions.cmd.CommandContext)">getUsageTemplate(CommandContext)</a></span> - Method in class com.massivecraft.factions.cmd.<a href="../com/massivecraft/factions/cmd/FCommand.html" title="class in com.massivecraft.factions.cmd">FCommand</a></dt>
<dd>&nbsp;</dd>

View File

@ -218,7 +218,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor" id="i33">
<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></th>
<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor" id="i34">

View File

@ -28,7 +28,7 @@
<li><a href="com/massivecraft/factions/zcore/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore</a></li>
<li><a href="com/massivecraft/factions/zcore/fperms/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.fperms</a></li>
<li><a href="com/massivecraft/factions/zcore/fperms/gui/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.fperms.gui</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.frame.fupgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.fupgrades</a></li>
<li><a href="com/massivecraft/factions/zcore/nbtapi/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.nbtapi</a></li>
<li><a href="com/massivecraft/factions/zcore/nbtapi/utils/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.nbtapi.utils</a></li>
<li><a href="com/massivecraft/factions/zcore/persist/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.persist</a></li>

View File

@ -113,7 +113,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li><a href="com/massivecraft/factions/zcore/package-tree.html">com.massivecraft.factions.zcore</a>, </li>
<li><a href="com/massivecraft/factions/zcore/fperms/package-tree.html">com.massivecraft.factions.zcore.fperms</a>, </li>
<li><a href="com/massivecraft/factions/zcore/fperms/gui/package-tree.html">com.massivecraft.factions.zcore.fperms.gui</a>, </li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/package-tree.html">com.massivecraft.factions.zcore.frame.fupgrades</a>, </li>
<li><a href="com/massivecraft/factions/zcore/fupgrades/package-tree.html">com.massivecraft.factions.zcore.fupgrades</a>, </li>
<li><a href="com/massivecraft/factions/zcore/nbtapi/package-tree.html">com.massivecraft.factions.zcore.nbtapi</a>, </li>
<li><a href="com/massivecraft/factions/zcore/nbtapi/utils/package-tree.html">com.massivecraft.factions.zcore.nbtapi.utils</a>, </li>
<li><a href="com/massivecraft/factions/zcore/persist/package-tree.html">com.massivecraft.factions.zcore.persist</a>, </li>
@ -379,7 +379,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</ul>
</li>
<li class="circle">com.massivecraft.factions.scoreboards.<a href="com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards"><span class="typeNameLink">FTeamWrapper</span></a></li>
<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
<li class="circle">com.massivecraft.factions.zcore.nbtapi.utils.<a href="com/massivecraft/factions/zcore/nbtapi/utils/GsonWrapper.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils"><span class="typeNameLink">GsonWrapper</span></a></li>
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/InventoryTypeAdapter.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">InventoryTypeAdapter</span></a> (implements com.google.gson.JsonDeserializer&lt;T&gt;, com.google.gson.JsonSerializer&lt;T&gt;)</li>
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/InventoryUtil.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">InventoryUtil</span></a></li>
@ -493,7 +493,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/EnumTypeAdapter.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">EnumTypeAdapter</span></a>&lt;T&gt;</li>
</ul>
</li>
<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/UtilFly.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">UtilFly</span></a></li>
<li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/UUIDFetcher.html" title="class in com.massivecraft.factions.zcore.util"><span class="typeNameLink">UUIDFetcher</span></a> (implements java.util.concurrent.Callable&lt;V&gt;)</li>
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/VisualizeUtil.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">VisualizeUtil</span></a></li>
@ -562,7 +562,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util"><span class="typeNameLink">TagReplacer</span></a></li>
<li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/TagReplacer.TagType.html" title="enum in com.massivecraft.factions.zcore.util"><span class="typeNameLink">TagReplacer.TagType</span></a></li>
<li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/TL.html" title="enum in com.massivecraft.factions.zcore.util"><span class="typeNameLink">TL</span></a></li>
<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/WarmUpUtil.Warmup.html" title="enum in com.massivecraft.factions.util"><span class="typeNameLink">WarmUpUtil.Warmup</span></a></li>
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util"><span class="typeNameLink">XMaterial</span></a></li>
<li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/XMaterial.MinecraftVersion.html" title="enum in com.massivecraft.factions.util"><span class="typeNameLink">XMaterial.MinecraftVersion</span></a></li>

View File

@ -13,7 +13,7 @@ com.massivecraft.factions.util.Particles
com.massivecraft.factions.zcore
com.massivecraft.factions.zcore.fperms
com.massivecraft.factions.zcore.fperms.gui
com.massivecraft.factions.zcore.frame.fupgrades
com.massivecraft.factions.zcore.fupgrades
com.massivecraft.factions.zcore.nbtapi
com.massivecraft.factions.zcore.nbtapi.utils
com.massivecraft.factions.zcore.persist

74
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.massivecraft</groupId>
<artifactId>Factions</artifactId>
<version>1.6.9.5-2.4.1-RC</version>
<version>1.6.9.5-U0.2.1-2.0.6-STABLE</version>
<packaging>jar</packaging>
<name>SaberFactions</name>
@ -41,18 +41,6 @@
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>com.github.stefvanschie.inventoryframework</pattern>
<shadedPattern>com.massivecraft.factions.shade.stefvanschie.inventoryframework</shadedPattern>
</relocation>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>com.massivecraft.factions.shade.org.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>net.dv8tion</pattern>
<shadedPattern>com.massivecraft.factions.shade.net.dv8tion</shadedPattern>
</relocation>
<relocation>
<pattern>mkremins.fanciful</pattern>
<shadedPattern>com.massivecraft.factions.shade.mkremins.fanciful</shadedPattern>
@ -99,15 +87,21 @@
<version>1.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>brigadier</artifactId>
<version>1.0.14</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.stefvanschie.inventoryframework</groupId>
<artifactId>IF</artifactId>
<version>0.5.19</version>
<version>0.5.8</version>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.15.1-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@ -132,6 +126,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ocpsoft.prettytime</groupId>
<artifactId>prettytime</artifactId>
<version>4.0.0.Final</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
@ -286,12 +285,8 @@
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>shaded</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>gson</groupId>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
</exclusion>
</exclusions>
</dependency>
@ -343,6 +338,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
@ -380,52 +381,31 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>authlib</artifactId>
<version>1.5.21</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>me.rayzr522</groupId>
<artifactId>jsonmessage</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codemc.worldguardwrapper</groupId>
<artifactId>worldguardwrapper</artifactId>
<version>1.1.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.jagrosh</groupId>
<artifactId>jda-utilities-commons</artifactId>
<version>2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>1.7</version>
<scope>compile</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url>
</repository>
<repository>
<id>central</id>
<name>bintray</name>
<url>http://jcenter.bintray.com</url>
</repository>
<repository>
<id>mojang-repo</id>
<url>https://libraries.minecraft.net/</url>
</repository>
<repository>
<id>net.coreprotect</id>
<url>http://maven.playpro.com/</url>

View File

@ -22,7 +22,6 @@ public class Conf {
public static final transient String DYNMAP_STYLE_HOME_MARKER = "greenflag";
public static final transient boolean DYNMAP_STYLE_BOOST = false;
public static List<String> baseCommandAliases = new ArrayList<>();
public static String serverTimeZone = "EST";
public static boolean allowNoSlashCommand = true;
// Colors
@ -55,8 +54,8 @@ public class Conf {
public static boolean factionTagForceUpperCase = false;
public static boolean newFactionsDefaultOpen = false;
// when faction membership hits this limit, players will no longer be able to join using /f join; default is 0, no limit
public static int factionMemberLimit = 30;
public static int factionAltMemberLimit = 10;
public static int factionMemberLimit = 0;
public static int factionAltMemberLimit = 0;
// what faction ID to start new players in when they first join the server; default is 0, "no faction"
public static String newPlayerStartingFactionID = "0";
public static boolean showMapFactionKey = true;
@ -87,9 +86,7 @@ public class Conf {
public static int factionBufferSize = 20;
public static boolean useCheckSystem = true;
public static boolean spawnerLock = false;
public static boolean useGraceSystem = true;
public static boolean broadcastGraceToggles = true;
public static int gracePeriodTimeDays = 7;
public static boolean gracePeriod = false;
public static boolean noEnderpearlsInFly = false;
public static boolean broadcastDescriptionChanges = false;
public static boolean broadcastTagChanges = false;
@ -98,61 +95,15 @@ public class Conf {
public static double autoLeaveRoutineRunsEveryXMinutes = 5.0;
public static int autoLeaveRoutineMaxMillisecondsPerTick = 5; // 1 server tick is roughly 50ms, so default max 10% of a tick
public static boolean removePlayerDataWhenBanned = true;
public static String removePlayerDataWhenBannedReason = "Banned by admin.";
public static boolean autoLeaveDeleteFPlayerData = true; // Let them just remove player from Faction.
public static boolean worldGuardChecking = false;
public static boolean worldGuardBuildPriority = false;
//RADIUS CLAIMING
public static boolean useRadiusClaimSystem = true;
//FRIENDLY FIRE
public static boolean friendlyFireFPlayersCommand = false;
//Claim Fill
public static int maxFillClaimCount = 25;
public static int maxFillClaimDistance = 5;
public static boolean factionsDrainEnabled = false;
//RESERVE
public static boolean useReserveSystem = true;
//AUDIT
public static boolean useAuditSystem = true;
//INSPECT
public static boolean useInspectSystem = true;
//GUI's
public static boolean useDisbandGUI = true;
//SEALTH
public static boolean useStealthSystem = true;
//STRIKES
public static boolean useStrikeSystem = true;
//DISCORD
public static boolean useDiscordSystem = false;
public static String discordBotToken = "<token here>";
public static String fromDiscordFactionChatPrefix = "&f[&dDiscord&f] ";
public static String avatarUrl = "http://cravatar.eu/helmavatar/%uuid%.png";
public static String webhookName = "SaberFactions Hook";
public static String mainGuildID = "<Discord Server ID here>";
public static String positiveReaction = "<Server emote here>";
public static String negativeReaction = "<Server emote here>";
public static Boolean restrictActionsWhenNotLinked = false;
public static Boolean leaderRoles = false;
public static String leaderRole = "<Leader Role ID>";
public static Boolean factionDiscordTags = false;
public static String factionTag = "(NAME) [FACTION]";
public static Boolean factionRoles = false;
public static List<Integer> factionRoleColor = new ArrayList<Integer>() {{
add(25);
add(162);
add(203);
}};
public static String factionRolePrefix = "✦";
public static String factionRoleSuffix = "✦";
// server logging options
public static boolean logFactionCreate = true;
public static boolean logFactionDisband = true;
@ -164,7 +115,7 @@ public class Conf {
public static boolean logMoneyTransactions = true;
public static boolean logPlayerCommands = true;
// prevent some potential exploits
public static boolean denyFlightIfInNoClaimingWorld = false;
public static boolean preventCreeperGlitch = true;
public static boolean handleExploitObsidianGenerators = true;
public static boolean handleExploitEnderPearlClipping = true;
public static boolean handleExploitInteractionSpam = true;
@ -268,7 +219,6 @@ public class Conf {
public static boolean ownedMessageInsideTerritory = true;
public static boolean ownedMessageByChunk = false;
public static boolean pistonProtectionThroughDenyBuild = true;
public static Set<Material> loggableMaterials = EnumSet.noneOf(Material.class);
public static Set<Material> territoryProtectedMaterials = EnumSet.noneOf(Material.class);
public static Set<Material> territoryDenyUsageMaterials = EnumSet.noneOf(Material.class);
public static Set<Material> territoryProtectedMaterialsWhenOffline = EnumSet.noneOf(Material.class);
@ -279,18 +229,13 @@ public class Conf {
/// Useful for HCF features.
/// </summary>
public static Set<Material> territoryBypassProtectedMaterials = EnumSet.noneOf(Material.class);
public static boolean enableClickToClaim = true;
public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
public static boolean allowCreeperEggingChests = true;
// Dependency check
public static boolean dependencyCheck = true;
// Economy settings
public static boolean econEnabled = false;
public static String econUniverseAccount = "";
public static double econCostClaimWilderness = 30.0;
public static double econCostClaimFromFactionBonus = 0.0;
public static double econCostClaimFromFactionBonus = 30.0;
public static double econOverclaimRewardMultiplier = 0.0;
public static double econClaimAdditionalMultiplier = 0.5;
public static double econClaimRefundMultiplier = 0.7;
@ -398,7 +343,6 @@ public class Conf {
// faction-<factionId>
public static int defaultMaxVaults = 0;
public static boolean disableFlightOnFactionClaimChange = true;
public static boolean sendFactionChangeMessage = true;
public static Backend backEnd = Backend.JSON;
@ -426,10 +370,6 @@ public class Conf {
public static HashMap<String, DefaultPermissions> defaultFactionPermissions = new HashMap<>();
public static HashSet<PermissableAction> lockedPermissions = new HashSet<>();
public static boolean useComplexFly = true;
public static boolean wildLoadChunkBeforeTeleport = true;
private static transient Conf i = new Conf();
static {
@ -448,108 +388,11 @@ public class Conf {
territoryEnemyDenyCommands.add("tpaccept");
territoryEnemyDenyCommands.add("tpa");
territoryDenySwitchMaterials.add(XMaterial.ACACIA_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DISPENSER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.CHEST.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.TRAPPED_CHEST.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DROPPER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.HOPPER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ITEM_FRAME.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LEVER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.COMPARATOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.REPEATER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.PURPLE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.WHITE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.MAGENTA_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LIGHT_BLUE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.CYAN_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BLUE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BROWN_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ORANGE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.GREEN_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.RED_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BLACK_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.GRAY_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LIME_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LIGHT_GRAY_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.PINK_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.YELLOW_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SHULKER_BOX.parseMaterial());
// 1.14 Barrel is a container.
territoryDenySwitchMaterials.add(XMaterial.BARREL.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.GOLDEN_APPLE.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.APPLE.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENCHANTED_GOLDEN_APPLE.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_BEEF.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_MUTTON.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_CHICKEN.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_COD.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_PORKCHOP.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_RABBIT.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_SALMON.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENDER_PEARL.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.POTION.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.SPLASH_POTION.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.CREEPER_SPAWN_EGG.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.BOW.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_HELMET.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_CHESTPLATE.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_LEGGINGS.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_BOOTS.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_HELMET.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_CHESTPLATE.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_LEGGINGS.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_BOOTS.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_HELMET.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_CHESTPLATE.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_LEGGINGS.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_BOOTS.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_HELMET.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_CHESTPLATE.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_LEGGINGS.parseMaterial());
territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_BOOTS.parseMaterial());
/// TODO: Consider removing this in a future release, as permissions works just fine now
territoryProtectedMaterials.add(Material.BEACON);
// Config is not loading if value is empty ???
territoryBypassProtectedMaterials.add(Material.COOKIE);
territoryBypassProtectedMaterials.add(Material.CHEST);
territoryBypassProtectedMaterials.add(Material.TRAPPED_CHEST);
territoryDenyUsageMaterials.add(XMaterial.FIRE_CHARGE.parseMaterial());
territoryDenyUsageMaterials.add(Material.FLINT_AND_STEEL);
@ -560,6 +403,7 @@ public class Conf {
territoryDenyUsageMaterials.add(Material.ARMOR_STAND);
}
territoryProtectedMaterialsWhenOffline.add(Material.BEACON);
territoryDenyUsageMaterialsWhenOffline.add(XMaterial.FIRE_CHARGE.parseMaterial());
@ -577,7 +421,7 @@ public class Conf {
safeZoneNerfedCreatureTypes.add(EntityType.ENDERMAN);
safeZoneNerfedCreatureTypes.add(EntityType.GHAST);
safeZoneNerfedCreatureTypes.add(EntityType.MAGMA_CUBE);
if (!FactionsPlugin.getInstance().mc116) safeZoneNerfedCreatureTypes.add(EntityType.PIG_ZOMBIE);
safeZoneNerfedCreatureTypes.add(EntityType.PIG_ZOMBIE);
safeZoneNerfedCreatureTypes.add(EntityType.SILVERFISH);
safeZoneNerfedCreatureTypes.add(EntityType.SKELETON);
safeZoneNerfedCreatureTypes.add(EntityType.SPIDER);
@ -587,14 +431,11 @@ public class Conf {
safeZoneNerfedCreatureTypes.add(EntityType.ZOMBIE);
// Is this called lazy load?
defaultFactionPermissions.put("LEADER", new DefaultPermissions(true));
defaultFactionPermissions.put("COLEADER", new DefaultPermissions(true));
defaultFactionPermissions.put("MODERATOR", new DefaultPermissions(true));
defaultFactionPermissions.put("NORMAL MEMBER", new DefaultPermissions(false));
defaultFactionPermissions.put("RECRUIT", new DefaultPermissions(false));
defaultFactionPermissions.put("ALLY", new DefaultPermissions(false));
defaultFactionPermissions.put("ENEMY", new DefaultPermissions(false));
defaultFactionPermissions.put("TRUCE", new DefaultPermissions(false));
defaultFactionPermissions.put("NEUTRAL", new DefaultPermissions(false));
}
public static void load() {
@ -605,10 +446,6 @@ public class Conf {
FactionsPlugin.getInstance().persist.save(i);
}
public static void saveSync() {
FactionsPlugin.instance.persist.saveSync(i);
}
public enum Backend {
JSON,
//MYSQL, TODO add MySQL storage

View File

@ -22,6 +22,7 @@ public class FLocation implements Serializable {
worldBorderClassPresent = true;
} catch (ClassNotFoundException ignored) {
}
worldBorderSupport = worldBorderClassPresent;
}
@ -44,7 +45,7 @@ public class FLocation implements Serializable {
}
public FLocation(Location location) {
this(Objects.requireNonNull(location.getWorld()).getName(), blockToChunk(location.getBlockX()), blockToChunk(location.getBlockZ()));
this(location.getWorld().getName(), blockToChunk(location.getBlockX()), blockToChunk(location.getBlockZ()));
}
public FLocation(Player player) {
@ -69,8 +70,8 @@ public class FLocation implements Serializable {
String worldName = string.substring(start, index);
start = index + 1;
index = string.indexOf(",", start);
int x = Integer.parseInt(string.substring(start, index));
int y = Integer.parseInt(string.substring(index + 1, string.length() - 1));
int x = Integer.valueOf(string.substring(start, index));
int y = Integer.valueOf(string.substring(index + 1, string.length() - 1));
return new FLocation(worldName, x, y);
}
@ -151,10 +152,6 @@ public class FLocation implements Serializable {
return "" + x + "," + z;
}
public String formatXAndZ(String splitter) {
return chunkToBlock(this.x) + "x" + splitter + " " + chunkToBlock(this.z) + "z";
}
//----------------------------------------------//
// Misc Geometry
//----------------------------------------------//
@ -181,9 +178,9 @@ public class FLocation implements Serializable {
}
public boolean isInChunk(Location loc) {
if (loc == null) return false;
if (loc.getWorld() == null) return false;
if (loc == null) {
return false;
}
Chunk chunk = loc.getChunk();
return loc.getWorld().getName().equalsIgnoreCase(getWorldName()) && chunk.getX() == x && chunk.getZ() == z;
}
@ -195,23 +192,18 @@ public class FLocation implements Serializable {
* @return whether this location is outside of the border
*/
public boolean isOutsideWorldBorder(int buffer) {
if (!worldBorderSupport) return false;
if (!worldBorderSupport) {
return false;
}
WorldBorder border = getWorld().getWorldBorder();
Location center = border.getCenter();
double size = border.getSize();
Chunk chunk = border.getCenter().getChunk();
int bufferBlocks = buffer << 4;
int lim = FLocation.chunkToRegion((int) border.getSize()) - buffer;
int diffX = chunk.getX() - x;
int diffZ = chunk.getZ() - z;
double borderMinX = (center.getX() - size / 2.0D) + bufferBlocks;
double borderMinZ = (center.getZ() - size / 2.0D) + bufferBlocks;
double borderMaxX = (center.getX() + size / 2.0D) - bufferBlocks;
double borderMaxZ = (center.getZ() + size / 2.0D) - bufferBlocks;
int chunkMinX = this.x << 4;
int chunkMaxX = chunkMinX | 15;
int chunkMinZ = this.z << 4;
int chunkMaxZ = chunkMinZ | 15;
return (chunkMinX >= borderMaxX) || (chunkMinZ >= borderMaxZ) || (chunkMaxX <= borderMinX) || (chunkMaxZ <= borderMinZ);
return (diffX > lim || diffZ > lim) || (-diffX >= lim || -diffZ >= lim);
}
//----------------------------------------------//
@ -221,7 +213,10 @@ public class FLocation implements Serializable {
double radiusSquared = radius * radius;
Set<FLocation> ret = new LinkedHashSet<>();
if (radius <= 0) return ret;
if (radius <= 0) {
return ret;
}
int xfrom = (int) Math.floor(this.x - radius);
int xto = (int) Math.ceil(this.x + radius);
int zfrom = (int) Math.floor(this.z - radius);
@ -235,6 +230,7 @@ public class FLocation implements Serializable {
}
}
}
return ret;
}
@ -250,8 +246,13 @@ public class FLocation implements Serializable {
@Override
public boolean equals(Object obj) {
if (obj == this) return true;
if (!(obj instanceof FLocation)) return false;
if (obj == this) {
return true;
}
if (!(obj instanceof FLocation)) {
return false;
}
FLocation that = (FLocation) obj;
return this.x == that.x && this.z == that.z && (Objects.equals(this.worldName, that.worldName));
}

View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.WarmUpUtil;
import mkremins.fanciful.FancyMessage;
import net.dv8tion.jda.core.entities.User;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
@ -31,73 +30,8 @@ public interface FPlayer extends EconomyParticipator {
boolean hasNotificationsEnabled();
/**
* Determine if a player has enemies nearby based on the enemy check task in CmdFly
* NOTE: THIS VALUE IS ONLY UPDATED WHEN A USER IS USING FLY
*
* @return enemiesNearby as a boolean
*/
boolean hasEnemiesNearby();
/**
* Set if this FPlayer has an enemy nearby
*
* @param b enemiesNearby
*/
void setEnemiesNearby(Boolean b);
/**
* Get if a player has setup their Discord before
*
* @return if the player setup Discord as a boolean
*/
boolean discordSetup();
/**
* Get the players Discord user ID
*
* @return players Discord user ID as a String
*/
String discordUserID();
/**
* Set the players Boolean defining if the player has setup their Discord
*
* @param b Boolean for discordSetup to be defined to
*/
void setDiscordSetup(Boolean b);
/**
* Set the players Discord user ID
*
* @param s String for their user ID to be set to
*/
void setDiscordUserID(String s);
/**
* Get the players Discord user (If the player has not setup Discord it will return null!)
*
* @return User from players set Discord User ID
*/
User discordUser();
/**
* Used to check if this player should be served titles
*
* @return if this FPlayer has titles enabled as a boolean
*/
boolean hasTitlesEnabled();
/**
* Used to set if player should be served titles
*
* @param b Boolean to titlesEnabled to
*/
void setTitlesEnabled(Boolean b);
/**
* Used to determine if a player is in their faction's chest
*
* @return if player is in their faction's as a boolean
*/
boolean isInFactionsChest();
@ -284,15 +218,10 @@ public interface FPlayer extends EconomyParticipator {
int getDeaths();
boolean takeMoney(int amt);
void takeMoney(int amt);
boolean hasMoney(int amt);
//Fplayer specific friendly fire.
boolean hasFriendlyFire();
void setFriendlyFire(boolean status);
//inspect Stuff
boolean isInspectMode();
@ -392,7 +321,6 @@ public interface FPlayer extends EconomyParticipator {
// Actions
// -------------------------------
void leave(boolean makePay);
boolean canClaimForFaction(Faction forFaction);

View File

@ -4,6 +4,7 @@ import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.missions.Mission;
import com.massivecraft.factions.shield.TimeFrame;
import com.massivecraft.factions.struct.BanInfo;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
@ -11,7 +12,7 @@ import com.massivecraft.factions.util.LazyLocation;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.Permissable;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType;
import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@ -247,8 +248,6 @@ public interface Faction extends EconomyParticipator {
void setHome(Location home);
void deleteHome();
long getFoundedDate();
void setFoundedDate(long newDate);
@ -443,7 +442,10 @@ public interface Faction extends EconomyParticipator {
void paypalSet(String paypal);
// -------------------------------
// Shields
// -------------------------------
// shield
void setTimeFrame(TimeFrame timeFrame);
TimeFrame getTimeFrame();
}

View File

@ -4,58 +4,56 @@ import ch.njol.skript.Skript;
import ch.njol.skript.SkriptAddon;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.cmd.*;
import com.massivecraft.factions.cmd.audit.FChestListener;
import com.massivecraft.factions.cmd.audit.FLogManager;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.cmd.CmdAutoHelp;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.FCmdRoot;
import com.massivecraft.factions.cmd.FCommand;
import com.massivecraft.factions.cmd.check.CheckTask;
import com.massivecraft.factions.cmd.check.WeeWooTask;
import com.massivecraft.factions.cmd.chest.AntiChestListener;
import com.massivecraft.factions.cmd.reserve.ListParameterizedType;
import com.massivecraft.factions.cmd.reserve.ReserveAdapter;
import com.massivecraft.factions.cmd.reserve.ReserveObject;
import com.massivecraft.factions.discord.Discord;
import com.massivecraft.factions.discord.DiscordListener;
import com.massivecraft.factions.discord.FactionChatHandler;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.Worldguard;
import com.massivecraft.factions.integration.dynmap.EngineDynmap;
import com.massivecraft.factions.listeners.*;
import com.massivecraft.factions.missions.MissionHandler;
import com.massivecraft.factions.shield.TimeFrameTask;
import com.massivecraft.factions.shop.ShopConfig;
import com.massivecraft.factions.struct.ChatMode;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.*;
import com.massivecraft.factions.util.adapters.*;
import com.massivecraft.factions.util.timer.TimerManager;
import com.massivecraft.factions.util.wait.WaitExecutor;
import com.massivecraft.factions.util.Particles.ReflectionUtils;
import com.massivecraft.factions.zcore.CommandVisibility;
import com.massivecraft.factions.zcore.MPlugin;
import com.massivecraft.factions.zcore.file.impl.FileManager;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.Permissable;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.frame.fupgrades.UpgradesListener;
import com.massivecraft.factions.zcore.fupgrades.*;
import com.massivecraft.factions.zcore.util.TextUtil;
import me.lucko.commodore.CommodoreProvider;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.*;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider;
import java.io.*;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.stream.Collectors;
@ -65,12 +63,12 @@ public class FactionsPlugin extends MPlugin {
// Our single plugin instance.
// Single 4 life.
public static FactionsPlugin instance;
public static boolean cachedRadiusClaim;
public static Permission perms = null;
// This plugin sets the boolean true when fully enabled.
// Plugins can check this boolean while hooking in have
// a green light to use the api.
public static boolean startupFinished = false;
public static Economy econ = null;
public boolean PlaceholderApi;
// Commands
public FCmdRoot cmdBase;
@ -80,10 +78,8 @@ public class FactionsPlugin extends MPlugin {
public boolean mc112 = false;
public boolean mc113 = false;
public boolean mc114 = false;
public boolean mc115 = false;
public boolean mc116 = false;
public boolean useNonPacketParticles = false;
public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
public boolean factionsFlight = false;
SkriptAddon skriptAddon;
private FactionsPlayerListener factionsPlayerListener;
private boolean locked = false;
@ -93,11 +89,8 @@ public class FactionsPlugin extends MPlugin {
private ClipPlaceholderAPIManager clipPlaceholderAPIManager;
private boolean mvdwPlaceholderAPIManager = false;
private Listener[] eventsListener;
private Worldguard wg;
private FLogManager fLogManager;
private List<ReserveObject> reserveObjects;
private FileManager fileManager;
private TimerManager timerManager;
public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
public FactionsPlugin() {
instance = this;
@ -107,10 +100,6 @@ public class FactionsPlugin extends MPlugin {
return instance;
}
public FileManager getFileManager() {
return fileManager;
}
public boolean getLocked() {
return this.locked;
}
@ -129,20 +118,34 @@ public class FactionsPlugin extends MPlugin {
this.setAutoSave(val);
}
public void playSoundForAll(String sound) {
for (Player pl : Bukkit.getOnlinePlayers()) {
playSound(pl, sound);
}
}
public void playSoundForAll(List<String> sounds) {
for (Player pl : Bukkit.getOnlinePlayers()) {
playSound(pl, sounds);
}
}
public void playSound(Player p, List<String> sounds) {
for (String sound : sounds) {
playSound(p, sound);
}
}
public void playSound(Player p, String sound) {
float pitch = Float.valueOf(sound.split(":")[1]);
sound = sound.split(":")[0];
p.playSound(p.getLocation(), Sound.valueOf(sound), pitch, 5.0F);
}
@Override
public void onEnable() {
log("==== Setup ====");
if (getServer().getPluginManager().getPlugin("Vault") == null) {
divider();
System.out.println("You are missing dependencies!");
System.out.println("Please verify [Vault] is installed!");
Conf.save();
Bukkit.getPluginManager().disablePlugin(instance);
divider();
return;
}
int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
switch (version) {
case 7:
@ -164,38 +167,37 @@ public class FactionsPlugin extends MPlugin {
FactionsPlugin.instance.log("Minecraft Version 1.14 found.");
mc114 = true;
break;
case 15:
FactionsPlugin.instance.log("Minecraft Version 1.15 found.");
mc115 = true;
break;
case 16:
FactionsPlugin.instance.log("Minecraft Version 1.16 found.");
mc116 = true;
break;
}
migrateFPlayerLeaders();
log("==== End Setup ====");
int pluginId = 7013;
Metrics metrics = new Metrics(this, pluginId);
if (!preEnable()) {
this.loadSuccessful = false;
return;
}
this.loadSuccessful = false;
saveDefaultConfig();
if (!new File(this.getDataFolder() + "/config.yml").exists()) {
this.saveResource("config.yml", false);
this.reloadConfig();
//Start wait task executor
WaitExecutor.startTask();
}
//Attempt to generate a permission list
PermissionList.generateFile();
// Load Conf from disk
Conf.load();
fileManager = new FileManager();
fileManager.setupFiles();
fLogManager = new FLogManager();
//Dependency checks
if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault") && !Bukkit.getPluginManager().isPluginEnabled("Essentials"))) {
divider();
System.out.println("You are missing dependencies!");
System.out.println("Please verify EssentialsX and Vault are installed!");
Conf.save();
Bukkit.getPluginManager().disablePlugin(instance);
divider();
return;
}
//Update their config if needed
Updater.updateIfNeeded(getConfig());
RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
FactionsPlugin.econ = rsp.getProvider();
com.massivecraft.factions.integration.Essentials.setup();
hookedPlayervaults = setupPlayervaults();
FPlayers.getInstance().load();
@ -208,21 +210,20 @@ public class FactionsPlugin extends MPlugin {
fPlayer.resetFactionData(false);
continue;
}
if (fPlayer.isAlt()) faction.addAltPlayer(fPlayer);
else faction.addFPlayer(fPlayer);
if (fPlayer.isAlt()) {
faction.addAltPlayer(fPlayer);
} else {
faction.addFPlayer(fPlayer);
}
}
Factions.getInstance().getAllFactions().forEach(Faction::refreshFPlayers);
if (getConfig().getBoolean("enable-faction-flight", true)) {
UtilFly.run();
}
Board.getInstance().load();
Board.getInstance().clean();
//Load command aliases
Aliases.load();
// Add Base Commands
this.cmdBase = new FCmdRoot();
this.cmdAutoHelp = new CmdAutoHelp();
@ -230,22 +231,26 @@ public class FactionsPlugin extends MPlugin {
Econ.setup();
setupPermissions();
if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) wg = new Worldguard();
if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) {
Worldguard.init(this);
}
EngineDynmap.getInstance().init();
// start up task which runs the autoLeaveAfterDaysOfInactivity routine
startAutoLeaveTask(false);
cachedRadiusClaim = Conf.useRadiusClaimSystem;
if (version > 8) {
useNonPacketParticles = true;
log("Minecraft Version 1.9 or higher found, using non packet based particle API");
}
if (getConfig().getBoolean("enable-faction-flight")) {
factionsFlight = true;
}
if (getServer().getPluginManager().getPlugin("Skript") != null) {
log("Skript was found! Registering SaberFactions Addon...");
log("Skript was found! Registering FactionsPlugin Addon...");
skriptAddon = Skript.registerAddon(this);
try {
skriptAddon.loadClasses("com.massivecraft.factions.skript", "expressions");
@ -254,25 +259,24 @@ public class FactionsPlugin extends MPlugin {
}
log("Skript addon registered!");
}
if (Conf.useCheckSystem) {
int minute = 1200;
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 3), 0L, minute * 3);
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 5), 0L, minute * 5);
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 10), 0L, minute * 10);
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 15), 0L, minute * 15);
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 30), 0L, minute * 30);
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 3), 0L, (long) (minute * 3));
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 5), 0L, (long) (minute * 5));
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 10), 0L, (long) (minute * 10));
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 15), 0L, (long) (minute * 15));
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 30), 0L, (long) (minute * 30));
this.getServer().getScheduler().runTaskTimer(this, CheckTask::cleanupTask, 0L, 1200L);
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new WeeWooTask(this), 600L, 600L);
this.getServer().getScheduler().runTaskTimerAsynchronously(this, new TimeFrameTask(), 1200, 1200); // every 1 minute...
}
if(Conf.useDiscordSystem && !Conf.discordBotToken.equals("<token here>")) {
new FactionChatHandler(this);
} else {
System.out.println("\n\n\n SABER-FACTIONS-DISCORD-INTEGRATION - You are not using Discord integration features, set conf.json option useDiscordSystem to true and put a valid token in before using!\n\n\n");
}
//Setup Discord Bot
new Discord(this);
fLogManager.loadLogs(this);
this.timerManager = new TimerManager(this);
this.timerManager.reloadTimerData();
System.out.println("[SABER-FACTIONS] - Loaded " + timerManager.getTimers().size() + " timers into list!");
ShopConfig.setup();
getServer().getPluginManager().registerEvents(factionsPlayerListener = new FactionsPlayerListener(), this);
@ -282,44 +286,19 @@ public class FactionsPlugin extends MPlugin {
new FactionsEntityListener(),
new FactionsExploitListener(),
new FactionsBlockListener(),
new FUpgradesGUI(),
new UpgradesListener(),
new MissionHandler(this),
new FChestListener(),
new MenuListener(),
new AntiChestListener()
};
for (Listener eventListener : eventsListener)
getServer().getPluginManager().registerEvents(eventListener, this);
if (Conf.useGraceSystem) {
getServer().getPluginManager().registerEvents(timerManager.graceTimer, this);
}
this.getCommand(refCommand).setExecutor(cmdBase);
if (!CommodoreProvider.isSupported()) this.getCommand(refCommand).setTabCompleter(this);
reserveObjects = new ArrayList<>();
String path = Paths.get(this.getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
File file = new File(path);
try {
String json;
if (!file.exists()) {
file.getParentFile().mkdirs();
file.createNewFile();
}
json = String.join("", Files.readAllLines(Paths.get(file.getPath()))).replace("\n", "").replace("\r", "");
if (json.equalsIgnoreCase("")) {
Files.write(Paths.get(path), "[]".getBytes());
json = "[]";
}
reserveObjects = this.getGsonBuilder().create().fromJson(json, new ListParameterizedType(ReserveObject.class));
if (reserveObjects == null) reserveObjects = new ArrayList<>();
} catch (Exception e) {
e.printStackTrace();
}
if (getDescription().getFullName().contains("BETA")) {
divider();
System.out.println("You are using a BETA version of the plugin!");
@ -335,6 +314,10 @@ public class FactionsPlugin extends MPlugin {
FactionsPlugin.startupFinished = true;
}
public SkriptAddon getSkriptAddon() {
return skriptAddon;
}
private void setupPlaceholderAPI() {
Plugin clip = getServer().getPluginManager().getPlugin("PlaceholderAPI");
@ -372,6 +355,7 @@ public class FactionsPlugin extends MPlugin {
try {
BufferedReader br = new BufferedReader(new FileReader(fplayerFile));
System.out.println("Migrating old players.json file.");
String line;
while ((line = br.readLine()) != null) {
if (line.contains("\"role\": \"ADMIN\"")) {
@ -403,7 +387,9 @@ public class FactionsPlugin extends MPlugin {
private boolean setupPermissions() {
try {
RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
if (rsp != null) perms = rsp.getProvider();
if (rsp != null) {
perms = rsp.getProvider();
}
} catch (NoClassDefFoundError ex) {
return false;
}
@ -428,12 +414,11 @@ public class FactionsPlugin extends MPlugin {
.registerTypeAdapter(LazyLocation.class, new MyLocationTypeAdapter())
.registerTypeAdapter(mapFLocToStringSetType, new MapFLocToStringSetTypeAdapter())
.registerTypeAdapter(Inventory.class, new InventoryTypeAdapter())
.registerTypeAdapter(ReserveObject.class, new ReserveAdapter())
.registerTypeAdapter(Location.class, new LocationTypeAdapter())
.registerTypeAdapterFactory(EnumTypeAdapter.ENUM_FACTORY);
}
public void divider() {
private void divider() {
System.out.println(" .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-");
System.out.println(" / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\");
System.out.println("`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-'");
@ -441,37 +426,26 @@ public class FactionsPlugin extends MPlugin {
@Override
public void onDisable() {
if (this.AutoLeaveTask != null) {
getServer().getScheduler().cancelTask(this.AutoLeaveTask);
this.AutoLeaveTask = null;
// only save data if plugin actually completely loaded successfully
if (this.loadSuccessful) {
// Dont save, as this is kind of pointless, as the /f config command manually saves.
// So any edits done are saved, this way manual edits to json can go through.
// Conf.save();
}
Conf.saveSync();
timerManager.saveTimerData();
if (AutoLeaveTask != null) {
this.getServer().getScheduler().cancelTask(AutoLeaveTask);
AutoLeaveTask = null;
}
DiscordListener.saveGuilds();
if (Discord.jda != null) Discord.jda.shutdownNow();
fLogManager.saveLogs();
try {
String path = Paths.get(getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
File file = new File(path);
if (!file.exists()) {
file.getParentFile().mkdirs();
file.createNewFile();
}
Files.write(Paths.get(file.getPath()), getGsonBuilder().create().toJson(reserveObjects).getBytes());
} catch (IOException e) {
e.printStackTrace();
}
super.onDisable();
}
public void startAutoLeaveTask(boolean restartIfRunning) {
if (AutoLeaveTask != null) {
if (!restartIfRunning) return;
if (!restartIfRunning) {
return;
}
this.getServer().getScheduler().cancelTask(AutoLeaveTask);
}
@ -487,9 +461,26 @@ public class FactionsPlugin extends MPlugin {
Conf.save();
}
public ItemStack createItem(Material material, int amount, short datavalue, String name, List<String> lore) {
ItemStack item = new ItemStack(XMaterial.matchXMaterial(material.toString()).parseMaterial(), amount, datavalue);
ItemMeta meta = item.getItemMeta();
meta.setDisplayName(color(name));
meta.setLore(colorList(lore));
item.setItemMeta(meta);
return item;
}
public ItemStack createLazyItem(Material material, int amount, short datavalue, String name, String lore) {
ItemStack item = new ItemStack(material, amount, datavalue);
ItemMeta meta = item.getItemMeta();
meta.setDisplayName(color(FactionsPlugin.instance.getConfig().getString(name)));
meta.setLore(colorList(FactionsPlugin.instance.getConfig().getStringList(lore)));
item.setItemMeta(meta);
return item;
}
public Economy getEcon() {
RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
RegisteredServiceProvider<Economy> rsp = FactionsPlugin.instance.getServer().getServicesManager().getRegistration(Economy.class);
return rsp.getProvider();
}
@ -504,6 +495,16 @@ public class FactionsPlugin extends MPlugin {
return sender instanceof Player && FactionsPlayerListener.preventCommand(commandString, (Player) sender) || super.handleCommand(sender, commandString, testOnly);
}
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] split) {
if (split.length == 0) {
return handleCommand(sender, "/f help", false);
}
// otherwise, needs to be handled; presumably another plugin directly ran the command
String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
return handleCommand(sender, cmd + " " + TextUtil.implode(Arrays.asList(split), " "), false);
}
// This method must stay for < 1.12 versions
@Override
@ -511,9 +512,12 @@ public class FactionsPlugin extends MPlugin {
// Must be a LinkedList to prevent UnsupportedOperationException.
List<String> argsList = new LinkedList<>(Arrays.asList(args));
CommandContext context = new CommandContext(sender, argsList, alias);
String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
// String cmdValid = (cmd + " " + TextUtil.implode(context.args, " ")).trim();
List<FCommand> commandsList = cmdBase.subCommands;
FCommand commandsEx = cmdBase;
List<String> completions = new ArrayList<>();
// Check for "" first arg because spigot is mangled.
if (context.args.get(0).equals("")) {
for (FCommand subCommand : commandsEx.subCommands) {
@ -538,12 +542,16 @@ public class FactionsPlugin extends MPlugin {
}
}
String lastArg = args[args.length - 1].toLowerCase();
completions = completions.stream()
.filter(m -> m.toLowerCase().startsWith(lastArg))
.collect(Collectors.toList());
return completions;
} else {
String lastArg = args[args.length - 1].toLowerCase();
for (Role value : Role.values()) completions.add(value.nicename);
for (Relation value : Relation.values()) completions.add(value.nicename);
// The stream and foreach from the old implementation looped 2 times, by looping all players -> filtered -> looped filter and added -> filtered AGAIN at the end.
@ -556,22 +564,113 @@ public class FactionsPlugin extends MPlugin {
}
}
public void createTimedHologram(final Location location, String text, Long timeout) {
ArmorStand as = (ArmorStand) location.add(0.5, 1, 0.5).getWorld().spawnEntity(location, EntityType.ARMOR_STAND); //Spawn the ArmorStand
as.setVisible(false); //Makes the ArmorStand invisible
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.setCustomName(FactionsPlugin.instance.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
final ArmorStand armorStand = as;
Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> {
armorStand.remove();
getLogger().info("Removing Hologram.");
}
, timeout * 20);
}
// -------------------------------------------- //
// Functions for other plugins to hook into
// -------------------------------------------- //
// This value will be updated whenever new hooks are added
public int hookSupportVersion() {
return 3;
}
// If another plugin is handling insertion of chat tags, this should be used to notify Factions
public void handleFactionTagExternally(boolean notByFactions) {
Conf.chatTagHandledByAnotherPlugin = notByFactions;
}
public FLogManager getFlogManager() {
return fLogManager;
// Simply put, should this chat event be left for Factions to handle? For now, that means players with Faction Chat
// enabled or use of the Factions f command without a slash; combination of isPlayerFactionChatting() and isFactionsCommand()
public boolean shouldLetFactionsHandleThisChat(AsyncPlayerChatEvent event) {
return event != null && (isPlayerFactionChatting(event.getPlayer()) || isFactionsCommand(event.getMessage()));
}
public void logFactionEvent(Faction faction, FLogType type, String... arguments) {
this.fLogManager.log(faction, type, arguments);
// Does player have Faction Chat enabled? If so, chat plugins should preferably not do channels,
// local chat, or anything else which targets individual recipients, so Faction Chat can be done
public boolean isPlayerFactionChatting(Player player) {
if (player == null) {
return false;
}
FPlayer me = FPlayers.getInstance().getByPlayer(player);
return me != null && me.getChatMode().isAtLeast(ChatMode.ALLIANCE);
}
// Is this chat message actually a Factions command, and thus should be left alone by other plugins?
// TODO: GET THIS BACK AND WORKING
public boolean isFactionsCommand(String check) {
return !(check == null || check.isEmpty()) && this.handleCommand(null, check, true);
}
// Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat
public String getPlayerFactionTag(Player player) {
return getPlayerFactionTagRelation(player, null);
}
// Same as above, but with relation (enemy/neutral/ally) coloring potentially added to the tag
public String getPlayerFactionTagRelation(Player speaker, Player listener) {
String tag = "~";
if (speaker == null) {
return tag;
}
FPlayer me = FPlayers.getInstance().getByPlayer(speaker);
if (me == null) {
return tag;
}
// if listener isn't set, or config option is disabled, give back uncolored tag
if (listener == null || !Conf.chatTagRelationColored) {
tag = me.getChatTag().trim();
} else {
FPlayer you = FPlayers.getInstance().getByPlayer(listener);
if (you == null) {
tag = me.getChatTag().trim();
} else // everything checks out, give the colored tag
{
tag = me.getChatTag(you).trim();
}
}
if (tag.isEmpty()) {
tag = "~";
}
return tag;
}
// Get a player's title within their faction, mainly for usage by chat plugins for local/channel chat
public String getPlayerTitle(Player player) {
if (player == null) {
return "";
}
FPlayer me = FPlayers.getInstance().getByPlayer(player);
if (me == null) {
return "";
}
return me.getTitle().trim();
}
public String color(String line) {
@ -581,25 +680,59 @@ public class FactionsPlugin extends MPlugin {
//colors a string list
public List<String> colorList(List<String> lore) {
for (int i = 0; i <= lore.size() - 1; i++) lore.set(i, color(lore.get(i)));
for (int i = 0; i <= lore.size() - 1; i++) {
lore.set(i, color(lore.get(i)));
}
return lore;
}
public List<ReserveObject> getFactionReserves() {
return this.reserveObjects;
// Get a list of all faction tags (names)
public Set<String> getFactionTags() {
return Factions.getInstance().getFactionTags();
}
// Get a list of all players in the specified faction
public Set<String> getPlayersInFaction(String factionTag) {
Set<String> players = new HashSet<>();
Faction faction = Factions.getInstance().getByTag(factionTag);
if (faction != null) {
for (FPlayer fplayer : faction.getFPlayers()) {
players.add(fplayer.getName());
}
}
return players;
}
// Get a list of all online players in the specified faction
public Set<String> getOnlinePlayersInFaction(String factionTag) {
Set<String> players = new HashSet<>();
Faction faction = Factions.getInstance().getByTag(factionTag);
if (faction != null) {
for (FPlayer fplayer : faction.getFPlayersWhereOnline(true)) {
players.add(fplayer.getName());
}
}
return players;
}
public boolean isHookedPlayervaults() {
return hookedPlayervaults;
}
public String getPrimaryGroup(OfflinePlayer player) {
return perms == null || !perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player);
}
AtomicReference<String> primaryGroup = new AtomicReference<>();
public TimerManager getTimerManager() {
return timerManager;
if (perms == null || !perms.hasGroupSupport()) return " ";
else {
Bukkit.getScheduler().runTaskAsynchronously(this, () -> primaryGroup.set(perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player)));
return primaryGroup.get();
}
}
public void debug(Level level, String s) {
if (getConfig().getBoolean("debug", false)) getLogger().log(level, s);
if (getConfig().getBoolean("debug", false)) {
getLogger().log(level, s);
}
}
public FactionsPlayerListener getFactionsPlayerListener() {
@ -609,5 +742,4 @@ public class FactionsPlugin extends MPlugin {
public void debug(String s) {
debug(Level.INFO, s);
}
}

View File

@ -1,156 +0,0 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FactionsPlugin;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
public class Aliases {
/**
* @author DroppingAnvil
*/
public static ArrayList<String> friendlyFire = new ArrayList<>(Arrays.asList("friendlyfire", "ff"));
public static ArrayList<String> notifications = new ArrayList<>(Arrays.asList("notifications", "notis"));
public static ArrayList<String> alts_alts = new ArrayList<>(Arrays.asList("alts", "alt"));
public static ArrayList<String> alts_list = new ArrayList<>(Arrays.asList("list", "l"));
public static ArrayList<String> alts_invite = new ArrayList<>(Collections.singletonList("invite"));
public static ArrayList<String> alts_kick = new ArrayList<>(Collections.singletonList("kick"));
public static ArrayList<String> audit = new ArrayList<>(Arrays.asList("audit", "log", "logs"));
public static ArrayList<String> check = new ArrayList<>(Arrays.asList("check"));
public static ArrayList<String> weewoo = new ArrayList<>(Collections.singletonList("weewoo"));
public static ArrayList<String> chest = new ArrayList<>(Arrays.asList("chest", "pv"));
public static ArrayList<String> claim_auto = new ArrayList<>(Collections.singletonList("autoclaim"));
public static ArrayList<String> claim_claim = new ArrayList<>(Collections.singletonList("claim"));
public static ArrayList<String> claim_at = new ArrayList<>(Collections.singletonList("claimat"));
public static ArrayList<String> claim_claimFill = new ArrayList<>(Arrays.asList("claimfill", "cf"));
public static ArrayList<String> claim_line = new ArrayList<>(Arrays.asList("claimline", "cl"));
public static ArrayList<String> claim_corner = new ArrayList<>(Arrays.asList("corner"));
public static ArrayList<String> delfHome = new ArrayList<>(Arrays.asList("delhome", "deletehome"));
public static ArrayList<String> unclaim_all_safe = new ArrayList<>(Arrays.asList("safeunclaimall", "safedeclaimall"));
public static ArrayList<String> unclaim_unclaim = new ArrayList<>(Arrays.asList("unclaim", "declaim"));
public static ArrayList<String> unclaim_all_unsafe = new ArrayList<>(Arrays.asList("unclaimall", "declaimall"));
public static ArrayList<String> unclaim_all_war = new ArrayList<>(Arrays.asList("warunclaimall", "wardeclaimall"));
public static ArrayList<String> money_money = new ArrayList<>(Arrays.asList("money", "bank"));
public static ArrayList<String> money_balance = new ArrayList<>(Arrays.asList("b", "balance"));
public static ArrayList<String> money_deposit = new ArrayList<>(Arrays.asList("d", "deposit"));
public static ArrayList<String> money_transfer_Ff = new ArrayList<>(Collections.singletonList("ff"));
public static ArrayList<String> money_transfer_Fp = new ArrayList<>(Collections.singletonList("fp"));
public static ArrayList<String> money_transfer_Pf = new ArrayList<>(Collections.singletonList("pf"));
public static ArrayList<String> money_withdraw = new ArrayList<>(Arrays.asList("w", "withdraw"));
public static ArrayList<String> grace = new ArrayList<>(Collections.singletonList("grace"));
public static ArrayList<String> logout = new ArrayList<>(Collections.singletonList("logout"));
public static ArrayList<String> points_balance = new ArrayList<>(Arrays.asList("balance", "bal"));
public static ArrayList<String> points_points = new ArrayList<>(Collections.singletonList("points"));
public static ArrayList<String> points_add = new ArrayList<>(Collections.singletonList("add"));
public static ArrayList<String> points_remove = new ArrayList<>(Collections.singletonList("remove"));
public static ArrayList<String> points_set = new ArrayList<>(Collections.singletonList("set"));
public static ArrayList<String> relation_ally = new ArrayList<>(Collections.singletonList("ally"));
public static ArrayList<String> relation_enemy = new ArrayList<>(Collections.singletonList("enemy"));
public static ArrayList<String> relation_neutral = new ArrayList<>(Collections.singletonList("neutral"));
public static ArrayList<String> relation_truce = new ArrayList<>(Collections.singletonList("truce"));
public static ArrayList<String> reserve = new ArrayList<>(Collections.singletonList("reserve"));
public static ArrayList<String> roles_demote = new ArrayList<>(Collections.singletonList("demote"));
public static ArrayList<String> roles_promote = new ArrayList<>(Collections.singletonList("promote"));
public static ArrayList<String> tnt_tnt = new ArrayList<>(Collections.singletonList("tnt"));
public static ArrayList<String> tnt_tntfill = new ArrayList<>(Collections.singletonList("tntfill"));
public static ArrayList<String> wild = new ArrayList<>(Collections.singletonList("wild"));
public static ArrayList<String> admin = new ArrayList<>(Arrays.asList("admin", "setadmin", "leader", "setleader"));
public static ArrayList<String> ahome = new ArrayList<>(Collections.singletonList("ahome"));
public static ArrayList<String> announce = new ArrayList<>(Arrays.asList("ann", "announce"));
public static ArrayList<String> help = new ArrayList<>(Arrays.asList("help", "h", "?"));
public static ArrayList<String> ban_ban = new ArrayList<>(Collections.singletonList("ban"));
public static ArrayList<String> ban_banlist = new ArrayList<>(Arrays.asList("banlist", "bans", "banl"));
public static ArrayList<String> banner = new ArrayList<>(Collections.singletonList("banner"));
public static ArrayList<String> boom = new ArrayList<>(Arrays.asList("noboom", "explosions", "toggleexplosions"));
public static ArrayList<String> bypass = new ArrayList<>(Collections.singletonList("bypass"));
public static ArrayList<String> chat = new ArrayList<>(Arrays.asList("chat", "c"));
public static ArrayList<String> chatspy = new ArrayList<>(Collections.singletonList("chatspy"));
public static ArrayList<String> checkpoint = new ArrayList<>(Arrays.asList("checkp", "checkpoint", "cpoint"));
public static ArrayList<String> coleader = new ArrayList<>(Arrays.asList("coleader", "setcoleader", "co", "setco"));
public static ArrayList<String> config = new ArrayList<>(Collections.singletonList("config"));
public static ArrayList<String> convert = new ArrayList<>(Collections.singletonList("convert"));
public static ArrayList<String> coords = new ArrayList<>(Arrays.asList("coords", "coord"));
public static ArrayList<String> create = new ArrayList<>(Collections.singletonList("create"));
public static ArrayList<String> debug = new ArrayList<>(Collections.singletonList("debug"));
public static ArrayList<String> deinvite = new ArrayList<>(Arrays.asList("deinvite", "deinv"));
public static ArrayList<String> deletefwarp = new ArrayList<>(Arrays.asList("delwarp", "dw", "deletewarp"));
public static ArrayList<String> description = new ArrayList<>(Arrays.asList("desc", "description"));
public static ArrayList<String> disband = new ArrayList<>(Collections.singletonList("disband"));
public static ArrayList<String> discord_discord = new ArrayList<>(Collections.singletonList("discord"));
public static ArrayList<String> drain = new ArrayList<>(Collections.singletonList("drain"));
public static ArrayList<String> global = new ArrayList<>(Arrays.asList("gchat", "global", "globalchat"));
public static ArrayList<String> fly = new ArrayList<>(Collections.singletonList("fly"));
public static ArrayList<String> focus = new ArrayList<>(Collections.singletonList("focus"));
public static ArrayList<String> warp = new ArrayList<>(Arrays.asList("warp", "warps"));
public static ArrayList<String> getvault = new ArrayList<>(Collections.singletonList("getvault"));
public static ArrayList<String> home = new ArrayList<>(Collections.singletonList("home"));
public static ArrayList<String> inspect = new ArrayList<>(Arrays.asList("inspect", "ins"));
public static ArrayList<String> invsee = new ArrayList<>(Arrays.asList("invsee", "inventorysee"));
public static ArrayList<String> invite = new ArrayList<>(Arrays.asList("invite", "inv"));
public static ArrayList<String> join = new ArrayList<>(Collections.singletonList("join"));
public static ArrayList<String> kick = new ArrayList<>(Collections.singletonList("kick"));
public static ArrayList<String> killholograms = new ArrayList<>(Collections.singletonList("killholos"));
public static ArrayList<String> leave = new ArrayList<>(Collections.singletonList("leave"));
public static ArrayList<String> list = new ArrayList<>(Arrays.asList("list", "ls"));
public static ArrayList<String> lock = new ArrayList<>(Collections.singletonList("lock"));
public static ArrayList<String> logins = new ArrayList<>(Arrays.asList("logins", "login", "logouts"));
public static ArrayList<String> lookup = new ArrayList<>(Collections.singletonList("lookup"));
public static ArrayList<String> lowPower = new ArrayList<>(Collections.singletonList("lowpower"));
public static ArrayList<String> map_map = new ArrayList<>(Collections.singletonList("map"));
public static ArrayList<String> map_height = new ArrayList<>(Arrays.asList("mapheight", "mh"));
public static ArrayList<String> mod = new ArrayList<>(Arrays.asList("mod", "setmod", "officer", "setofficer"));
public static ArrayList<String> modifyPower = new ArrayList<>(Arrays.asList("mp", "pm", "modpower", "modifypower"));
public static ArrayList<String> near = new ArrayList<>(Arrays.asList("near", "nearby"));
public static ArrayList<String> open = new ArrayList<>(Collections.singletonList("open"));
public static ArrayList<String> owner_owner = new ArrayList<>(Collections.singletonList("owner"));
public static ArrayList<String> owner_list = new ArrayList<>(Collections.singletonList("ownerlist"));
public static ArrayList<String> paypal_see = new ArrayList<>(Arrays.asList("paypal", "seepaypal"));
public static ArrayList<String> paypal_set = new ArrayList<>(Collections.singletonList("setpaypal"));
public static ArrayList<String> peaceful = new ArrayList<>(Collections.singletonList("peaceful"));
public static ArrayList<String> perm = new ArrayList<>(Arrays.asList("perm", "perms", "permission", "permissions"));
public static ArrayList<String> permanent_faction = new ArrayList<>(Collections.singletonList("permanent"));
public static ArrayList<String> permanent_power = new ArrayList<>(Collections.singletonList("permanentpower"));
public static ArrayList<String> titles = new ArrayList<>(Collections.singletonList("titles"));
public static ArrayList<String> power_power = new ArrayList<>(Arrays.asList("pow", "power"));
public static ArrayList<String> power_boost = new ArrayList<>(Collections.singletonList("powerboost"));
public static ArrayList<String> reload = new ArrayList<>(Collections.singletonList("reload"));
public static ArrayList<String> rules = new ArrayList<>(Arrays.asList("r", "rule", "rules"));
public static ArrayList<String> saveAll = new ArrayList<>(Arrays.asList("save", "saveall"));
public static ArrayList<String> scoreboard = new ArrayList<>(Arrays.asList("sb", "scoreboard"));
public static ArrayList<String> seeChunk = new ArrayList<>(Arrays.asList("sc", "seechunk"));
public static ArrayList<String> discord_see = new ArrayList<>(Collections.singletonList("seediscord"));
public static ArrayList<String> discord_set = new ArrayList<>(Collections.singletonList("setdiscord"));
public static ArrayList<String> setBanner = new ArrayList<>(Collections.singletonList("setbanner"));
public static ArrayList<String> setDefaultRole = new ArrayList<>(Arrays.asList("defaultrole", "def", "default", "defaultrank"));
public static ArrayList<String> setWarp = new ArrayList<>(Arrays.asList("sw", "setwarp"));
public static ArrayList<String> setHome = new ArrayList<>(Collections.singletonList("sethome"));
public static ArrayList<String> setMaxVaults = new ArrayList<>(Arrays.asList("smv", "setmaxvaults"));
public static ArrayList<String> show_show = new ArrayList<>(Arrays.asList("show", "who"));
public static ArrayList<String> show_claims = new ArrayList<>(Arrays.asList("showclaim", "showclaims"));
public static ArrayList<String> show_invites = new ArrayList<>(Collections.singletonList("showinvites"));
public static ArrayList<String> spawnerlock = new ArrayList<>(Arrays.asList("lockspawners", "spawnerlock"));
public static ArrayList<String> status = new ArrayList<>(Arrays.asList("s", "status"));
public static ArrayList<String> stealth = new ArrayList<>(Arrays.asList("stealth", "ninja"));
public static ArrayList<String> strikes_strikes = new ArrayList<>(Collections.singletonList("strikes"));
public static ArrayList<String> strikes_give = new ArrayList<>(Collections.singletonList("give"));
public static ArrayList<String> strikes_info = new ArrayList<>(Collections.singletonList("info"));
public static ArrayList<String> strikes_set = new ArrayList<>(Collections.singletonList("set"));
public static ArrayList<String> strikes_take = new ArrayList<>(Collections.singletonList("take"));
public static ArrayList<String> stuck = new ArrayList<>(Arrays.asList("stuck", "halp!"));
public static ArrayList<String> tag = new ArrayList<>(Arrays.asList("tag", "rename"));
public static ArrayList<String> title = new ArrayList<>(Collections.singletonList("title"));
public static ArrayList<String> toggleAllianceChat = new ArrayList<>(Arrays.asList("tac", "ac", "togglealliancechat"));
public static ArrayList<String> top = new ArrayList<>(Arrays.asList("t", "top"));
public static ArrayList<String> tpBanner = new ArrayList<>(Collections.singletonList("tpbanner"));
public static ArrayList<String> unban = new ArrayList<>(Collections.singletonList("unban"));
public static ArrayList<String> upgrades = new ArrayList<>(Arrays.asList("upgrades", "upgrade"));
public static ArrayList<String> vault = new ArrayList<>(Collections.singletonList("vault"));
public static ArrayList<String> viewChest = new ArrayList<>(Arrays.asList("viewchest", "viewpv"));
private static transient Aliases i = new Aliases();
public static void load() {
FactionsPlugin.getInstance().persist.loadOrSaveDefault(i, Aliases.class, "aliases");
}
}

View File

@ -15,10 +15,6 @@ import java.util.Map;
public class BrigadierManager {
/**
* @author FactionsUUID Team
*/
public Commodore commodore;
public LiteralArgumentBuilder<Object> brigadier = LiteralArgumentBuilder.literal("factions");

View File

@ -4,10 +4,6 @@ import com.mojang.brigadier.builder.ArgumentBuilder;
public interface BrigadierProvider {
/**
* @author FactionsUUID Team
*/
ArgumentBuilder<Object, ?> get(ArgumentBuilder<Object, ?> parent);
}

View File

@ -8,13 +8,9 @@ import org.bukkit.event.player.PlayerTeleportEvent;
public class CmdAHome extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdAHome() {
super();
this.aliases.addAll(Aliases.ahome);
this.aliases.add("ahome");
this.requiredArgs.add("player");

View File

@ -3,24 +3,20 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
public class CmdAdmin extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdAdmin() {
super();
this.aliases.addAll(Aliases.admin);
this.aliases.add("admin");
this.aliases.add("setadmin");
this.aliases.add("leader");
this.aliases.add("setleader");
this.requiredArgs.add("player");
@ -29,11 +25,6 @@ public class CmdAdmin extends FCommand {
@Override
public void perform(CommandContext context) {
FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
if (context.player == null) {
context.msg(TL.GENERIC_PLAYERONLY);
return;
}
// Allows admins bypass this.
if (!context.fPlayer.isAdminBypassing() && !context.fPlayer.getRole().equals(Role.LEADER)) {
context.msg(TL.COMMAND_ADMIN_NOTADMIN);
@ -57,10 +48,6 @@ public class CmdAdmin extends FCommand {
return;
}
if (fyou.isAlt()) {
return;
}
// only perform a FPlayerJoinEvent when newLeader isn't actually in the faction
if (fyou.getFaction() != targetFaction) {
FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), targetFaction, FPlayerJoinEvent.PlayerJoinReason.LEADER);
@ -74,7 +61,7 @@ public class CmdAdmin extends FCommand {
// if target player is currently admin, demote and replace him
if (fyou == admin) {
promoteNewLeader(targetFaction);
targetFaction.promoteNewLeader();
context.msg(TL.COMMAND_ADMIN_DEMOTES, fyou.describeTo(context.fPlayer, true));
fyou.msg(TL.COMMAND_ADMIN_DEMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fyou, true));
return;
@ -82,29 +69,16 @@ public class CmdAdmin extends FCommand {
// promote target player, and demote existing admin if one exists
if (admin != null) {
setRole(admin, Role.COLEADER);
admin.setRole(Role.COLEADER);
}
setRole(fyou, Role.LEADER);
fyou.setRole(Role.LEADER);
context.msg(TL.COMMAND_ADMIN_PROMOTES, fyou.describeTo(context.fPlayer, true));
FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), fyou.getName(), ChatColor.RED + "Admin");
// Inform all players
if (FactionsPlugin.instance.getConfig().getBoolean("faction-leader-broadcast")) {
for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
fplayer.msg(TL.COMMAND_ADMIN_PROMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true), fyou.describeTo(fplayer), targetFaction.describeTo(fplayer));
}
}
});
}
private void setRole(FPlayer fp, Role r) {
FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> fp.setRole(r));
}
private void promoteNewLeader(Faction f) {
FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, (Runnable) f::promoteNewLeader);
}
public TL getUsageTranslation() {
return TL.COMMAND_ADMIN_DESCRIPTION;

View File

@ -12,13 +12,10 @@ import org.bukkit.entity.Player;
public class CmdAnnounce extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdAnnounce() {
super();
this.aliases.addAll(Aliases.announce);
this.aliases.add("ann");
this.aliases.add("announce");
this.requiredArgs.add("message");

View File

@ -8,12 +8,10 @@ import java.util.ArrayList;
public class CmdAutoHelp extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdAutoHelp() {
this.aliases.addAll(Aliases.help);
this.aliases.add("?");
this.aliases.add("h");
this.aliases.add("help");
this.setHelpShort("");

View File

@ -2,11 +2,9 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.BanInfo;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.CC;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
@ -15,13 +13,9 @@ import java.util.logging.Level;
public class CmdBan extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdBan() {
super();
this.aliases.addAll(Aliases.ban_ban);
this.aliases.add("ban");
this.requiredArgs.add("target");
@ -81,7 +75,6 @@ public class CmdBan extends FCommand {
// Lets inform the people!
target.msg(TL.COMMAND_BAN_TARGET, context.faction.getTag(target.getFaction()));
FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.BANS, context.fPlayer.getName(), CC.Green + "banned", target.getName());
context.faction.msg(TL.COMMAND_BAN_BANNED, context.fPlayer.getName(), target.getName());
}

View File

@ -13,13 +13,11 @@ import java.util.List;
public class CmdBanlist extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdBanlist() {
super();
this.aliases.addAll(Aliases.ban_banlist);
this.aliases.add("banlist");
this.aliases.add("bans");
this.aliases.add("banl");
this.optionalArgs.put("faction", "faction");

View File

@ -13,13 +13,9 @@ import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.ItemMeta;
public class CmdBanner extends FCommand {
/**
* @author Illyria Team
*/
public CmdBanner() {
this.aliases.addAll(Aliases.banner);
this.aliases.add("banner");
this.aliases.add("warbanner");
this.requirements = new CommandRequirements.Builder(Permission.BANNER).playerOnly().memberOnly().build();
}
@ -33,10 +29,12 @@ public class CmdBanner extends FCommand {
context.msg(TL.COMMAND_BANNER_NOBANNER);
return;
}
if (!context.fPlayer.takeMoney(FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000))) {
if (!context.fPlayer.hasMoney(FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000))) {
context.msg(TL.COMMAND_BANNER_NOTENOUGHMONEY);
return;
}
this.takeMoney(context.fPlayer, FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000));
this.takeMoney(context.fPlayer, FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000));
ItemStack warBanner = context.fPlayer.getFaction().getBanner();
ItemMeta warmeta = warBanner.getItemMeta();
warmeta.setDisplayName(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fbanners.Item.Name")));
@ -47,7 +45,6 @@ public class CmdBanner extends FCommand {
context.player.getInventory().addItem(warBanner);
}
@Deprecated
public boolean hasMoney(FPlayer fme, int amt) {
Economy econ = FactionsPlugin.getInstance().getEcon();
if (econ.getBalance(fme.getPlayer()) >= amt) {
@ -57,10 +54,10 @@ public class CmdBanner extends FCommand {
return false;
}
@Deprecated
public void takeMoney(FPlayer fme, int amt) {
if (this.hasMoney(fme, amt)) {
Economy econ = FactionsPlugin.getInstance().getEcon();
econ.withdrawPlayer(fme.getPlayer(), (double) amt);
fme.sendMessage(TL.COMMAND_BANNER_MONEYTAKE.toString().replace("{amount}", amt + ""));
}
}

View File

@ -6,13 +6,11 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdBoom extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdBoom() {
super();
this.aliases.addAll(Aliases.boom);
this.aliases.add("noboom");
this.aliases.add("explosions");
this.aliases.add("toggleexplosions");
//this.requiredArgs.add("");
this.optionalArgs.put("on/off", "flip");

View File

@ -6,13 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdBypass extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdBypass() {
super();
this.aliases.addAll(Aliases.bypass);
this.aliases.add("bypass");
//this.requiredArgs.add("");
this.optionalArgs.put("on/off", "flip");

View File

@ -10,13 +10,10 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
public class CmdChat extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdChat() {
super();
this.aliases.addAll(Aliases.chat);
this.aliases.add("c");
this.aliases.add("chat");
//this.requiredArgs.add("");
this.optionalArgs.put("mode", "next");

View File

@ -6,13 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdChatSpy extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdChatSpy() {
super();
this.aliases.addAll(Aliases.chatspy);
this.aliases.add("chatspy");
this.optionalArgs.put("on/off", "flip");

View File

@ -2,25 +2,22 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.*;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.WarmUpUtil;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
public class CmdCheckpoint extends FCommand {
/**
* @author Illyria Team
*/
public CmdCheckpoint() {
super();
this.aliases.addAll(Aliases.checkpoint);
this.aliases.add("checkp");
this.aliases.add("checkpoint");
this.aliases.add("cpoint");
this.optionalArgs.put("set", "");
this.requirements = new CommandRequirements.Builder(Permission.CHECKPOINT).playerOnly().memberOnly().build();
this.requirements = new CommandRequirements.Builder(Permission.CHECKPOINT)
.playerOnly()
.memberOnly()
.build();
}
@Override
@ -29,26 +26,7 @@ public class CmdCheckpoint extends FCommand {
context.msg(TL.COMMAND_CHECKPOINT_DISABLED);
return;
}
if (context.args.size() == 1 && context.args.get(0).equalsIgnoreCase("set")) {
if (context.fPlayer.getRole() == Role.LEADER) {
FLocation myLocation = new FLocation(context.player.getLocation());
Faction myLocFaction = Board.getInstance().getFactionAt(myLocation);
if (myLocFaction == Factions.getInstance().getWilderness() || myLocFaction == context.faction) {
context.faction.setCheckpoint(context.player.getLocation());
context.msg(TL.COMMAND_CHECKPOINT_SET);
return;
}
} else {
context.msg(TL.COMMAND_CHECKPOINT_INVALIDLOCATION);
return;
}
PermissableAction action = PermissableAction.SETWARP;
Access access = context.faction.getAccess(context.fPlayer, action);
if (access == Access.DENY) {
context.msg(TL.GENERIC_FPERM_NOPERMISSION, action.getName());
return;
} else {
if (context.args.size() == 1) {
FLocation myLocation = new FLocation(context.player.getLocation());
Faction myLocFaction = Board.getInstance().getFactionAt(myLocation);
if (myLocFaction == Factions.getInstance().getWilderness() || myLocFaction == context.faction) {
@ -60,8 +38,6 @@ public class CmdCheckpoint extends FCommand {
return;
}
}
}
if (context.faction.getCheckpoint() == null) {
context.msg(TL.COMMAND_CHECKPOINT_NOT_SET);
return;
@ -78,6 +54,8 @@ public class CmdCheckpoint extends FCommand {
} else {
context.msg(TL.COMMAND_CHECKPOINT_CLAIMED);
}
}
@Override

View File

@ -3,8 +3,6 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL;
@ -12,14 +10,12 @@ import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor;
public class CmdColeader extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdColeader() {
super();
this.aliases.addAll(Aliases.coleader);
this.aliases.add("co");
this.aliases.add("setcoleader");
this.aliases.add("coleader");
this.aliases.add("setco");
this.optionalArgs.put("player name", "name");
@ -55,10 +51,6 @@ public class CmdColeader extends FCommand {
return;
}
if (you.isAlt()) {
return;
}
if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
context.msg(TL.COMMAND_COLEADER_NOTADMIN);
return;
@ -84,7 +76,6 @@ public class CmdColeader extends FCommand {
you.setRole(Role.COLEADER);
targetFaction.msg(TL.COMMAND_COLEADER_PROMOTED, you.describeTo(targetFaction, true));
context.msg(TL.COMMAND_COLEADER_PROMOTES, you.describeTo(context.fPlayer, true));
FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.RED + "Co-Leader");
}
}

View File

@ -20,7 +20,7 @@ public class CmdConfig extends FCommand {
public CmdConfig() {
super();
this.aliases.addAll(Aliases.config);
this.aliases.add("config");
this.requiredArgs.add("setting");
this.requiredArgs.add("value");
@ -225,7 +225,7 @@ public class CmdConfig extends FCommand {
if (!success.isEmpty()) {
if (context.sender instanceof Player) {
context.sendMessage(success);
FactionsPlugin.getInstance().log(success + TL.COMMAND_CONFIG_LOG.format(context.sender));
FactionsPlugin.getInstance().log(success + TL.COMMAND_CONFIG_LOG.format((Player) context.sender));
} else // using FactionsPlugin.getInstance().log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log
{
FactionsPlugin.getInstance().log(success);

View File

@ -9,12 +9,8 @@ import org.bukkit.command.ConsoleCommandSender;
public class CmdConvert extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdConvert() {
this.aliases.addAll(Aliases.convert);
this.aliases.add("convert");
this.requiredArgs.add("[MYSQL|JSON]");
this.requirements = new CommandRequirements.Builder(Permission.CONVERT)

View File

@ -7,13 +7,10 @@ import org.bukkit.Location;
public class CmdCoords extends FCommand {
/**
* @author Illyria Team
*/
public CmdCoords() {
super();
this.aliases.addAll(Aliases.coords);
this.aliases.add("coords");
this.aliases.add("coord");
this.requirements = new CommandRequirements.Builder(Permission.COORD)
.playerOnly()

View File

@ -1,33 +1,23 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.*;
import com.massivecraft.factions.cmd.reserve.ReserveObject;
import com.massivecraft.factions.discord.Discord;
import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.event.FactionCreateEvent;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.Cooldown;
import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.zcore.util.TL;
import net.dv8tion.jda.core.entities.Member;
import net.dv8tion.jda.core.exceptions.HierarchyException;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import java.util.ArrayList;
public class CmdCreate extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdCreate() {
super();
this.aliases.addAll(Aliases.create);
this.aliases.add("create");
this.requiredArgs.add("faction tag");
@ -38,10 +28,6 @@ public class CmdCreate extends FCommand {
@Override
public void perform(CommandContext context) {
if (Conf.restrictActionsWhenNotLinked && !context.fPlayer.discordSetup()) {
context.player.sendMessage(ChatColor.translateAlternateColorCodes('&', TL.DISCORD_LINK_REQUIRED.toString()));
return;
}
String tag = context.argAsString(0);
if (context.fPlayer.hasFaction()) {
@ -54,17 +40,6 @@ public class CmdCreate extends FCommand {
return;
}
if (Cooldown.isOnCooldown(context.fPlayer.getPlayer(), "createCooldown") && !context.fPlayer.isAdminBypassing()) {
context.msg(TL.COMMAND_COOLDOWN);
return;
}
ReserveObject factionReserve = FactionsPlugin.getInstance().getFactionReserves().stream().filter(factionReserve1 -> factionReserve1.getFactionName().equalsIgnoreCase(tag)).findFirst().orElse(null);
if (factionReserve != null && !factionReserve.getName().equalsIgnoreCase(context.player.getName())) {
context.msg(TL.COMMAND_CREATE_ALREADY_RESERVED);
return;
}
ArrayList<String> tagValidationErrors = MiscUtil.validateTag(tag);
if (tagValidationErrors.size() > 0) {
context.sendMessage(tagValidationErrors);
@ -98,43 +73,23 @@ public class CmdCreate extends FCommand {
// finish setting up the Faction
faction.setTag(tag);
if (factionReserve != null) {
FactionsPlugin.getInstance().getFactionReserves().remove(factionReserve);
}
// trigger the faction join event for the creator
FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), faction, FPlayerJoinEvent.PlayerJoinReason.CREATE);
Bukkit.getServer().getPluginManager().callEvent(joinEvent);
// join event cannot be cancelled or you'll have an empty faction
// finish setting up the FPlayer
context.fPlayer.setFaction(faction, false);
// We should consider adding the role just AFTER joining the faction.
// 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.
context.fPlayer.setRole(Role.LEADER);
Cooldown.setCooldown(context.fPlayer.getPlayer(), "createCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-create"));
if (FactionsPlugin.getInstance().getConfig().getBoolean("faction-creation-broadcast", true)) {
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
follower.msg(TL.COMMAND_CREATE_CREATED, context.fPlayer.getName(), faction.getTag(follower));
}
}
//Discord
try {
if (Discord.useDiscord && context.fPlayer.discordSetup() && Discord.isInMainGuild(context.fPlayer.discordUser()) && Discord.mainGuild != null) {
Member m = Discord.mainGuild.getMember(context.fPlayer.discordUser());
if (Conf.factionRoles) {
Discord.mainGuild.getController().addSingleRoleToMember(m, Discord.createFactionRole(faction.getTag())).queue();
}
if (Conf.leaderRoles && Discord.leader != null) {
Discord.mainGuild.getController().addSingleRoleToMember(m, Discord.leader).queue();
}
if (Conf.factionDiscordTags) {
Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
}
}
} catch (HierarchyException e) {
System.out.print(e.getMessage());
}
//End Discord
context.msg(TL.COMMAND_CREATE_YOUSHOULD, FactionsPlugin.getInstance().cmdBase.cmdDescription.getUsageTemplate(context));
if (Conf.econEnabled) Econ.setBalance(faction.getAccountId(), Conf.econFactionStartingBalance);
if (Conf.logFactionCreate)

View File

@ -1,69 +0,0 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.discord.Discord;
import com.massivecraft.factions.discord.DiscordSetupAttempt;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
public class CmdDebug extends FCommand {
public CmdDebug() {
super();
this.aliases.add("debug");
this.requirements = new CommandRequirements.Builder(Permission.DEBUG).build();
}
@Override
public void perform(CommandContext context) {
FactionsPlugin.getInstance().divider();
System.out.print("----------Debug Info----------");
System.out.print("-------Main-------");
System.out.print("Server Version: " + FactionsPlugin.getInstance().getServer().getVersion());
System.out.print("Server Bukkit Version: " + FactionsPlugin.getInstance().getServer().getBukkitVersion());
System.out.print("SaberFactions Version: " + FactionsPlugin.getInstance().getDescription().getVersion());
System.out.print("Is Beta Version: " + (FactionsPlugin.getInstance().getDescription().getFullName().contains("BETA") ? "True" : "False"));
System.out.print("Players Online: " + Bukkit.getOnlinePlayers().size());
System.out.print("------Command------");
System.out.print("Discord Commands: " + FCmdRoot.instance.discordEnabled);
System.out.print("Check/WeeWoo Commands: " + FCmdRoot.instance.checkEnabled);
System.out.print("Mission Command: " + FCmdRoot.instance.missionsEnabled);
System.out.print("Shop Command: " + FCmdRoot.instance.fShopEnabled);
System.out.print("Inventory See Command: " + FCmdRoot.instance.invSeeEnabled);
System.out.print("Points Command: " + FCmdRoot.instance.fPointsEnabled);
System.out.print("Alts Command: " + FCmdRoot.instance.fAltsEnabled);
System.out.print("Grace Command: " + FCmdRoot.instance.fGraceEnabled);
System.out.print("Focus Command: " + FCmdRoot.instance.fFocusEnabled);
System.out.print("Fly Command: " + FCmdRoot.instance.fFlyEnabled);
System.out.print("PayPal Commands: " + FCmdRoot.instance.fPayPalEnabled);
System.out.print("Inspect Command: " + FCmdRoot.instance.coreProtectEnabled);
System.out.print("Internal FTOP Command: " + FCmdRoot.instance.internalFTOPEnabled);
System.out.print("----End Command----");
System.out.print("-----End Main-----");
System.out.print("------Discord------");
System.out.print("Discord Integration enabled in config: " + Discord.confUseDiscord);
System.out.print("Discord Integration enabled: " + Discord.useDiscord);
System.out.print("Setup attempts: " + Discord.setupLog.size());
System.out.print("FPlayers waiting to link: " + Discord.waitingLink.size());
System.out.print("Bot Token: " + (Discord.botToken == "<token here>" ? "Not Set" : "Set"));
System.out.print("JDA Null: " + (Discord.jda == null ? "True" : "False"));
System.out.print("Main Guild ID: " + Discord.mainGuildID);
System.out.print("Main Guild Null: " + (Discord.mainGuild == null ? "True" : "False"));
System.out.print("Emotes enabled: " + Discord.useEmotes);
System.out.print("Leader role null: " + (Discord.leader == null ? "True" : "False"));
System.out.print("Attempt Log:");
for (DiscordSetupAttempt d : Discord.setupLog) {
System.out.print(d.getDifferentialFormatted() + " " + d.getSuccess() + " " + d.getReason());
}
System.out.print("End Attempt Log");
System.out.print("----End Discord----");
System.out.print("--------End Debug Info--------");
FactionsPlugin.getInstance().divider();
context.fPlayer.msg(TL.COMMAND_DEBUG_PRINTED);
}
@Override
public TL getUsageTranslation() {
return TL.COMMAND_DEBUG_DESCRIPTION;
}
}

View File

@ -3,7 +3,10 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
@ -11,25 +14,43 @@ import org.bukkit.ChatColor;
public class CmdDeinvite extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdDeinvite() {
super();
this.aliases.addAll(Aliases.deinvite);
this.aliases.add("deinvite");
this.aliases.add("deinv");
this.optionalArgs.put("player name", "name");
this.requirements = new CommandRequirements.Builder(Permission.DEINVITE)
.withAction(PermissableAction.INVITE)
.memberOnly()
.build();
}
@Override
public void perform(CommandContext context) {
// Check if arg 0 == null do you don't have
// `No player "null" could be found.` message.
if (context.args.get(0) == null) {
FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
for (String id : context.faction.getInvites()) {
FPlayer fp = FPlayers.getInstance().getById(id);
String name = fp != null ? fp.getName() : id;
msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
}
context.sendFancyMessage(msg);
return;
}
FPlayer you = context.argAsBestFPlayerMatch(0);
if (!context.fPlayer.isAdminBypassing()) {
Access access = context.faction.getAccess(context.fPlayer, PermissableAction.INVITE);
if (access != Access.ALLOW && context.fPlayer.getRole() != Role.LEADER) {
context.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
return;
}
}
if (you == null) {
FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
for (String id : context.faction.getInvites()) {
@ -43,7 +64,7 @@ public class CmdDeinvite extends FCommand {
if (you.getFaction() == context.faction) {
context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag());
context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FCmdRoot.instance.cmdKick.getUsageTemplate(context));
context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context));
return;
}

View File

@ -7,13 +7,11 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdDelFWarp extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdDelFWarp() {
super();
this.aliases.addAll(Aliases.deletefwarp);
this.aliases.add("delwarp");
this.aliases.add("dw");
this.aliases.add("deletewarp");
this.requiredArgs.add("warp name");
this.requirements = new CommandRequirements.Builder(Permission.SETWARP)

View File

@ -1,51 +0,0 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
/**
* Factions - Developed by Driftay.
* All rights reserved 2020.
* Creation Date: 3/24/2020
*/
public class CmdDelHome extends FCommand {
public CmdDelHome() {
this.aliases.addAll(Aliases.delfHome);
this.requirements = new CommandRequirements.Builder(Permission.DELHOME)
.memberOnly()
.withAction(PermissableAction.SETHOME)
.build();
}
@Override
public void perform(CommandContext context) {
FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
//Check if homes are enabled
if (!Conf.homesEnabled) {
context.msg(TL.COMMAND_SETHOME_DISABLED);
return;
}
//If They Don't Have Home
if (!context.faction.hasHome()) {
context.msg(TL.COMMAND_HOME_NOHOME.toString());
context.msg(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUsageTemplate(context));
return;
}
context.faction.deleteHome();
context.faction.msg(TL.COMMAND_DELHOME_SUCCESS, context.fPlayer.describeTo(context.faction, true));
});
}
@Override
public TL getUsageTranslation() {
return TL.COMMAND_DELHOME_DESCRIPTION;
}
}

View File

@ -3,22 +3,16 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TextUtil;
import org.bukkit.Bukkit;
public class CmdDescription extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdDescription() {
super();
this.aliases.addAll(Aliases.description);
this.aliases.add("desc");
this.aliases.add("description");
this.requiredArgs.add("desc");
@ -31,7 +25,6 @@ public class CmdDescription extends FCommand {
@Override
public void perform(CommandContext context) {
FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (!context.payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) {
return;
@ -39,9 +32,8 @@ public class CmdDescription extends FCommand {
// since "&" color tags seem to work even through plain old FPlayer.sendMessage() for some reason, we need to break those up
// And replace all the % because it messes with string formatting and this is easy way around that.
String desc = TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2");
context.faction.setDescription(desc);
Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.FDESC_EDIT, context.fPlayer.getName(), desc));
context.faction.setDescription(TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2"));
if (!Conf.broadcastDescriptionChanges) {
context.msg(TL.COMMAND_DESCRIPTION_CHANGED, context.faction.describeTo(context.fPlayer));
context.sendMessage(context.faction.getDescription());
@ -53,7 +45,6 @@ public class CmdDescription extends FCommand {
fplayer.msg(TL.COMMAND_DESCRIPTION_CHANGES, context.faction.describeTo(fplayer));
fplayer.sendMessage(context.faction.getDescription()); // players can inject "&" or "`" or "<i>" or whatever in their description; &k is particularly interesting looking
}
});
}
@Override

View File

@ -4,38 +4,35 @@ import com.massivecraft.factions.*;
import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.Cooldown;
import com.massivecraft.factions.util.UtilFly;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.frame.fdisband.FDisbandFrame;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
public class CmdDisband extends FCommand {
/**
* @author FactionsUUID Team
*/
private static HashMap<String, String> disbandMap = new HashMap<>();
public CmdDisband() {
super();
this.aliases.addAll(Aliases.disband);
this.aliases.add("disband");
this.optionalArgs.put("faction tag", "yours");
this.requirements = new CommandRequirements.Builder(Permission.DISBAND)
.build();
}
@Override
public void perform(CommandContext context) {
long time;
// The faction, default to your own.. but null if console sender.
Faction faction = context.argAsFaction(0, context.fPlayer == null ? null : context.faction);
if (faction == null) return;
@ -43,7 +40,9 @@ public class CmdDisband extends FCommand {
boolean isMyFaction = context.fPlayer != null && faction == context.faction;
if (!isMyFaction) {
if (!Permission.DISBAND_ANY.has(context.sender, true)) return;
if (!Permission.DISBAND_ANY.has(context.sender, true)) {
return;
}
}
@ -70,26 +69,6 @@ public class CmdDisband extends FCommand {
return;
}
if (Cooldown.isOnCooldown(context.fPlayer.getPlayer(), "disbandCooldown") && !context.fPlayer.isAdminBypassing()) {
context.msg(TL.COMMAND_COOLDOWN);
return;
}
boolean access = false;
if (context.fPlayer.getPlayer().hasMetadata("disband_confirm") && (time = context.fPlayer.getPlayer().getMetadata("disband_confirm").get(0).asLong()) != 0L && System.currentTimeMillis() - time <= TimeUnit.SECONDS.toMillis(3L)) {
access = true;
}
if (!access) {
if (Conf.useDisbandGUI && (!context.fPlayer.isAdminBypassing() || !context.player.isOp())) {
if (!disbandMap.containsKey(context.player.getUniqueId().toString())) {
new FDisbandFrame(context.faction).buildGUI(context.fPlayer);
return;
}
}
}
// check for tnt before disbanding.
if (!disbandMap.containsKey(context.player.getUniqueId().toString()) && faction.getTnt() > 0) {
context.msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + ""));
@ -99,17 +78,18 @@ public class CmdDisband extends FCommand {
if (FactionsPlugin.getInstance().getConfig().getBoolean("faction-disband-broadcast", true)) {
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
String amountString = context.sender instanceof ConsoleCommandSender ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(follower);
UtilFly.checkFly(context.fPlayer, Board.getInstance().getFactionAt(new FLocation(follower)));
if (follower.getFaction() == faction) {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
} else {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
}
}
faction.disband(context.player, PlayerDisbandReason.COMMAND);
} else {
faction.disband(context.player, PlayerDisbandReason.COMMAND);
context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
}
faction.disband(context.player, PlayerDisbandReason.COMMAND);
Cooldown.setCooldown(context.fPlayer.getPlayer(), "disbandCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-disband"));
}
}

View File

@ -1,45 +0,0 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.discord.Discord;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import java.util.Random;
/**
* @author SaberTeam
*/
public class CmdDiscord extends FCommand {
public CmdDiscord() {
super();
this.aliases.addAll(Aliases.discord_discord);
this.requirements = new CommandRequirements.Builder(Permission.DISCORD)
.playerOnly()
.build();
}
@Override
public void perform(CommandContext context) {
if (context.fPlayer.discordSetup()) {
context.fPlayer.msg(TL.DISCORD_ALREADY_LINKED, context.fPlayer.discordUser().getName());
} else {
if (Discord.waitingLink.containsValue(context.fPlayer)) {
context.fPlayer.msg(TL.DISCORD_CODE_SENT, Discord.waitingLinkk.get(context.fPlayer), Discord.mainGuild.getSelfMember().getEffectiveName());
return;
}
Integer random = new Random().nextInt(9999);
while (Discord.waitingLink.containsValue(random)) {
random = new Random().nextInt(9999);
}
Discord.waitingLink.put(random, context.fPlayer);
Discord.waitingLinkk.put(context.fPlayer, random);
context.fPlayer.msg(TL.DISCORD_CODE_SENT, String.valueOf(random));
}
}
@Override
public TL getUsageTranslation() {
return TL.COMMAND_DISCORD_DESCRIPTION;
}
}

View File

@ -1,63 +0,0 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
import java.text.DecimalFormat;
/**
* @author Saser
*/
public class CmdDrain extends FCommand {
public CmdDrain() {
this.aliases.addAll(Aliases.drain);
this.requirements = new CommandRequirements.Builder(Permission.DRAIN)
.playerOnly()
.memberOnly()
.withAction(PermissableAction.DRAIN)
.build();
}
@Override
public void perform(CommandContext context) {
if (!Conf.factionsDrainEnabled) {
context.fPlayer.msg(TL.GENERIC_DISABLED, "Factions Drain");
return;
}
double totalBalance = 0;
for (FPlayer fPlayer : context.faction.getFPlayers()) {
if (context.faction.getFPlayers().size() == 1) {
context.fPlayer.msg(TL.COMMAND_DRAIN_NO_PLAYERS);
return;
}
if (FPlayers.getInstance().getByPlayer(context.player).equals(fPlayer)) {
continue; // skip the command executor
}
double balance = FactionsPlugin.getInstance().getEcon().getBalance(fPlayer.getPlayer());
if (balance > 0) {
FactionsPlugin.getInstance().getEcon().depositPlayer(context.player, balance);
FactionsPlugin.getInstance().getEcon().withdrawPlayer(fPlayer.getPlayer(), balance);
totalBalance = (totalBalance + balance);
}
}
context.fPlayer.msg(TL.COMMAND_DRAIN_RECIEVED_AMOUNT, commas(totalBalance));
}
public String commas(final double amount) {
final DecimalFormat formatter = new DecimalFormat("#,###.00");
return formatter.format(amount);
}
@Override
public TL getUsageTranslation() {
return TL.COMMAND_DRAIN_DESCRIPTION;
}
}

View File

@ -9,15 +9,13 @@ import java.util.UUID;
public class CmdFGlobal extends FCommand {
/**
* @author Trent
*/
public static List<UUID> toggled = new ArrayList<>();
public CmdFGlobal() {
super();
this.aliases.addAll(Aliases.global);
this.aliases.add("gchat");
this.aliases.add("global");
this.aliases.add("globalchat");
this.requirements = new CommandRequirements.Builder(Permission.GLOBALCHAT)
.playerOnly()

View File

@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.FactionWarpsFrame;
import com.massivecraft.factions.util.WarmUpUtil;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.frame.fwarps.FactionWarpsFrame;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@ -14,13 +14,10 @@ import java.util.UUID;
public class CmdFWarp extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdFWarp() {
super();
this.aliases.addAll(Aliases.warp);
this.aliases.add("warp");
this.aliases.add("warps");
this.optionalArgs.put("warpname", "warpname");
this.optionalArgs.put("password", "password");

View File

@ -19,34 +19,33 @@ import java.util.concurrent.ConcurrentHashMap;
public class CmdFly extends FCommand {
public static final boolean fly = FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight");
/**
* @author FactionsUUID Team
*/
public static ConcurrentHashMap<String, Boolean> flyMap = new ConcurrentHashMap<>();
public static BukkitTask particleTask = null;
public static BukkitTask flyTask = null;
public CmdFly() {
super();
this.aliases.addAll(Aliases.fly);
this.aliases.add("fly");
this.optionalArgs.put("on/off", "flip");
this.requirements = new CommandRequirements.Builder(Permission.FLY_FLY)
this.requirements = new CommandRequirements.Builder(Permission.FLY)
.playerOnly()
.memberOnly()
.build();
}
public static void startParticles() {
particleTask = Bukkit.getScheduler().runTaskTimerAsynchronously(FactionsPlugin.instance, () -> {
for (String name : flyMap.keySet()) {
Player player = Bukkit.getPlayer(name);
if (player == null) continue;
if (!player.isFlying()) continue;
if (!FactionsPlugin.getInstance().mc17 && player.getGameMode() == GameMode.SPECTATOR) continue;
if (!FactionsPlugin.getInstance().mc17) {
if (player.getGameMode() == GameMode.SPECTATOR) continue;
}
FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
fplayer.isVanished();
@ -58,52 +57,107 @@ public class CmdFly extends FCommand {
}, 10L, 3L);
}
public static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac, boolean sendMessage) {
if (Conf.denyFlightIfInNoClaimingWorld && !Conf.worldsNoClaiming.isEmpty() && Conf.worldsNoClaiming.stream().anyMatch(me.getWorld().getName()::equalsIgnoreCase))
return false;
public static void startFlyCheck() {
flyTask = Bukkit.getScheduler().runTaskTimerAsynchronously(FactionsPlugin.instance, () -> {
checkTaskState();
if (flyMap.keySet().size() != 0) {
for (String name : flyMap.keySet()) {
if (name == null) {
continue;
}
Player player = Bukkit.getPlayer(name);
if (player == null
|| !player.isFlying()
|| player.getGameMode() == GameMode.CREATIVE
|| !FactionsPlugin.getInstance().mc17 && player.getGameMode() == GameMode.SPECTATOR) {
continue;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
Faction myFaction = fPlayer.getFaction();
if (myFaction.isWilderness()) {
fPlayer.setFlying(false);
flyMap.remove(name);
continue;
}
if (player.hasPermission("factions.fly.bypassnearbyenemycheck") || fPlayer.checkIfNearbyEnemies()) {
continue;
}
FLocation myFloc = new FLocation(player.getLocation());
if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
if (!checkBypassPerms(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
Bukkit.getScheduler().runTask(FactionsPlugin.instance, () -> fPlayer.setFFlying(false, false));
flyMap.remove(name);
}
}
}
}
}, 20L, 20L);
}
public static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac) {
if (toFac != fme.getFaction()) {
if (!me.hasPermission(Permission.FLY_WILDERNESS.node) && toFac.isWilderness() || !me.hasPermission(Permission.FLY_SAFEZONE.node) && toFac.isSafeZone() || !me.hasPermission(Permission.FLY_WARZONE.node) && toFac.isWarZone()) {
if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
if (!me.hasPermission(Permission.FLY_WILD.node) && toFac.isWilderness() || !me.hasPermission(Permission.FLY_SAFEZONE.node) && toFac.isSafeZone() || !me.hasPermission(Permission.FLY_WARZONE.node) && toFac.isWarZone()) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
Access access = toFac.getAccess(fme, PermissableAction.FLY);
if ((!(me.hasPermission(Permission.FLY_ENEMY.node) || access == Access.ALLOW)) && toFac.getRelationTo(fme.getFaction()) == Relation.ENEMY) {
if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
if (!(me.hasPermission(Permission.FLY_ALLY.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.ALLY) {
if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
if (!(me.hasPermission(Permission.FLY_TRUCE.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.TRUCE) {
if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !isSystemFaction(toFac)) {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
return false;
}
return me.hasPermission(Permission.FLY_FLY.node) && (access != Access.DENY || toFac.isSystemFaction());
return me.hasPermission(Permission.FLY.node) && (access != Access.DENY || toFac.isSystemFaction());
}
return true;
}
public static Boolean isSystemFaction(Faction faction) {
return faction.isSafeZone() ||
faction.isWarZone() ||
faction.isWilderness();
}
public static void checkTaskState() {
if (flyMap.isEmpty()) {
flyTask.cancel();
flyTask = null;
}
}
public static void disableFlight(final FPlayer fme) {
fme.setFlying(false);
flyMap.remove(fme.getPlayer().getName());
}
public boolean isInFlightChecker(Player player) {
return flyMap.containsKey(player.getName());
}
@Override
public void perform(CommandContext context) {
if (!context.fPlayer.isAdminBypassing()) {
// Disabled by default.
if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
context.fPlayer.msg(TL.COMMAND_FLY_DISABLED);
return;
}
FLocation myfloc = new FLocation(context.player.getLocation());
Faction toFac = Board.getInstance().getFactionAt(myfloc);
if (!checkBypassPerms(context.fPlayer, context.player, toFac)) return;
List<Entity> entities = context.player.getNearbyEntities(16.0D, 256.0D, 16.0D);
for (int i = 0; i <= entities.size() - 1; ++i) {
@ -114,17 +168,9 @@ public class CmdFly extends FCommand {
context.msg(TL.COMMAND_FLY_CHECK_ENEMY);
return;
}
context.fPlayer.setEnemiesNearby(false);
}
}
FLocation myfloc = new FLocation(context.player.getLocation());
Faction toFac = Board.getInstance().getFactionAt(myfloc);
if (!checkBypassPerms(context.fPlayer, context.player, toFac, false)) {
context.fPlayer.sendMessage(TL.COMMAND_FLY_NO_ACCESS.format(toFac.getTag()));
return;
}
}
if (context.args.size() == 0) {
toggleFlight(context.fPlayer.isFlying(), context.fPlayer, context);
@ -140,15 +186,19 @@ public class CmdFly extends FCommand {
return;
}
if (fme.canFlyAtLocation()) {
if (fme.canFlyAtLocation())
context.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", () -> {
fme.setFlying(true);
flyMap.put(fme.getPlayer().getName(), true);
if (particleTask == null) startParticles();
}, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
} else {
fme.msg(TL.COMMAND_FLY_NO_ACCESS, Board.getInstance().getFactionAt(fme.getLastStoodAt()).getTag());
if (particleTask == null) {
startParticles();
}
if (flyTask == null) {
startFlyCheck();
}
}, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
}
@Override

View File

@ -7,13 +7,8 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
public class CmdFocus extends FCommand {
/**
* @author Driftay
*/
public CmdFocus() {
aliases.addAll(Aliases.focus);
aliases.add("focus");
requiredArgs.add("player");
@ -26,7 +21,7 @@ public class CmdFocus extends FCommand {
@Override
public void perform(CommandContext context) {
if (!FactionsPlugin.getInstance().getConfig().getBoolean("ffocus.Enabled")) {
context.msg(TL.GENERIC_DISABLED, "Faction Focus");
context.msg(TL.GENERIC_DISABLED);
return;
}
FPlayer target = context.argAsFPlayer(0);

View File

@ -1,44 +0,0 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
/**
* Factions - Developed by Driftay.
* All rights reserved 2020.
* Creation Date: 4/6/2020
*/
public class CmdFriendlyFire extends FCommand {
public CmdFriendlyFire() {
super();
this.aliases.addAll(Aliases.friendlyFire);
this.requirements = new CommandRequirements.Builder(Permission.FRIENDLYFIRE)
.playerOnly()
.memberOnly()
.build();
}
@Override
public void perform(CommandContext context) {
if (!Conf.friendlyFireFPlayersCommand) {
context.msg(TL.GENERIC_DISABLED, "friendly fire");
return;
}
if (context.fPlayer.hasFriendlyFire()) {
context.fPlayer.setFriendlyFire(false);
context.msg(TL.COMMAND_FRIENDLY_FIRE_TOGGLE_OFF);
} else {
context.fPlayer.setFriendlyFire(true);
context.msg(TL.COMMAND_FRIENDLY_FIRE_TOGGLE_ON);
}
}
@Override
public TL getUsageTranslation() {
return TL.COMMAND_FRIENDLY_FIRE_DESCRIPTION;
}
}

View File

@ -2,21 +2,16 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.ItemBuilder;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
public class CmdGetVault extends FCommand {
/**
* @author Illyria Team
*/
public CmdGetVault() {
super();
this.aliases.addAll(Aliases.getvault);
this.aliases.add("getvault");
this.requirements = new CommandRequirements.Builder(Permission.GETVAULT)
.playerOnly()
@ -27,16 +22,12 @@ public class CmdGetVault extends FCommand {
@Override
public void perform(CommandContext context) {
if (!FactionsPlugin.getInstance().getConfig().getBoolean("fvault.Enabled")) {
context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Vaults");
context.fPlayer.sendMessage("This command is disabled!");
return;
}
Location vaultLocation = context.faction.getVault();
ItemStack vault = new ItemBuilder(Material.CHEST)
.amount(1)
.name(FactionsPlugin.getInstance().getConfig().getString("fvault.Item.Name"))
.lore(FactionsPlugin.getInstance().getConfig().getStringList("fvault.Item.Lore"))
.build();
ItemStack vault = FactionsPlugin.getInstance().createItem(Material.CHEST, 1, (short) 0, FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fvault.Item.Name")), FactionsPlugin.getInstance().colorList(FactionsPlugin.getInstance().getConfig().getStringList("fvault.Item.Lore")));
//check if vault is set
if (vaultLocation != null) {
@ -44,12 +35,14 @@ public class CmdGetVault extends FCommand {
return;
}
//has enough money?
int amount = FactionsPlugin.getInstance().getConfig().getInt("fvault.Price");
if (!context.fPlayer.hasMoney(amount)) {
return;
}
//success :)
context.fPlayer.takeMoney(amount);
context.player.getInventory().addItem(vault);
@ -57,6 +50,19 @@ public class CmdGetVault extends FCommand {
}
public boolean inventoryContains(Inventory inventory, ItemStack item) {
int count = 0;
ItemStack[] items = inventory.getContents();
for (int i = 0; i < items.length; i++) {
if (items[i] != null && items[i].getType() == item.getType() && items[i].getDurability() == item.getDurability()) {
count += items[i].getAmount();
}
if (count >= item.getAmount()) {
return true;
}
}
return false;
}
@Override
public TL getUsageTranslation() {

View File

@ -13,16 +13,13 @@ import java.util.List;
public class CmdHelp extends FCommand {
/**
* @author FactionsUUID Team
*/
public ArrayList<ArrayList<String>> helpPages;
//TODO: Add Help GUI
public CmdHelp() {
super();
this.aliases.addAll(Aliases.help);
this.aliases.add("help");
this.aliases.add("h");
this.aliases.add("?");
//this.requiredArgs.add("");
this.optionalArgs.put("page", "1");

View File

@ -20,13 +20,9 @@ import java.util.List;
public class CmdHome extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdHome() {
super();
this.aliases.addAll(Aliases.home);
this.aliases.add("home");
this.optionalArgs.put("faction", "yours");
this.requirements = new CommandRequirements.Builder(Permission.HOME)

View File

@ -1,18 +1,14 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
public class CmdInspect extends FCommand {
/**
* @author Illyria Team
*/
public CmdInspect() {
super();
this.aliases.addAll(Aliases.inspect);
this.aliases.add("inspect");
this.aliases.add("ins");
this.requirements = new CommandRequirements.Builder(Permission.INSPECT)
.playerOnly()
.memberOnly()
@ -22,11 +18,6 @@ public class CmdInspect extends FCommand {
@Override
public void perform(CommandContext context) {
if (!Conf.useInspectSystem) {
context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Inspection");
return;
}
if (context.fPlayer.isInspectMode()) {
context.fPlayer.setInspectMode(false);
context.msg(TL.COMMAND_INSPECT_DISABLED_MSG);

View File

@ -16,14 +16,11 @@ import java.util.Objects;
public class CmdInventorySee extends FCommand {
/**
* @author Driftay
*/
public CmdInventorySee() {
super();
this.aliases.addAll(Aliases.invsee);
this.aliases.add("invsee");
this.aliases.add("inventorysee");
this.requiredArgs.add("member name");
@ -35,7 +32,7 @@ public class CmdInventorySee extends FCommand {
@Override
public void perform(CommandContext context) {
if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-inventory-see.Enabled")) {
context.msg(TL.GENERIC_DISABLED, "Inventory See");
context.msg(TL.GENERIC_DISABLED);
return;
}

View File

@ -3,22 +3,18 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.CC;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor;
public class CmdInvite extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdInvite() {
super();
this.aliases.addAll(Aliases.invite);
this.aliases.add("invite");
this.aliases.add("inv");
this.requiredArgs.add("player name");
@ -59,16 +55,20 @@ public class CmdInvite extends FCommand {
// Send the invitation to the target player when online, otherwise just ignore
if (target.isOnline()) {
// Tooltips, colors, and commands only apply to the string immediately before it.
FancyMessage message = new FancyMessage(TL.COMMAND_INVITE_INVITEDYOU.toString()
.replace("%1$s", context.fPlayer.describeTo(target, true))
.replace("%2$s", context.faction.getTag())
.replaceAll("&", "§"))
FancyMessage message = new FancyMessage(context.fPlayer.describeTo(target, true))
.tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
.command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag())
.then(TL.COMMAND_INVITE_INVITEDYOU.toString())
.color(ChatColor.YELLOW)
.tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
.command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag())
.then(context.faction.describeTo(target)).tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
.command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag());
message.send(target.getPlayer());
}
context.faction.msg(TL.COMMAND_INVITE_INVITED, context.fPlayer.describeTo(context.faction, true), target.describeTo(context.faction));
FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.INVITES, context.fPlayer.getName(), CC.Green + "invited", target.getName());
}
@Override

View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.*;
import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType;
import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
@ -11,7 +11,7 @@ public class CmdJoin extends FCommand {
public CmdJoin() {
super();
this.aliases.addAll(Aliases.join);
this.aliases.add("join");
this.requiredArgs.add("faction name");
this.optionalArgs.put("player", "you");
@ -45,7 +45,7 @@ public class CmdJoin extends FCommand {
return;
}
if (!faction.altInvited(fplayer) && Conf.factionMemberLimit > 0 && faction.getFPlayers().size() >= getFactionMemberLimit(faction)) {
if (Conf.factionMemberLimit > 0 && faction.getFPlayers().size() >= getFactionMemberLimit(faction)) {
context.msg(TL.COMMAND_JOIN_ATLIMIT, faction.getTag(context.fPlayer), getFactionMemberLimit(faction), fplayer.describeTo(context.fPlayer, false));
return;
}
@ -120,16 +120,16 @@ public class CmdJoin extends FCommand {
if (Conf.logFactionJoin) {
if (samePlayer) {
FactionsPlugin.instance.log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());
FactionsPlugin.getInstance().log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());
} else {
FactionsPlugin.instance.log(TL.COMMAND_JOIN_MOVEDLOG.toString(), context.fPlayer.getName(), fplayer.getName(), faction.getTag());
FactionsPlugin.getInstance().log(TL.COMMAND_JOIN_MOVEDLOG.toString(), context.fPlayer.getName(), fplayer.getName(), faction.getTag());
}
}
}
private int getFactionMemberLimit(Faction f) {
if (f.getUpgrade(UpgradeType.MEMBERS) == 0) return Conf.factionMemberLimit;
return Conf.factionMemberLimit + FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Members.Members-Limit.level-" + f.getUpgrade(UpgradeType.MEMBERS));
return Conf.factionMemberLimit + FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Members.Member-Boost.level-" + f.getUpgrade(UpgradeType.MEMBERS));
}
@Override

View File

@ -4,11 +4,9 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.CC;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage;
@ -18,13 +16,9 @@ import org.bukkit.command.ConsoleCommandSender;
public class CmdKick extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdKick() {
super();
this.aliases.addAll(Aliases.kick);
this.aliases.add("kick");
this.optionalArgs.put("player name", "player name");
this.requirements = new CommandRequirements.Builder(Permission.KICK)
@ -115,7 +109,6 @@ public class CmdKick extends FCommand {
toKickFaction.msg(TL.COMMAND_KICK_FACTION, context.fPlayer.describeTo(toKickFaction, true), toKick.describeTo(toKickFaction, true));
toKick.msg(TL.COMMAND_KICK_KICKED, context.fPlayer.describeTo(toKick, true), toKickFaction.describeTo(toKick));
if (toKickFaction != context.faction) {
context.fPlayer.msg(TL.COMMAND_KICK_KICKS, toKick.describeTo(context.fPlayer), toKickFaction.describeTo(context.fPlayer));
}
@ -125,12 +118,8 @@ public class CmdKick extends FCommand {
if (toKick.getRole() == Role.LEADER) {
toKickFaction.promoteNewLeader();
}
FactionsPlugin.instance.logFactionEvent(toKickFaction, FLogType.INVITES, context.fPlayer.getName(), CC.Red + "kicked", toKick.getName());
toKickFaction.deinvite(toKick);
toKick.resetFactionData();
if (!CmdFly.checkBypassPerms(toKick, toKick.getPlayer(), toKickFaction, false)) {
CmdFly.disableFlight(toKick);
}
}
@Override

View File

@ -4,14 +4,9 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
public class CmdKillHolograms extends FCommand {
/**
* @author Illyria Team
*/
public CmdKillHolograms() {
super();
this.aliases.addAll(Aliases.killholograms);
this.aliases.add("killholos");
this.requiredArgs.add("radius");
this.requirements = new CommandRequirements.Builder(Permission.KILLHOLOS)

View File

@ -5,13 +5,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdLeave extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdLeave() {
super();
this.aliases.addAll(Aliases.leave);
this.aliases.add("leave");
this.requirements = new CommandRequirements.Builder(Permission.LEAVE)
.playerOnly()

View File

@ -14,15 +14,12 @@ import java.util.List;
public class CmdList extends FCommand {
/**
* @author FactionsUUID Team
*/
private String[] defaults = new String[3];
public CmdList() {
super();
this.aliases.addAll(Aliases.list);
this.aliases.add("list");
this.aliases.add("ls");
// default values in case user has old config
defaults[0] = "&e&m----------&r&e[ &2Faction List &9{pagenumber}&e/&9{pagecount} &e]&m----------";
@ -99,7 +96,6 @@ public class CmdList extends FCommand {
String header = FactionsPlugin.getInstance().getConfig().getString("list.header", defaults[0]);
assert header != null;
header = header.replace("{pagenumber}", String.valueOf(pagenumber)).replace("{pagecount}", String.valueOf(pagecount));
lines.add(FactionsPlugin.getInstance().txt.parse(header));

View File

@ -6,23 +6,19 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdLock extends FCommand {
/**
* @author FactionsUUID Team
*/
// TODO: This solution needs refactoring.
/*
factions.lock:
description: use the /f lock [on/off] command to temporarily lock the data files from being overwritten
default: op
*/
public CmdLock() {
super();
this.aliases.addAll(Aliases.lock);
this.aliases.add("lock");
this.optionalArgs.put("on/off", "flip");
this.requirements = new CommandRequirements.Builder(Permission.LOCK)
.noDisableOnLock()
.build();
}

View File

@ -5,13 +5,12 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdLogins extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdLogins() {
super();
this.aliases.addAll(Aliases.logins);
this.aliases.add("login");
this.aliases.add("logins");
this.aliases.add("logout");
this.aliases.add("logouts");
this.requirements = new CommandRequirements.Builder(Permission.MONITOR_LOGINS)
.playerOnly()

View File

@ -1,54 +0,0 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import java.text.DecimalFormat;
import java.util.Set;
/**
* @author Saser
*/
public class CmdLookup extends FCommand {
private DecimalFormat format = new DecimalFormat("#.#");
public CmdLookup() {
super();
this.aliases.addAll(Aliases.lookup);
this.requiredArgs.add("faction name");
this.requirements = new CommandRequirements.Builder(Permission.LOOKUP)
.playerOnly()
.build();
}
@Override
public void perform(CommandContext context) {
Faction faction = context.argAsFaction(0);
if (faction == null) {
context.msg(TL.COMMAND_LOOKUP_INVALID);
return;
}
if (faction.isNormal()) {
if (faction.getHome() != null) {
context.msg(TL.COMMAND_LOOKUP_FACTION_HOME, this.format.format(faction.getHome().getX()), this.format.format(faction.getHome().getY()), this.format.format(faction.getHome().getZ()));
}
Set<FLocation> locations = Board.getInstance().getAllClaims(faction);
context.msg(TL.COMMAND_LOOKUP_CLAIM_COUNT, locations.size(), faction.getTag());
for (FLocation flocation : locations) {
context.msg(TL.COMMAND_LOOKUP_CLAIM_LIST, flocation.getWorldName(), flocation.getX() * 16L, flocation.getZ() * 16L);
}
} else {
context.msg(TL.COMMAND_LOOKUP_ONLY_NORMAL);
}
}
@Override
public TL getUsageTranslation() {
return TL.COMMAND_LOOKUP_DESCRIPTION;
}
}

View File

@ -7,13 +7,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdLowPower extends FCommand {
/**
* @author Illyria Team
*/
public CmdLowPower() {
super();
this.aliases.addAll(Aliases.lowPower);
this.aliases.add("lowpower");
this.requirements = new CommandRequirements.Builder(Permission.POWER_ANY)
.playerOnly()

View File

@ -9,13 +9,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdMap extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdMap() {
super();
this.aliases.addAll(Aliases.map_map);
this.aliases.add("map");
this.optionalArgs.put("on/off", "once");
this.requirements = new CommandRequirements.Builder(Permission.MAP)

View File

@ -5,14 +5,11 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdMapHeight extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdMapHeight() {
super();
this.aliases.addAll(Aliases.map_height);
this.aliases.add("mapheight");
this.aliases.add("mh");
this.optionalArgs.put("height", "height");
this.requirements = new CommandRequirements.Builder(Permission.MAPHEIGHT)

View File

@ -3,8 +3,6 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.audit.FLogType;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL;
@ -13,13 +11,12 @@ import org.bukkit.ChatColor;
public class CmdMod extends FCommand {
/**
* @author FactionsUUID Team
*/
public CmdMod() {
super();
this.aliases.addAll(Aliases.mod);
this.aliases.add("mod");
this.aliases.add("setmod");
this.aliases.add("officer");
this.aliases.add("setofficer");
this.optionalArgs.put("player name", "name");
@ -50,10 +47,6 @@ public class CmdMod extends FCommand {
return;
}
if (you.isAlt()) {
return;
}
if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
context.msg(TL.COMMAND_MOD_NOTADMIN);
return;
@ -79,8 +72,6 @@ public class CmdMod extends FCommand {
you.setRole(Role.MODERATOR);
targetFaction.msg(TL.COMMAND_MOD_PROMOTED, you.describeTo(targetFaction, true));
context.msg(TL.COMMAND_MOD_PROMOTES, you.describeTo(context.fPlayer, true));
FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.LIGHT_PURPLE + "Mod");
}
}

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