From 9aeb70404d3386181fcad3d404e76beb8d93cea5 Mon Sep 17 00:00:00 2001 From: ProSavage Date: Mon, 22 Oct 2018 18:42:57 -0500 Subject: [PATCH] Renamed Main Class of plugin from 'P' to 'SavageFactions', along with the plugin field from 'p' to 'plugin' --- .gitignore | 2 +- README.md | 2 +- javadoc/allclasses-frame.html | 7 +- javadoc/allclasses-noframe.html | 7 +- javadoc/com/massivecraft/factions/Board.html | 4 +- .../massivecraft/factions/Conf.Backend.html | 4 +- javadoc/com/massivecraft/factions/Conf.html | 4 +- .../com/massivecraft/factions/FLocation.html | 4 +- .../com/massivecraft/factions/FPlayer.html | 8 +- .../com/massivecraft/factions/FPlayers.html | 4 +- .../com/massivecraft/factions/Faction.html | 4 +- .../com/massivecraft/factions/Factions.html | 4 +- .../massivecraft/factions/MassiveStats.html | 10 +- javadoc/com/massivecraft/factions/P.html | 23 +-- .../massivecraft/factions/cmd/CmdAHome.html | 21 ++- .../massivecraft/factions/cmd/CmdAdmin.html | 21 ++- .../factions/cmd/CmdAnnounce.html | 21 ++- .../factions/cmd/CmdAutoClaim.html | 21 ++- .../factions/cmd/CmdAutoHelp.html | 25 ++- .../com/massivecraft/factions/cmd/CmdBan.html | 21 ++- .../massivecraft/factions/cmd/CmdBanlist.html | 21 ++- .../massivecraft/factions/cmd/CmdBanner.html | 21 ++- .../massivecraft/factions/cmd/CmdBoom.html | 21 ++- .../massivecraft/factions/cmd/CmdBypass.html | 21 ++- .../massivecraft/factions/cmd/CmdChat.html | 21 ++- .../massivecraft/factions/cmd/CmdChatSpy.html | 21 ++- .../factions/cmd/CmdCheckpoint.html | 21 ++- .../massivecraft/factions/cmd/CmdChest.html | 21 ++- .../massivecraft/factions/cmd/CmdClaim.html | 21 ++- .../massivecraft/factions/cmd/CmdClaimAt.html | 21 ++- .../factions/cmd/CmdClaimLine.html | 21 ++- .../factions/cmd/CmdColeader.html | 21 ++- .../massivecraft/factions/cmd/CmdConfig.html | 21 ++- .../massivecraft/factions/cmd/CmdConvert.html | 21 ++- .../massivecraft/factions/cmd/CmdCoords.html | 21 ++- .../massivecraft/factions/cmd/CmdCreate.html | 21 ++- .../factions/cmd/CmdDeinvite.html | 21 ++- .../factions/cmd/CmdDelFWarp.html | 21 ++- .../massivecraft/factions/cmd/CmdDemote.html | 9 +- .../factions/cmd/CmdDescription.html | 21 ++- .../massivecraft/factions/cmd/CmdDisband.html | 21 ++- .../massivecraft/factions/cmd/CmdFWarp.html | 21 ++- .../com/massivecraft/factions/cmd/CmdFly.html | 21 ++- .../factions/cmd/CmdGetVault.html | 21 ++- .../massivecraft/factions/cmd/CmdHelp.html | 21 ++- .../massivecraft/factions/cmd/CmdHome.html | 21 ++- .../massivecraft/factions/cmd/CmdInspect.html | 21 ++- .../massivecraft/factions/cmd/CmdInvite.html | 21 ++- .../massivecraft/factions/cmd/CmdJoin.html | 21 ++- .../massivecraft/factions/cmd/CmdKick.html | 21 ++- .../factions/cmd/CmdKillHolograms.html | 21 ++- .../massivecraft/factions/cmd/CmdLeave.html | 21 ++- .../massivecraft/factions/cmd/CmdList.html | 21 ++- .../massivecraft/factions/cmd/CmdLock.html | 21 ++- .../massivecraft/factions/cmd/CmdLogins.html | 21 ++- .../factions/cmd/CmdLowPower.html | 21 ++- .../com/massivecraft/factions/cmd/CmdMap.html | 21 ++- .../factions/cmd/CmdMapHeight.html | 21 ++- .../com/massivecraft/factions/cmd/CmdMod.html | 21 ++- .../factions/cmd/CmdModifyPower.html | 21 ++- .../massivecraft/factions/cmd/CmdMoney.html | 21 ++- .../factions/cmd/CmdMoneyBalance.html | 21 ++- .../factions/cmd/CmdMoneyDeposit.html | 21 ++- .../factions/cmd/CmdMoneyTransferFf.html | 21 ++- .../factions/cmd/CmdMoneyTransferFp.html | 21 ++- .../factions/cmd/CmdMoneyTransferPf.html | 21 ++- .../factions/cmd/CmdMoneyWithdraw.html | 21 ++- .../massivecraft/factions/cmd/CmdNear.html | 21 ++- .../massivecraft/factions/cmd/CmdOpen.html | 21 ++- .../massivecraft/factions/cmd/CmdOwner.html | 21 ++- .../factions/cmd/CmdOwnerList.html | 21 ++- .../factions/cmd/CmdPeaceful.html | 21 ++- .../massivecraft/factions/cmd/CmdPerm.html | 21 ++- .../factions/cmd/CmdPermanent.html | 21 ++- .../factions/cmd/CmdPermanentPower.html | 21 ++- .../massivecraft/factions/cmd/CmdPower.html | 21 ++- .../factions/cmd/CmdPowerBoost.html | 21 ++- .../massivecraft/factions/cmd/CmdPromote.html | 9 +- .../factions/cmd/CmdRelationAlly.html | 9 +- .../factions/cmd/CmdRelationEnemy.html | 9 +- .../factions/cmd/CmdRelationNeutral.html | 9 +- .../factions/cmd/CmdRelationTruce.html | 9 +- .../massivecraft/factions/cmd/CmdReload.html | 21 ++- .../massivecraft/factions/cmd/CmdRules.html | 21 ++- .../com/massivecraft/factions/cmd/CmdSB.html | 21 ++- .../factions/cmd/CmdSafeunclaimall.html | 21 ++- .../massivecraft/factions/cmd/CmdSaveAll.html | 21 ++- .../factions/cmd/CmdSeeChunk.html | 21 ++- .../factions/cmd/CmdSetBanner.html | 21 ++- .../factions/cmd/CmdSetDefaultRole.html | 21 ++- .../factions/cmd/CmdSetFWarp.html | 21 ++- .../factions/cmd/CmdSetMaxVaults.html | 21 ++- .../massivecraft/factions/cmd/CmdSethome.html | 21 ++- .../massivecraft/factions/cmd/CmdShow.html | 21 ++- .../factions/cmd/CmdShowClaims.html | 21 ++- .../factions/cmd/CmdShowInvites.html | 21 ++- .../massivecraft/factions/cmd/CmdStatus.html | 21 ++- .../massivecraft/factions/cmd/CmdStealth.html | 21 ++- .../massivecraft/factions/cmd/CmdStuck.html | 21 ++- .../com/massivecraft/factions/cmd/CmdTag.html | 21 ++- .../massivecraft/factions/cmd/CmdTitle.html | 21 ++- .../com/massivecraft/factions/cmd/CmdTnt.html | 21 ++- .../massivecraft/factions/cmd/CmdTntFill.html | 21 ++- .../factions/cmd/CmdToggleAllianceChat.html | 21 ++- .../com/massivecraft/factions/cmd/CmdTop.html | 21 ++- .../factions/cmd/CmdTpBanner.html | 21 ++- .../massivecraft/factions/cmd/CmdUnban.html | 21 ++- .../massivecraft/factions/cmd/CmdUnclaim.html | 21 ++- .../factions/cmd/CmdUnclaimall.html | 21 ++- .../factions/cmd/CmdUpgrades.html | 21 ++- .../massivecraft/factions/cmd/CmdVault.html | 21 ++- .../massivecraft/factions/cmd/CmdVersion.html | 21 ++- .../factions/cmd/CmdWarunclaimall.html | 21 ++- .../massivecraft/factions/cmd/FCmdRoot.html | 21 ++- .../massivecraft/factions/cmd/FCommand.html | 33 +++- .../factions/cmd/FPromoteCommand.html | 21 ++- .../factions/cmd/FRelationCommand.html | 21 ++- .../factions/cmd/package-frame.html | 4 +- .../factions/cmd/package-summary.html | 4 +- .../factions/cmd/package-tree.html | 4 +- .../event/FPlayerEnteredFactionEvent.html | 4 +- .../FPlayerJoinEvent.PlayerJoinReason.html | 4 +- .../factions/event/FPlayerJoinEvent.html | 4 +- .../FPlayerLeaveEvent.PlayerLeaveReason.html | 4 +- .../factions/event/FPlayerLeaveEvent.html | 4 +- .../factions/event/FPlayerStoppedFlying.html | 4 +- .../factions/event/FactionCreateEvent.html | 4 +- .../factions/event/FactionDisbandEvent.html | 4 +- .../factions/event/FactionEvent.html | 4 +- .../factions/event/FactionPlayerEvent.html | 4 +- .../factions/event/FactionRelationEvent.html | 4 +- .../event/FactionRelationWishEvent.html | 4 +- .../factions/event/FactionRenameEvent.html | 4 +- .../factions/event/LandClaimEvent.html | 4 +- .../factions/event/LandUnclaimAllEvent.html | 4 +- .../factions/event/LandUnclaimEvent.html | 4 +- .../factions/event/PowerLossEvent.html | 4 +- .../factions/event/package-frame.html | 4 +- .../factions/event/package-summary.html | 4 +- .../factions/event/package-tree.html | 4 +- .../factions/iface/EconomyParticipator.html | 4 +- .../factions/iface/RelationParticipator.html | 4 +- .../factions/iface/package-frame.html | 4 +- .../factions/iface/package-summary.html | 4 +- .../factions/iface/package-tree.html | 4 +- .../factions/integration/Econ.html | 4 +- .../factions/integration/Essentials.html | 4 +- .../factions/integration/Worldguard.html | 4 +- .../integration/dynmap/DynmapStyle.html | 4 +- .../integration/dynmap/EngineDynmap.html | 4 +- .../integration/dynmap/TempAreaMarker.html | 4 +- .../integration/dynmap/TempMarker.html | 4 +- .../integration/dynmap/TempMarkerSet.html | 4 +- .../integration/dynmap/package-frame.html | 4 +- .../integration/dynmap/package-summary.html | 4 +- .../integration/dynmap/package-tree.html | 4 +- .../factions/integration/package-frame.html | 4 +- .../factions/integration/package-summary.html | 4 +- .../factions/integration/package-tree.html | 4 +- .../listeners/FactionsBlockListener.html | 46 +++--- .../listeners/FactionsChatListener.html | 28 ++-- .../listeners/FactionsEntityListener.html | 28 ++-- .../listeners/FactionsExploitListener.html | 4 +- .../listeners/FactionsPlayerListener.html | 14 +- .../factions/listeners/package-frame.html | 4 +- .../factions/listeners/package-summary.html | 4 +- .../factions/listeners/package-tree.html | 4 +- .../massivecraft/factions/package-frame.html | 7 +- .../factions/package-summary.html | 7 +- .../massivecraft/factions/package-tree.html | 8 +- .../scoreboards/BufferedObjective.html | 4 +- .../factions/scoreboards/FScoreboard.html | 4 +- .../scoreboards/FSidebarProvider.html | 4 +- .../factions/scoreboards/FTeamWrapper.html | 4 +- .../factions/scoreboards/package-frame.html | 4 +- .../factions/scoreboards/package-summary.html | 4 +- .../factions/scoreboards/package-tree.html | 4 +- .../scoreboards/sidebar/FDefaultSidebar.html | 4 +- .../scoreboards/sidebar/FInfoSidebar.html | 4 +- .../scoreboards/sidebar/package-frame.html | 4 +- .../scoreboards/sidebar/package-summary.html | 4 +- .../scoreboards/sidebar/package-tree.html | 4 +- .../massivecraft/factions/struct/BanInfo.html | 4 +- .../factions/struct/ChatMode.html | 4 +- .../factions/struct/Permission.html | 4 +- .../factions/struct/Relation.html | 4 +- .../massivecraft/factions/struct/Role.html | 19 ++- .../factions/struct/package-frame.html | 4 +- .../factions/struct/package-summary.html | 4 +- .../factions/struct/package-tree.html | 4 +- .../factions/util/AsciiCompass.Point.html | 4 +- .../factions/util/AsciiCompass.html | 4 +- .../factions/util/AutoLeaveProcessTask.html | 4 +- .../factions/util/AutoLeaveTask.html | 4 +- .../util/ClipPlaceholderAPIManager.html | 4 +- .../factions/util/EnumTypeAdapter.html | 4 +- .../factions/util/FactionGUI.html | 4 +- .../factions/util/InventoryTypeAdapter.html | 4 +- .../factions/util/InventoryUtil.html | 4 +- .../factions/util/LazyLocation.html | 4 +- .../util/MapFLocToStringSetTypeAdapter.html | 4 +- .../massivecraft/factions/util/MiscUtil.html | 4 +- .../factions/util/MultiversionMaterials.html | 4 +- .../factions/util/MyLocationTypeAdapter.html | 4 +- .../Particles/ParticleEffect.BlockData.html | 6 +- .../Particles/ParticleEffect.ItemData.html | 6 +- .../Particles/ParticleEffect.NoteColor.html | 6 +- .../ParticleEffect.OrdinaryColor.html | 6 +- .../ParticleEffect.ParticleColor.html | 6 +- .../ParticleEffect.ParticleData.html | 6 +- .../ParticleEffect.ParticlePacket.html | 23 ++- .../ParticleEffect.ParticleProperty.html | 6 +- .../util/Particles/ParticleEffect.html | 70 +++++++-- .../Particles/ReflectionUtils.DataType.html | 6 +- .../ReflectionUtils.PackageType.html | 6 +- .../util/Particles/ReflectionUtils.html | 20 ++- .../util/Particles/package-frame.html | 4 +- .../util/Particles/package-summary.html | 126 +++++++++++++-- .../factions/util/Particles/package-tree.html | 4 +- .../util/PermissionsMapTypeAdapter.html | 4 +- .../factions/util/RelationUtil.html | 4 +- .../factions/util/SpiralTask.html | 4 +- .../factions/util/VisualizeUtil.html | 4 +- .../factions/util/WarmUpUtil.Warmup.html | 4 +- .../factions/util/WarmUpUtil.html | 6 +- .../massivecraft/factions/util/WarpGUI.html | 4 +- .../factions/util/package-frame.html | 4 +- .../factions/util/package-summary.html | 4 +- .../factions/util/package-tree.html | 4 +- .../factions/zcore/CommandVisibility.html | 4 +- .../massivecraft/factions/zcore/MCommand.html | 4 +- .../massivecraft/factions/zcore/MPlugin.html | 7 +- .../zcore/MPluginSecretPlayerListener.html | 4 +- .../factions/zcore/fperms/Access.html | 4 +- .../factions/zcore/fperms/Permissable.html | 4 +- .../zcore/fperms/PermissableAction.html | 4 +- .../gui/PermissableActionGUI.SpecialItem.html | 4 +- .../fperms/gui/PermissableActionGUI.html | 4 +- .../fperms/gui/PermissableRelationGUI.html | 4 +- .../zcore/fperms/gui/package-frame.html | 4 +- .../zcore/fperms/gui/package-summary.html | 4 +- .../zcore/fperms/gui/package-tree.html | 4 +- .../factions/zcore/fperms/package-frame.html | 4 +- .../zcore/fperms/package-summary.html | 4 +- .../factions/zcore/fperms/package-tree.html | 4 +- .../zcore/fupgrades/CropUpgrades.html | 4 +- .../factions/zcore/fupgrades/EXPUpgrade.html | 4 +- .../zcore/fupgrades/FUpgradesGUI.html | 4 +- .../zcore/fupgrades/SpawnerUpgrades.html | 4 +- .../zcore/fupgrades/package-frame.html | 4 +- .../zcore/fupgrades/package-summary.html | 4 +- .../zcore/fupgrades/package-tree.html | 4 +- .../factions/zcore/nbtapi/NBTCompound.html | 4 +- .../factions/zcore/nbtapi/NBTContainer.html | 4 +- .../factions/zcore/nbtapi/NBTEntity.html | 4 +- .../factions/zcore/nbtapi/NBTFile.html | 4 +- .../factions/zcore/nbtapi/NBTItem.html | 4 +- .../factions/zcore/nbtapi/NBTList.html | 4 +- .../zcore/nbtapi/NBTListCompound.html | 4 +- .../zcore/nbtapi/NBTReflectionUtil.html | 4 +- .../factions/zcore/nbtapi/NBTTileEntity.html | 4 +- .../factions/zcore/nbtapi/NBTType.html | 4 +- .../factions/zcore/nbtapi/package-frame.html | 4 +- .../zcore/nbtapi/package-summary.html | 4 +- .../factions/zcore/nbtapi/package-tree.html | 4 +- .../zcore/nbtapi/utils/GsonWrapper.html | 4 +- .../zcore/nbtapi/utils/MethodNames.html | 4 +- .../zcore/nbtapi/utils/MinecraftVersion.html | 4 +- .../zcore/nbtapi/utils/package-frame.html | 4 +- .../zcore/nbtapi/utils/package-summary.html | 4 +- .../zcore/nbtapi/utils/package-tree.html | 4 +- .../factions/zcore/package-frame.html | 4 +- .../factions/zcore/package-summary.html | 4 +- .../factions/zcore/package-tree.html | 4 +- .../persist/MemoryBoard.MemoryBoardMap.html | 4 +- .../factions/zcore/persist/MemoryBoard.html | 4 +- .../factions/zcore/persist/MemoryFPlayer.html | 8 +- .../zcore/persist/MemoryFPlayers.html | 4 +- .../factions/zcore/persist/MemoryFaction.html | 4 +- .../zcore/persist/MemoryFactions.html | 4 +- .../factions/zcore/persist/SaveTask.html | 4 +- .../zcore/persist/json/FactionsJSON.html | 4 +- .../zcore/persist/json/JSONBoard.html | 4 +- .../zcore/persist/json/JSONFPlayer.html | 4 +- .../zcore/persist/json/JSONFPlayers.html | 4 +- .../zcore/persist/json/JSONFaction.html | 4 +- .../zcore/persist/json/JSONFactions.html | 4 +- .../zcore/persist/json/package-frame.html | 4 +- .../zcore/persist/json/package-summary.html | 4 +- .../zcore/persist/json/package-tree.html | 4 +- .../factions/zcore/persist/package-frame.html | 4 +- .../zcore/persist/package-summary.html | 4 +- .../factions/zcore/persist/package-tree.html | 4 +- .../factions/zcore/util/DiscUtil.html | 4 +- .../factions/zcore/util/PermUtil.html | 4 +- .../factions/zcore/util/Persist.html | 4 +- .../factions/zcore/util/SmokeUtil.html | 4 +- .../massivecraft/factions/zcore/util/TL.html | 22 +-- .../zcore/util/TagReplacer.TagType.html | 4 +- .../factions/zcore/util/TagReplacer.html | 4 +- .../factions/zcore/util/TagUtil.html | 4 +- .../factions/zcore/util/TextUtil.html | 4 +- .../factions/zcore/util/UUIDFetcher.html | 4 +- .../factions/zcore/util/package-frame.html | 4 +- .../factions/zcore/util/package-summary.html | 4 +- .../factions/zcore/util/package-tree.html | 4 +- javadoc/constant-values.html | 4 +- javadoc/deprecated-list.html | 4 +- javadoc/help-doc.html | 4 +- javadoc/index-files/index-1.html | 4 +- javadoc/index-files/index-10.html | 4 +- javadoc/index-files/index-11.html | 4 +- javadoc/index-files/index-12.html | 9 +- javadoc/index-files/index-13.html | 24 ++- javadoc/index-files/index-14.html | 9 +- javadoc/index-files/index-15.html | 20 ++- javadoc/index-files/index-16.html | 143 ++++++++++++++---- javadoc/index-files/index-17.html | 39 ++++- javadoc/index-files/index-18.html | 73 +++++++-- javadoc/index-files/index-19.html | 14 +- javadoc/index-files/index-2.html | 14 +- javadoc/index-files/index-20.html | 9 +- javadoc/index-files/index-21.html | 4 +- javadoc/index-files/index-22.html | 14 +- javadoc/index-files/index-23.html | 4 +- javadoc/index-files/index-24.html | 4 +- javadoc/index-files/index-25.html | 4 +- javadoc/index-files/index-3.html | 53 +++++-- javadoc/index-files/index-4.html | 25 ++- javadoc/index-files/index-5.html | 9 +- javadoc/index-files/index-6.html | 48 ++++-- javadoc/index-files/index-7.html | 60 ++++++-- javadoc/index-files/index-8.html | 21 ++- javadoc/index-files/index-9.html | 52 +++++-- javadoc/index.html | 2 +- javadoc/overview-frame.html | 4 +- javadoc/overview-summary.html | 4 +- javadoc/overview-tree.html | 8 +- javadoc/serialized-form.html | 4 +- .../java/com/massivecraft/factions/Conf.java | 45 +++--- .../com/massivecraft/factions/FPlayer.java | 4 +- .../factions/{P.java => SavageFactions.java} | 42 +++-- .../factions/cmd/CmdAutoHelp.java | 6 +- .../com/massivecraft/factions/cmd/CmdBan.java | 4 +- .../massivecraft/factions/cmd/CmdBanner.java | 21 ++- .../massivecraft/factions/cmd/CmdBypass.java | 6 +- .../massivecraft/factions/cmd/CmdChat.java | 2 +- .../massivecraft/factions/cmd/CmdChatSpy.java | 6 +- .../factions/cmd/CmdCheckpoint.java | 2 +- .../massivecraft/factions/cmd/CmdChest.java | 4 +- .../massivecraft/factions/cmd/CmdConfig.java | 8 +- .../massivecraft/factions/cmd/CmdCreate.java | 4 +- .../factions/cmd/CmdDelFWarp.java | 4 +- .../massivecraft/factions/cmd/CmdDisband.java | 4 +- .../massivecraft/factions/cmd/CmdFWarp.java | 4 +- .../com/massivecraft/factions/cmd/CmdFly.java | 16 +- .../factions/cmd/CmdGetVault.java | 8 +- .../massivecraft/factions/cmd/CmdHelp.java | 12 +- .../massivecraft/factions/cmd/CmdJoin.java | 4 +- .../massivecraft/factions/cmd/CmdKick.java | 4 +- .../massivecraft/factions/cmd/CmdList.java | 4 +- .../massivecraft/factions/cmd/CmdMoney.java | 4 +- .../factions/cmd/CmdMoneyDeposit.java | 4 +- .../factions/cmd/CmdMoneyTransferFf.java | 4 +- .../factions/cmd/CmdMoneyTransferFp.java | 4 +- .../factions/cmd/CmdMoneyTransferPf.java | 4 +- .../factions/cmd/CmdMoneyWithdraw.java | 4 +- .../massivecraft/factions/cmd/CmdNear.java | 6 +- .../factions/cmd/CmdPaypalSee.java | 5 +- .../factions/cmd/CmdPaypalSet.java | 4 +- .../massivecraft/factions/cmd/CmdPerm.java | 4 +- .../factions/cmd/CmdPermanent.java | 4 +- .../factions/cmd/CmdPowerBoost.java | 8 +- .../massivecraft/factions/cmd/CmdReload.java | 10 +- .../massivecraft/factions/cmd/CmdRules.java | 10 +- .../factions/cmd/CmdSafeunclaimall.java | 4 +- .../factions/cmd/CmdSeeChunk.java | 12 +- .../factions/cmd/CmdSetFWarp.java | 6 +- .../massivecraft/factions/cmd/CmdShow.java | 6 +- .../massivecraft/factions/cmd/CmdStealth.java | 3 - .../massivecraft/factions/cmd/CmdStuck.java | 30 ++-- .../com/massivecraft/factions/cmd/CmdTnt.java | 8 +- .../massivecraft/factions/cmd/CmdTntFill.java | 12 +- .../factions/cmd/CmdTpBanner.java | 6 +- .../massivecraft/factions/cmd/CmdUnclaim.java | 8 +- .../factions/cmd/CmdUnclaimall.java | 4 +- .../factions/cmd/CmdUpgrades.java | 4 +- .../massivecraft/factions/cmd/CmdVault.java | 4 +- .../massivecraft/factions/cmd/CmdVersion.java | 4 +- .../factions/cmd/CmdWarunclaimall.java | 4 +- .../massivecraft/factions/cmd/FCmdRoot.java | 16 +- .../massivecraft/factions/cmd/FCommand.java | 8 +- .../factions/cmd/FRelationCommand.java | 6 +- .../factions/integration/Econ.java | 14 +- .../factions/integration/Worldguard.java | 6 +- .../integration/dynmap/EngineDynmap.java | 2 +- .../listeners/FactionsBlockListener.java | 18 +-- .../listeners/FactionsChatListener.java | 14 +- .../listeners/FactionsEntityListener.java | 14 +- .../listeners/FactionsExploitListener.java | 8 +- .../listeners/FactionsPlayerListener.java | 92 +++++------ .../factions/scoreboards/FScoreboard.java | 6 +- .../scoreboards/FSidebarProvider.java | 4 +- .../factions/scoreboards/FTeamWrapper.java | 12 +- .../scoreboards/sidebar/FDefaultSidebar.java | 8 +- .../scoreboards/sidebar/FInfoSidebar.java | 4 +- .../factions/struct/Permission.java | 4 +- .../factions/struct/Relation.java | 4 +- .../massivecraft/factions/struct/Role.java | 6 +- .../factions/util/AutoLeaveProcessTask.java | 4 +- .../factions/util/AutoLeaveTask.java | 6 +- .../util/ClipPlaceholderAPIManager.java | 6 +- .../util/MapFLocToStringSetTypeAdapter.java | 6 +- .../massivecraft/factions/util/MiscUtil.java | 12 +- .../factions/util/MyLocationTypeAdapter.java | 6 +- .../util/Particles/ParticleEffect.java | 42 ++--- .../util/Particles/ReflectionUtils.java | 20 +-- .../util/PermissionsMapTypeAdapter.java | 4 +- .../factions/util/SpiralTask.java | 8 +- .../factions/util/WarmUpUtil.java | 8 +- .../massivecraft/factions/util/WarpGUI.java | 42 ++--- .../massivecraft/factions/zcore/MCommand.java | 6 +- .../massivecraft/factions/zcore/MPlugin.java | 4 +- .../zcore/MPluginSecretPlayerListener.java | 2 +- .../zcore/fperms/PermissableAction.java | 16 +- .../fperms/gui/PermissableActionGUI.java | 48 +++--- .../fperms/gui/PermissableRelationGUI.java | 36 ++--- .../zcore/fupgrades/CropUpgrades.java | 14 +- .../factions/zcore/fupgrades/EXPUpgrade.java | 6 +- .../zcore/fupgrades/FUpgradesGUI.java | 118 +++++++-------- .../zcore/fupgrades/SpawnerUpgrades.java | 6 +- .../factions/zcore/persist/MemoryBoard.java | 18 +-- .../factions/zcore/persist/MemoryFPlayer.java | 88 +++++------ .../zcore/persist/MemoryFPlayers.java | 4 +- .../factions/zcore/persist/MemoryFaction.java | 26 ++-- .../zcore/persist/json/FactionsJSON.java | 4 +- .../zcore/persist/json/JSONBoard.java | 16 +- .../zcore/persist/json/JSONFPlayers.java | 16 +- .../zcore/persist/json/JSONFactions.java | 8 +- .../factions/zcore/util/DiscUtil.java | 19 +-- .../factions/zcore/util/PermUtil.java | 2 +- .../massivecraft/factions/zcore/util/TL.java | 14 +- .../factions/zcore/util/TagReplacer.java | 22 +-- .../factions/zcore/util/TagUtil.java | 22 +-- .../factions/zcore/util/TextUtil.java | 2 +- src/main/resources/config.yml | 4 +- src/main/resources/lang/en_US.yml | 16 +- src/main/resources/lang/ja_JP.yml | 8 +- src/main/resources/plugin.yml | 2 +- 449 files changed, 3527 insertions(+), 1875 deletions(-) rename src/main/java/com/massivecraft/factions/{P.java => SavageFactions.java} (92%) diff --git a/.gitignore b/.gitignore index 7c1258f1..98b6090d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ /target # vim -.*.sw[a-p] +.*.sw[a-savageFactions] # various other potential build files /build diff --git a/README.md b/README.md index a934ced8..f6907dc9 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,5 @@ A default config file will be created on the first run. License ---------- This project has a LGPL license just like the Bukkit project.
-This project uses [GSON](http://code.google.com/p/google-gson/) which has a [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0 ). +This project uses [GSON](http://code.google.com/savageFactions/google-gson/) which has a [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0 ). diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html index 2e87376b..b3e724c6 100644 --- a/javadoc/allclasses-frame.html +++ b/javadoc/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -208,7 +208,6 @@
  • NBTReflectionUtil
  • NBTTileEntity
  • NBTType
    • -
  • P
  • ParticleEffect
  • ParticleEffect.BlockData
  • ParticleEffect.ItemData
    • @@ -235,6 +234,8 @@
  • RelationParticipator
  • RelationUtil
  • Role
    • +
  • SavageFactions
  • SaveTask
  • SmokeUtil
  • SpawnerUpgrades
    • diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html index 08b04f25..28097538 100644 --- a/javadoc/allclasses-noframe.html +++ b/javadoc/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -208,7 +208,6 @@
  • NBTReflectionUtil
  • NBTTileEntity
  • NBTType
    • -
  • P
  • ParticleEffect
  • ParticleEffect.BlockData
  • ParticleEffect.ItemData
    • @@ -235,6 +234,8 @@
  • RelationParticipator
  • RelationUtil
  • Role
    • +
  • SavageFactions +
  • SaveTask
  • SmokeUtil
  • SpawnerUpgrades
    • diff --git a/javadoc/com/massivecraft/factions/Board.html b/javadoc/com/massivecraft/factions/Board.html index 82136d5c..061ab827 100644 --- a/javadoc/com/massivecraft/factions/Board.html +++ b/javadoc/com/massivecraft/factions/Board.html @@ -2,9 +2,9 @@ - + Board - + diff --git a/javadoc/com/massivecraft/factions/Conf.Backend.html b/javadoc/com/massivecraft/factions/Conf.Backend.html index 43b05148..cceaf18d 100644 --- a/javadoc/com/massivecraft/factions/Conf.Backend.html +++ b/javadoc/com/massivecraft/factions/Conf.Backend.html @@ -2,9 +2,9 @@ - + Conf.Backend - + diff --git a/javadoc/com/massivecraft/factions/Conf.html b/javadoc/com/massivecraft/factions/Conf.html index 662a6073..98560090 100644 --- a/javadoc/com/massivecraft/factions/Conf.html +++ b/javadoc/com/massivecraft/factions/Conf.html @@ -2,9 +2,9 @@ - + Conf - + diff --git a/javadoc/com/massivecraft/factions/FLocation.html b/javadoc/com/massivecraft/factions/FLocation.html index 6fbbe447..0036630d 100644 --- a/javadoc/com/massivecraft/factions/FLocation.html +++ b/javadoc/com/massivecraft/factions/FLocation.html @@ -2,9 +2,9 @@ - + FLocation - + diff --git a/javadoc/com/massivecraft/factions/FPlayer.html b/javadoc/com/massivecraft/factions/FPlayer.html index 7a3c743a..b38192ba 100644 --- a/javadoc/com/massivecraft/factions/FPlayer.html +++ b/javadoc/com/massivecraft/factions/FPlayer.html @@ -2,9 +2,9 @@ - + FPlayer - + @@ -113,9 +113,9 @@ extends Logged in players always have exactly one FPlayer instance. Logged out players may or may not have an FPlayer instance. They will always have one if they are part of a faction. This is because only players with a faction are saved to disk (in order to not waste disk space). -

    + The FPlayer is linked to a minecraft player using the player name. -

    + The same instance is always returned for the same player. This means you can use the == operator. No .equals method necessary. diff --git a/javadoc/com/massivecraft/factions/FPlayers.html b/javadoc/com/massivecraft/factions/FPlayers.html index ce86a2be..79b5f08e 100644 --- a/javadoc/com/massivecraft/factions/FPlayers.html +++ b/javadoc/com/massivecraft/factions/FPlayers.html @@ -2,9 +2,9 @@ - + FPlayers - + diff --git a/javadoc/com/massivecraft/factions/Faction.html b/javadoc/com/massivecraft/factions/Faction.html index d6d643b9..26a754fb 100644 --- a/javadoc/com/massivecraft/factions/Faction.html +++ b/javadoc/com/massivecraft/factions/Faction.html @@ -2,9 +2,9 @@ - + Faction - + diff --git a/javadoc/com/massivecraft/factions/Factions.html b/javadoc/com/massivecraft/factions/Factions.html index 08202575..2b0fee61 100644 --- a/javadoc/com/massivecraft/factions/Factions.html +++ b/javadoc/com/massivecraft/factions/Factions.html @@ -2,9 +2,9 @@ - + Factions - + diff --git a/javadoc/com/massivecraft/factions/MassiveStats.html b/javadoc/com/massivecraft/factions/MassiveStats.html index f6da0a99..9ea4e531 100644 --- a/javadoc/com/massivecraft/factions/MassiveStats.html +++ b/javadoc/com/massivecraft/factions/MassiveStats.html @@ -2,9 +2,9 @@ - + MassiveStats - + @@ -49,7 +49,8 @@ var activeTableTab = "activeTableTab";

    @@ -899,7 +904,7 @@ extends

  • playSound

    -
    public void playSound(org.bukkit.entity.Player p,
+    
    public void playSound(org.bukkit.entity.Player savageFactions,
                       java.lang.String sound)
    • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdAHome.html b/javadoc/com/massivecraft/factions/cmd/CmdAHome.html index 86d1aa00..cfb30ade 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdAHome.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdAHome.html @@ -2,9 +2,9 @@ - + CmdAHome - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdAdmin.html b/javadoc/com/massivecraft/factions/cmd/CmdAdmin.html index 08667a5a..41d3301f 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdAdmin.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdAdmin.html @@ -2,9 +2,9 @@ - + CmdAdmin - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdAnnounce.html b/javadoc/com/massivecraft/factions/cmd/CmdAnnounce.html index 9d5ad415..c24f08cc 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdAnnounce.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdAnnounce.html @@ -2,9 +2,9 @@ - + CmdAnnounce - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html b/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html index c9ad3f42..d8dd78a0 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html @@ -2,9 +2,9 @@ - + CmdAutoClaim - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdAutoHelp.html b/javadoc/com/massivecraft/factions/cmd/CmdAutoHelp.html index 6afa0514..0bc8304c 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdAutoHelp.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdAutoHelp.html @@ -2,9 +2,9 @@ - + CmdAutoHelp - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
    • @@ -228,7 +233,11 @@ extends public void perform()
    Specified by:
    -
    perform in class MCommand<P>
    +
    perform in + class MCommand<SavageFactions>
    @@ -241,7 +250,11 @@ extends public TL getUsageTranslation()
    Specified by:
    -
    getUsageTranslation in class MCommand<P>
    +
    getUsageTranslation in + class MCommand<SavageFactions>
    diff --git a/javadoc/com/massivecraft/factions/cmd/CmdBan.html b/javadoc/com/massivecraft/factions/cmd/CmdBan.html index 12fc8b97..f03e26d0 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdBan.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdBan.html @@ -2,9 +2,9 @@ - + CmdBan - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdBanlist.html b/javadoc/com/massivecraft/factions/cmd/CmdBanlist.html index c299caee..2836fcdc 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdBanlist.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdBanlist.html @@ -2,9 +2,9 @@ - + CmdBanlist - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdBanner.html b/javadoc/com/massivecraft/factions/cmd/CmdBanner.html index ef2662ca..6b564645 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdBanner.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdBanner.html @@ -2,9 +2,9 @@ - + CmdBanner - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdBoom.html b/javadoc/com/massivecraft/factions/cmd/CmdBoom.html index 23b5a054..f09e9510 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdBoom.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdBoom.html @@ -2,9 +2,9 @@ - + CmdBoom - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdBypass.html b/javadoc/com/massivecraft/factions/cmd/CmdBypass.html index b71d7f9d..058a64dd 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdBypass.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdBypass.html @@ -2,9 +2,9 @@ - + CmdBypass - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdChat.html b/javadoc/com/massivecraft/factions/cmd/CmdChat.html index 2413512e..180b6f71 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdChat.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdChat.html @@ -2,9 +2,9 @@ - + CmdChat - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdChatSpy.html b/javadoc/com/massivecraft/factions/cmd/CmdChatSpy.html index 4e1117a3..473ee928 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdChatSpy.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdChatSpy.html @@ -2,9 +2,9 @@ - + CmdChatSpy - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdCheckpoint.html b/javadoc/com/massivecraft/factions/cmd/CmdCheckpoint.html index ab2ee22e..b0e5d49f 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdCheckpoint.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdCheckpoint.html @@ -2,9 +2,9 @@ - + CmdCheckpoint - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdChest.html b/javadoc/com/massivecraft/factions/cmd/CmdChest.html index 62ab90f9..ad4fa0c6 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdChest.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdChest.html @@ -2,9 +2,9 @@ - + CmdChest - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdClaim.html b/javadoc/com/massivecraft/factions/cmd/CmdClaim.html index 59a7ef26..cc4786c4 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdClaim.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdClaim.html @@ -2,9 +2,9 @@ - + CmdClaim - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html b/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html index 93d54578..e777ef0f 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html @@ -2,9 +2,9 @@ - + CmdClaimAt - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html b/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html index 891a1d6f..7c3b768a 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html @@ -2,9 +2,9 @@ - + CmdClaimLine - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdColeader.html b/javadoc/com/massivecraft/factions/cmd/CmdColeader.html index 700dc919..b7bb366f 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdColeader.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdColeader.html @@ -2,9 +2,9 @@ - + CmdColeader - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdConfig.html b/javadoc/com/massivecraft/factions/cmd/CmdConfig.html index f1f2d0bd..243158a1 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdConfig.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdConfig.html @@ -2,9 +2,9 @@ - + CmdConfig - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdConvert.html b/javadoc/com/massivecraft/factions/cmd/CmdConvert.html index 4d9ce212..fcb11a74 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdConvert.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdConvert.html @@ -2,9 +2,9 @@ - + CmdConvert - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdCoords.html b/javadoc/com/massivecraft/factions/cmd/CmdCoords.html index f430b53d..8703ebf3 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdCoords.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdCoords.html @@ -2,9 +2,9 @@ - + CmdCoords - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdCreate.html b/javadoc/com/massivecraft/factions/cmd/CmdCreate.html index 15313195..8a551f87 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdCreate.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdCreate.html @@ -2,9 +2,9 @@ - + CmdCreate - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdDeinvite.html b/javadoc/com/massivecraft/factions/cmd/CmdDeinvite.html index 491af3b8..e2e46227 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdDeinvite.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdDeinvite.html @@ -2,9 +2,9 @@ - + CmdDeinvite - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdDelFWarp.html b/javadoc/com/massivecraft/factions/cmd/CmdDelFWarp.html index 99e62cc5..6914fc6e 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdDelFWarp.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdDelFWarp.html @@ -2,9 +2,9 @@ - + CmdDelFWarp - + @@ -99,7 +99,10 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/javadoc/com/massivecraft/factions/cmd/CmdDemote.html b/javadoc/com/massivecraft/factions/cmd/CmdDemote.html index 62046077..7ae122ee 100644 --- a/javadoc/com/massivecraft/factions/cmd/CmdDemote.html +++ b/javadoc/com/massivecraft/factions/cmd/CmdDemote.html @@ -2,9 +2,9 @@ - + CmdDemote - + @@ -93,7 +93,10 @@
  • java.lang.Object