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

This is 2.2.2

Browse Source
This commit is contained in:
Olof Larsson
2013-11-11 09:31:04 +01:00
parent fa0c8686c1
commit 1a63c59c54
63 changed files with 651 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/massivecraft/factions/entity/BoardColl.java
View File

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.RelationParticipator;
import com.massivecraft.factions.TerritoryAccess;
@ -21,7 +20,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface
public BoardColl(String name)
{
super(name, Board.class, MStore.getDb(ConfServer.dburi), Factions.get(), false, true, true);
super(name, Board.class, MStore.getDb(), Factions.get(), false, true, true);
}
// -------------------------------------------- //

2
src/com/massivecraft/factions/entity/BoardColls.java
View File

@ -46,7 +46,7 @@ public class BoardColls extends XColls<BoardColl, Board> implements BoardInterfa
@Override
public String getBasename()
{
return Const.COLLECTION_BASENAME_BOARD;
return Const.COLLECTION_BOARD;
}
@Override

3
src/com/massivecraft/factions/entity/FactionColl.java
View File

@ -8,7 +8,6 @@ import com.massivecraft.mcore.store.Coll;
import com.massivecraft.mcore.store.MStore;
import com.massivecraft.mcore.util.Txt;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Factions;
@ -24,7 +23,7 @@ public class FactionColl extends Coll<Faction>
public FactionColl(String name)
{
super(name, Faction.class, MStore.getDb(ConfServer.dburi), Factions.get());
super(name, Faction.class, MStore.getDb(), Factions.get());
}
// -------------------------------------------- //

2
src/com/massivecraft/factions/entity/FactionColls.java
View File

@ -42,7 +42,7 @@ public class FactionColls extends XColls<FactionColl, Faction>
@Override
public String getBasename()
{
return Const.COLLECTION_BASENAME_FACTION;
return Const.COLLECTION_FACTION;
}
@Override

7
src/com/massivecraft/factions/entity/MConf.java
View File

@ -2,6 +2,7 @@ package com.massivecraft.factions.entity;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@ -40,6 +41,12 @@ public class MConf extends Entity<MConf>
return this;
}
// -------------------------------------------- //
// COMMAND ALIASES
// -------------------------------------------- //
public List<String> aliasesF = MUtil.list("f");
// -------------------------------------------- //
// TASKS
// -------------------------------------------- //

3
src/com/massivecraft/factions/entity/MConfColl.java
View File

@ -1,6 +1,5 @@
package com.massivecraft.factions.entity;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Const;
import com.massivecraft.factions.Factions;
import com.massivecraft.mcore.MCore;
@ -17,7 +16,7 @@ public class MConfColl extends Coll<MConf>
public static MConfColl get() { return i; }
private MConfColl()
{
super(Const.COLLECTION_BASENAME_MCONF, MConf.class, MStore.getDb(ConfServer.dburi), Factions.get());
super(Const.COLLECTION_MCONF, MConf.class, MStore.getDb(), Factions.get());
}
// -------------------------------------------- //

3
src/com/massivecraft/factions/entity/MPlayerColl.java
View File

@ -1,6 +1,5 @@
package com.massivecraft.factions.entity;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Const;
import com.massivecraft.factions.Factions;
import com.massivecraft.mcore.store.MStore;
@ -16,7 +15,7 @@ public class MPlayerColl extends SenderColl<MPlayer>
public static MPlayerColl get() { return i; }
private MPlayerColl()
{
super(Const.COLLECTION_BASENAME_MPLAYER, MPlayer.class, MStore.getDb(ConfServer.dburi), Factions.get());
super(Const.COLLECTION_MPLAYER, MPlayer.class, MStore.getDb(), Factions.get());
}
}

3
src/com/massivecraft/factions/entity/UConfColl.java
View File

@ -1,6 +1,5 @@
package com.massivecraft.factions.entity;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.store.Coll;
@ -14,7 +13,7 @@ public class UConfColl extends Coll<UConf>
public UConfColl(String name)
{
super(name, UConf.class, MStore.getDb(ConfServer.dburi), Factions.get());
super(name, UConf.class, MStore.getDb(), Factions.get());
}
// -------------------------------------------- //

2
src/com/massivecraft/factions/entity/UConfColls.java
View File

@ -33,7 +33,7 @@ public class UConfColls extends XColls<UConfColl, UConf>
@Override
public String getBasename()
{
return Const.COLLECTION_BASENAME_UCONF;
return Const.COLLECTION_UCONF;
}
@Override

3
src/com/massivecraft/factions/entity/UPlayerColl.java
View File

@ -1,6 +1,5 @@
package com.massivecraft.factions.entity;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Rel;
import com.massivecraft.mcore.mixin.Mixin;
@ -17,7 +16,7 @@ public class UPlayerColl extends SenderColl<UPlayer>
public UPlayerColl(String name)
{
super(name, UPlayer.class, MStore.getDb(ConfServer.dburi), Factions.get());
super(name, UPlayer.class, MStore.getDb(), Factions.get());
}
// -------------------------------------------- //

2
src/com/massivecraft/factions/entity/UPlayerColls.java
View File

@ -40,7 +40,7 @@ public class UPlayerColls extends XColls<UPlayerColl, UPlayer>
@Override
public String getBasename()
{
return Const.COLLECTION_BASENAME_UPLAYER;
return Const.COLLECTION_UPLAYER;
}
@Override