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

MassiveCore - More type. More editor.

Browse Source
This commit is contained in:
Olof Larsson
2015-11-06 02:10:29 +01:00
parent 53db58f582
commit 482b75be70
88 changed files with 391 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/entity/Faction.java
View File

@ -15,6 +15,7 @@ import com.massivecraft.factions.Rel;
import com.massivecraft.factions.RelationParticipator;
import com.massivecraft.factions.util.*;
import com.massivecraft.massivecore.CaseInsensitiveComparator;
import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.collections.MassiveMapDef;
import com.massivecraft.massivecore.collections.MassiveTreeSetDef;
import com.massivecraft.massivecore.mixin.Mixin;
@ -25,7 +26,7 @@ import com.massivecraft.massivecore.util.IdUtil;
import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.Txt;
public class Faction extends Entity<Faction> implements EconomyParticipator
public class Faction extends Entity<Faction> implements EconomyParticipator, Named
{
// -------------------------------------------- //
// META
@ -154,6 +155,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
// RAW
@Override
public String getName()
{
String ret = this.name;

5
src/com/massivecraft/factions/entity/MFlag.java
View File

@ -3,6 +3,7 @@ package com.massivecraft.factions.entity;
import java.util.List;
import com.massivecraft.factions.event.EventFactionsCreateFlags;
import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.PredicateIsRegistered;
import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.PriorityComparator;
@ -11,7 +12,7 @@ import com.massivecraft.massivecore.collections.MassiveList;
import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.util.Txt;
public class MFlag extends Entity<MFlag> implements Prioritized, Registerable
public class MFlag extends Entity<MFlag> implements Prioritized, Registerable, Named
{
// -------------------------------------------- //
// CONSTANTS
@ -158,7 +159,7 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable
// I just added the name in case anyone feel like renaming their flags for some reason.
// Example: "monsters"
private String name = "defaultName";
public String getName() { return this.name; }
@Override public String getName() { return this.name; }
public MFlag setName(String name) { this.name = name; this.changed(); return this; }
// The flag function described as a question.

5
src/com/massivecraft/factions/entity/MPerm.java
View File

@ -12,6 +12,7 @@ import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.factions.event.EventFactionsCreatePerms;
import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.PredicateIsRegistered;
import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.PriorityComparator;
@ -21,7 +22,7 @@ import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.Txt;
public class MPerm extends Entity<MPerm> implements Prioritized, Registerable
public class MPerm extends Entity<MPerm> implements Prioritized, Registerable, Named
{
// -------------------------------------------- //
// CONSTANTS
@ -216,7 +217,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable
// I just added the name in case anyone feel like renaming their perms for some reason.
// Example: "build"
private String name = "defaultName";
public String getName() { return this.name; }
@Override public String getName() { return this.name; }
public MPerm setName(String name) { this.name = name; this.changed(); return this; }
// The perm function described as an "order".