Added forgotten type adapters.
This commit is contained in:
parent
1d44aa0c9c
commit
80d132af70
@ -1,7 +1,9 @@
|
|||||||
package com.massivecraft.factions;
|
package com.massivecraft.factions;
|
||||||
|
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
|
import java.lang.reflect.Type;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
@ -22,11 +24,14 @@ import com.massivecraft.factions.listeners.FactionsChatEarlyListener;
|
|||||||
import com.massivecraft.factions.listeners.FactionsEntityListener;
|
import com.massivecraft.factions.listeners.FactionsEntityListener;
|
||||||
import com.massivecraft.factions.listeners.FactionsPlayerListener;
|
import com.massivecraft.factions.listeners.FactionsPlayerListener;
|
||||||
import com.massivecraft.factions.struct.ChatMode;
|
import com.massivecraft.factions.struct.ChatMode;
|
||||||
|
import com.massivecraft.factions.util.MapFLocToStringSetTypeAdapter;
|
||||||
|
import com.massivecraft.factions.util.MyLocationTypeAdapter;
|
||||||
import com.massivecraft.factions.zcore.MPlugin;
|
import com.massivecraft.factions.zcore.MPlugin;
|
||||||
|
|
||||||
import com.nijiko.permissions.PermissionHandler;
|
import com.nijiko.permissions.PermissionHandler;
|
||||||
import com.earth2me.essentials.chat.EssentialsChat;
|
import com.earth2me.essentials.chat.EssentialsChat;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
|
import com.google.gson.reflect.TypeToken;
|
||||||
import com.massivecraft.factions.integration.EssentialsFeatures;
|
import com.massivecraft.factions.integration.EssentialsFeatures;
|
||||||
|
|
||||||
public class P extends MPlugin
|
public class P extends MPlugin
|
||||||
@ -121,10 +126,14 @@ public class P extends MPlugin
|
|||||||
@Override
|
@Override
|
||||||
public GsonBuilder getGsonBuilder()
|
public GsonBuilder getGsonBuilder()
|
||||||
{
|
{
|
||||||
|
Type mapFLocToStringSetType = new TypeToken<Map<FLocation, Set<String>>>(){}.getType();
|
||||||
|
|
||||||
return new GsonBuilder()
|
return new GsonBuilder()
|
||||||
.setPrettyPrinting()
|
.setPrettyPrinting()
|
||||||
.disableHtmlEscaping()
|
.disableHtmlEscaping()
|
||||||
.excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.VOLATILE);
|
.excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.VOLATILE)
|
||||||
|
.registerTypeAdapter(Location.class, new MyLocationTypeAdapter())
|
||||||
|
.registerTypeAdapter(mapFLocToStringSetType, new MapFLocToStringSetTypeAdapter());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -330,122 +339,4 @@ public class P extends MPlugin
|
|||||||
{
|
{
|
||||||
return FactionsPlayerListener.playerCanUseItemHere(player, location, material, true);
|
return FactionsPlayerListener.playerCanUseItemHere(player, location, material, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------------------- //
|
|
||||||
// Test rights
|
|
||||||
// -------------------------------------------- //
|
|
||||||
/*
|
|
||||||
public static boolean hasPermParticipate(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.participate");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermCreate(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.create");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermManageSafeZone(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.manageSafeZone");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermManageWarZone(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.manageWarZone");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermAdminBypass(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.adminBypass");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermReload(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.reload");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermSaveAll(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.saveall");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermLock(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.lock");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermConfigure(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.config");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermDisband(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.disband");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermViewAnyPower(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.viewAnyPower");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermOwnershipBypass(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.ownershipBypass");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermSetPeaceful(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.setPeaceful");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermSetPermanent(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.setPermanent");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermPeacefulExplosionToggle(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.peacefulExplosionToggle");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasPermViewAnyFactionBalance(CommandSender sender) {
|
|
||||||
return hasPerm(sender, "factions.viewAnyFactionBalance");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isCommandDisabled(CommandSender sender, String command) {
|
|
||||||
return (hasPerm(sender, "factions.commandDisable."+command) && !hasPerm(sender, "factions.commandDisable.none"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean hasPerm(CommandSender sender, String permNode) {
|
|
||||||
if (P.Permissions == null || ! (sender instanceof Player)) {
|
|
||||||
return sender.isOp() || sender.hasPermission(permNode);
|
|
||||||
}
|
|
||||||
|
|
||||||
Player player = (Player)sender;
|
|
||||||
return P.Permissions.has(player, permNode);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
// -------------------------------------------- //
|
|
||||||
// Commands
|
|
||||||
// -------------------------------------------- //
|
|
||||||
/*
|
|
||||||
@Override
|
|
||||||
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args)
|
|
||||||
{
|
|
||||||
List<String> parameters = new ArrayList<String>(Arrays.asList(args));
|
|
||||||
this.handleCommand(sender, parameters);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void handleCommand(CommandSender sender, List<String> parameters)
|
|
||||||
{
|
|
||||||
if (parameters.size() == 0)
|
|
||||||
{
|
|
||||||
this.commands.get(0).execute(sender, parameters);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String commandName = parameters.get(0).toLowerCase();
|
|
||||||
parameters.remove(0);
|
|
||||||
|
|
||||||
for (FBaseCommand fcommand : this.commands)
|
|
||||||
{
|
|
||||||
if (fcommand.getAliases().contains(commandName))
|
|
||||||
{
|
|
||||||
fcommand.execute(sender, parameters);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sender.sendMessage(Conf.colorSystem+"Unknown faction command \""+commandName+"\". Try "+Conf.colorCommand+"/"+this.getBaseCommand()+" help");
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ public class CmdDeinvite extends FCommand
|
|||||||
if (you.getFaction() == myFaction)
|
if (you.getFaction() == myFaction)
|
||||||
{
|
{
|
||||||
msg("%s<i> is already a member of %s", you.getName(), myFaction.getTag());
|
msg("%s<i> is already a member of %s", you.getName(), myFaction.getTag());
|
||||||
msg("<i>You might want to: %s", new CmdKick().getUseageTemplate(false));
|
msg("<i>You might want to: %s", p.cmdBase.cmdKick.getUseageTemplate(false));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ public class CmdDescription extends FCommand
|
|||||||
this.aliases.add("desc");
|
this.aliases.add("desc");
|
||||||
|
|
||||||
this.requiredArgs.add("desc");
|
this.requiredArgs.add("desc");
|
||||||
|
this.errorOnToManyArgs = false;
|
||||||
//this.optionalArgs
|
//this.optionalArgs
|
||||||
|
|
||||||
this.permission = Permission.DESCRIPTION.node;
|
this.permission = Permission.DESCRIPTION.node;
|
||||||
|
@ -33,7 +33,7 @@ public class CmdInvite extends FCommand
|
|||||||
if (you.getFaction() == myFaction)
|
if (you.getFaction() == myFaction)
|
||||||
{
|
{
|
||||||
msg("%s<i> is already a member of %s", you.getName(), myFaction.getTag());
|
msg("%s<i> is already a member of %s", you.getName(), myFaction.getTag());
|
||||||
msg("<i>You might want to: " + new CmdKick().getUseageTemplate(false));
|
msg("<i>You might want to: " + p.cmdBase.cmdKick.getUseageTemplate(false));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ public class CmdKick extends FCommand
|
|||||||
if (fme == you)
|
if (fme == you)
|
||||||
{
|
{
|
||||||
msg("<b>You cannot kick yourself.");
|
msg("<b>You cannot kick yourself.");
|
||||||
msg("<i>You might want to: %s", new CmdLeave().getUseageTemplate(false));
|
msg("<i>You might want to: %s", p.cmdBase.cmdLeave.getUseageTemplate(false));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@ public abstract class MCommand<T extends MPlugin>
|
|||||||
// Information on the args
|
// Information on the args
|
||||||
public List<String> requiredArgs;
|
public List<String> requiredArgs;
|
||||||
public LinkedHashMap<String, String> optionalArgs;
|
public LinkedHashMap<String, String> optionalArgs;
|
||||||
|
public boolean errorOnToManyArgs = true;
|
||||||
|
|
||||||
// FIELD: Help Short
|
// FIELD: Help Short
|
||||||
// This field may be left blank and will in such case be loaded from the permissions node instead.
|
// This field may be left blank and will in such case be loaded from the permissions node instead.
|
||||||
@ -198,7 +199,7 @@ public abstract class MCommand<T extends MPlugin>
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.size() > this.requiredArgs.size() + this.optionalArgs.size())
|
if (args.size() > this.requiredArgs.size() + this.optionalArgs.size() && this.errorOnToManyArgs)
|
||||||
{
|
{
|
||||||
if (sender != null)
|
if (sender != null)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user