EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename P --> Factions.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-09 13:00:09 +02:00
parent 8a4b26cbd9
commit c88847bd3e
54 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/massivecraft/factions/integration/Econ.java
View File

@ -11,7 +11,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.struct.FPerm;
import com.massivecraft.factions.util.RelationUtil;
@ -32,22 +32,22 @@ public class Econ
if (Bukkit.getServer().getPluginManager().getPlugin("Vault") == null)
{
P.p.log(integrationFail+"is not installed.");
Factions.p.log(integrationFail+"is not installed.");
return;
}
RegisteredServiceProvider<Economy> rsp = Bukkit.getServer().getServicesManager().getRegistration(Economy.class);
if (rsp == null)
{
P.p.log(integrationFail+"is not hooked into an economy plugin.");
Factions.p.log(integrationFail+"is not hooked into an economy plugin.");
return;
}
econ = rsp.getProvider();
P.p.log("Economy integration through Vault plugin successful.");
Factions.p.log("Economy integration through Vault plugin successful.");
if ( ! Conf.econEnabled)
P.p.log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true");
Factions.p.log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true");
oldMoneyDoTransfer();
}
@ -78,7 +78,7 @@ public class Econ
{
if (!shouldBeUsed())
{
P.p.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
Factions.p.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
return;
}
to.msg("<a>%s's<i> balance is <h>%s<i>.", about.describeTo(to, true), Econ.moneyString(econ.getBalance(about.getAccountId())));

6
src/com/massivecraft/factions/integration/EssentialsFeatures.java
View File

@ -10,7 +10,7 @@ import org.bukkit.Location;
import org.bukkit.plugin.Plugin;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.listeners.FactionsChatListener;
import com.earth2me.essentials.IEssentials;
@ -104,8 +104,8 @@ public class EssentialsFeatures
essChat = instance;
try
{
Bukkit.getServer().getPluginManager().registerEvents(new LocalChatListener(), P.p);
P.p.log("Found and will integrate chat with newer "+essChat.getDescription().getFullName());
Bukkit.getServer().getPluginManager().registerEvents(new LocalChatListener(), Factions.p);
Factions.p.log("Found and will integrate chat with newer "+essChat.getDescription().getFullName());
}
catch (NoSuchMethodError ex)
{

6
src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.integration;
import org.bukkit.entity.Player;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.listeners.FactionsChatListener;
import com.earth2me.essentials.chat.EssentialsChat;
@ -27,7 +27,7 @@ public class EssentialsOldVersionFeatures
{
public boolean shouldHandleThisChat(AsyncPlayerChatEvent event)
{
return P.p.shouldLetFactionsHandleThisChat(event);
return Factions.p.shouldLetFactionsHandleThisChat(event);
}
public String modifyMessage(AsyncPlayerChatEvent event, Player target, String message)
{
@ -35,7 +35,7 @@ public class EssentialsOldVersionFeatures
//return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer()));
}
});
P.p.log("Found and will integrate chat with "+essChat.getDescription().getFullName());
Factions.p.log("Found and will integrate chat with "+essChat.getDescription().getFullName());
}
catch (NoSuchMethodError ex)
{

4
src/com/massivecraft/factions/integration/LWCFeatures.java
View File

@ -17,7 +17,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
public class LWCFeatures
{
@ -29,7 +29,7 @@ public class LWCFeatures
if(test == null || !test.isEnabled()) return;
lwc = ((LWCPlugin)test).getLWC();
P.p.log("Successfully hooked into LWC!"+(Conf.lwcIntegration ? "" : " Integration is currently disabled, though (\"lwcIntegration\")."));
Factions.p.log("Successfully hooked into LWC!"+(Conf.lwcIntegration ? "" : " Integration is currently disabled, though (\"lwcIntegration\")."));
}
public static boolean getEnabled()

10
src/com/massivecraft/factions/integration/SpoutFeatures.java
View File

@ -9,7 +9,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -50,9 +50,9 @@ public class SpoutFeatures
if (enabled == true) return true;
enabled = true;
P.p.log("Found and will use features of "+plugin.getDescription().getFullName());
Factions.p.log("Found and will use features of "+plugin.getDescription().getFullName());
mainListener = new SpoutMainListener();
Bukkit.getPluginManager().registerEvents(mainListener, P.p);
Bukkit.getPluginManager().registerEvents(mainListener, Factions.p);
return true;
}
@ -112,7 +112,7 @@ public class SpoutFeatures
public static void updateCapeShortly(final Object ofrom, final Object oto)
{
P.p.getServer().getScheduler().scheduleSyncDelayedTask(P.p, new Runnable()
Factions.p.getServer().getScheduler().scheduleSyncDelayedTask(Factions.p, new Runnable()
{
@Override
public void run()
@ -168,7 +168,7 @@ public class SpoutFeatures
public static void updateTitleShortly(final Object ofrom, final Object oto)
{
P.p.getServer().getScheduler().scheduleSyncDelayedTask(P.p, new Runnable()
Factions.p.getServer().getScheduler().scheduleSyncDelayedTask(Factions.p, new Runnable()
{
@Override
public void run()

8
src/com/massivecraft/factions/integration/SpoutMainListener.java
View File

@ -14,7 +14,7 @@ import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.TerritoryAccess;
import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
@ -107,7 +107,7 @@ public class SpoutMainListener implements Listener
label.setWidth(1).setHeight(1); // prevent Spout's questionable new "no default size" warning
label.setScale(Conf.spoutTerritoryDisplaySize);
sPlayer.getMainScreen().attachWidget(P.p, label);
sPlayer.getMainScreen().attachWidget(Factions.p, label);
territoryLabels.put(player.getName(), label);
}
@ -135,7 +135,7 @@ public class SpoutMainListener implements Listener
label.setWidth(1).setHeight(1); // prevent Spout's questionable new "no default size" warning
label.setScale(Conf.spoutTerritoryNoticeSize);
label.setY(Conf.spoutTerritoryNoticeTop);
sPlayer.getMainScreen().attachWidget(P.p, label);
sPlayer.getMainScreen().attachWidget(Factions.p, label);
territoryChangeLabels.put(player.getName(), label);
}
@ -172,7 +172,7 @@ public class SpoutMainListener implements Listener
label.setWidth(1).setHeight(1); // prevent Spout's questionable new "no default size" warning
label.setScale(Conf.spoutTerritoryDisplaySize);
label.setY((int)(10 * Conf.spoutTerritoryDisplaySize));
sPlayer.getMainScreen().attachWidget(P.p, label);
sPlayer.getMainScreen().attachWidget(Factions.p, label);
accessLabels.put(player.getName(), label);
}

6
src/com/massivecraft/factions/integration/Worldguard.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.integration;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -39,13 +39,13 @@ public class Worldguard
{
enabled = false;
wg = null;
P.p.log("Could not hook to WorldGuard. WorldGuard checks are disabled.");
Factions.p.log("Could not hook to WorldGuard. WorldGuard checks are disabled.");
}
else
{
wg = (WorldGuardPlugin) wgplug;
enabled = true;
P.p.log("Successfully hooked to WorldGuard.");
Factions.p.log("Successfully hooked to WorldGuard.");
}
}

6
src/com/massivecraft/factions/integration/capi/CapiFeatures.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.integration.capi;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
public class CapiFeatures
{
@ -12,8 +12,8 @@ public class CapiFeatures
Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("capi");
if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.P"))
{
P.p.log("Integration with the CAPI plugin was successful");
Bukkit.getPluginManager().registerEvents(new PluginCapiListener(P.p), P.p);
Factions.p.log("Integration with the CAPI plugin was successful");
Bukkit.getPluginManager().registerEvents(new PluginCapiListener(Factions.p), Factions.p);
}
}
}

6
src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
View File

@ -18,16 +18,16 @@ import com.massivecraft.capi.events.CAPISelectChannelEvent;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Rel;
public class PluginCapiListener implements Listener
{
P p;
Factions p;
Set<String> myChannelIds = new LinkedHashSet<String>();
public PluginCapiListener(P p)
public PluginCapiListener(Factions p)
{
this.p = p;

6
src/com/massivecraft/factions/integration/herochat/HerochatFeatures.java
View File

@ -4,7 +4,7 @@ import org.bukkit.Bukkit;
import org.bukkit.event.Listener;
import org.bukkit.plugin.Plugin;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
public class HerochatFeatures implements Listener
{
@ -13,7 +13,7 @@ public class HerochatFeatures implements Listener
Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("Herochat");
if (plug == null) return;
if (!plug.getClass().getName().equals("com.dthielke.herochat.Herochat")) return;
Bukkit.getPluginManager().registerEvents(new HerochatListener(P.p), P.p);
P.p.log("Integration with Herochat successful");
Bukkit.getPluginManager().registerEvents(new HerochatListener(Factions.p), Factions.p);
Factions.p.log("Integration with Herochat successful");
}
}

6
src/com/massivecraft/factions/integration/herochat/HerochatListener.java
View File

@ -10,13 +10,13 @@ import com.dthielke.herochat.Herochat;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.listeners.FactionsChatListener;
public class HerochatListener implements Listener
{
P p;
public HerochatListener(P p)
Factions p;
public HerochatListener(Factions p)
{
this.p = p;
Herochat.getChannelManager().addChannel(new FactionChannel());