Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Editor annotations and fix erronous space in editor.

Browse Source
This commit is contained in:
Olof Larsson 2016-05-13 11:10:29 +02:00
parent ab530b6636
commit 37e93a86f4
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/massivecraft/massivecore/MassiveCoreMConf.java
View File

@ -7,8 +7,8 @@ import java.util.Map;
import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permissible;
import com.massivecraft.massivecore.command.editor.annotation.EditorName; import com.massivecraft.massivecore.command.editor.annotation.EditorName;
import com.massivecraft.massivecore.command.editor.annotation.EditorNullable;
import com.massivecraft.massivecore.command.editor.annotation.EditorType; import com.massivecraft.massivecore.command.editor.annotation.EditorType;
import com.massivecraft.massivecore.command.type.TypeMillisDiff;
import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.PermUtil; import com.massivecraft.massivecore.util.PermUtil;
@ -30,15 +30,10 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
// -------------------------------------------- // // -------------------------------------------- //
// Base command aliases. // Base command aliases.
@EditorNullable(false)
public List<String> aliasesMcore = MUtil.list("massivecore", "mcore"); public List<String> aliasesMcore = MUtil.list("massivecore", "mcore");
@EditorNullable(false)
public List<String> aliasesUsys = MUtil.list("usys"); public List<String> aliasesUsys = MUtil.list("usys");
@EditorNullable(false)
public List<String> aliasesMstore = MUtil.list("massivestore", "mstore"); public List<String> aliasesMstore = MUtil.list("massivestore", "mstore");
@EditorNullable(false)
public List<String> aliasesBuffer = MUtil.list("buffer"); public List<String> aliasesBuffer = MUtil.list("buffer");
@EditorNullable(false)
public List<String> aliasesCmdurl = MUtil.list("cmdurl"); public List<String> aliasesCmdurl = MUtil.list("cmdurl");
// -------------------------------------------- // // -------------------------------------------- //
@ -56,7 +51,6 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
// -------------------------------------------- // // -------------------------------------------- //
// Permission denied formatting. // Permission denied formatting.
@EditorNullable(false)
public Map<String, String> permissionDeniedFormats = MUtil.map( public Map<String, String> permissionDeniedFormats = MUtil.map(
"some.awesome.permission.node", "<b>You must be awesome to %s<b>.", "some.awesome.permission.node", "<b>You must be awesome to %s<b>.",
"some.derp.permission.node.1", "derp", "some.derp.permission.node.1", "derp",
@ -79,7 +73,6 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
// -------------------------------------------- // // -------------------------------------------- //
// Teleportation delay permissions. // Teleportation delay permissions.
@EditorNullable(false)
public Map<String, Integer> permissionToTpdelay = MUtil.map( public Map<String, Integer> permissionToTpdelay = MUtil.map(
"massivecore.notpdelay", 0, "massivecore.notpdelay", 0,
"default", 10 "default", 10
@ -122,8 +115,11 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
// -------------------------------------------- // // -------------------------------------------- //
// The database system. // The database system.
@EditorType(TypeMillisDiff.class)
public volatile long millisBetweenLocalPoll = TimeUnit.MILLIS_PER_MINUTE * 5; public volatile long millisBetweenLocalPoll = TimeUnit.MILLIS_PER_MINUTE * 5;
@EditorType(TypeMillisDiff.class)
public volatile long millisBetweenRemotePollWithoutPusher = TimeUnit.MILLIS_PER_SECOND * 10; public volatile long millisBetweenRemotePollWithoutPusher = TimeUnit.MILLIS_PER_SECOND * 10;
@EditorType(TypeMillisDiff.class)
public volatile long millisBetweenRemotePollWithPusher = TimeUnit.MILLIS_PER_MINUTE * 1; public volatile long millisBetweenRemotePollWithPusher = TimeUnit.MILLIS_PER_MINUTE * 1;
@EditorType(fieldName = "iOn") @EditorType(fieldName = "iOn")

4
src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java
View File

@ -130,14 +130,14 @@ public abstract class CommandEditContainerAbstract<O, V> extends CommandEditAbst
Collection<Object> additions = ContainerUtil.getAdditions(before, after); Collection<Object> additions = ContainerUtil.getAdditions(before, after);
if ( ! additions.isEmpty()) if ( ! additions.isEmpty())
{ {
messages.add(Mson.prepondfix(mson("Additions: ").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) additions, sender), null)); messages.add(Mson.prepondfix(mson("Additions:").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) additions, sender), null));
} }
// Note: The result of getDeletions is not actually V, but the implementation doesn't care. // Note: The result of getDeletions is not actually V, but the implementation doesn't care.
Collection<Object> deletions = ContainerUtil.getDeletions(before, after); Collection<Object> deletions = ContainerUtil.getDeletions(before, after);
if ( ! deletions.isEmpty()) if ( ! deletions.isEmpty())
{ {
messages.add(Mson.prepondfix(mson("Deletions: ").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) deletions, sender), null)); messages.add(Mson.prepondfix(mson("Deletions:").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) deletions, sender), null));
} }
message(messages); message(messages);