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

We need UConf as well as MConf.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-22 16:26:44 +02:00
parent 26fa7e8b95
commit 6d2db1930c
6 changed files with 115 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin.yml
View File

@ -5,10 +5,6 @@ website: http://massivecraft.com/factions
authors: [Olof "Cayorion" Larsson, Brett Flannigan]
depend: [mcore]
softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag]
commands:
factions:
description: The Factions base command
aliases: [f]
permissions:
# -------------------------------------------- #
# THE REAL NODES

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

@ -16,10 +16,7 @@ public class MConf extends Entity<MConf>
// -------------------------------------------- //
protected static transient MConf i;
public static MConf get()
{
return i;
}
public static MConf get() { return i; }
// -------------------------------------------- //
// COLORS

22
src/com/massivecraft/factions/entity/UConf.java Normal file
View File

@ -0,0 +1,22 @@
package com.massivecraft.factions.entity;
import com.massivecraft.mcore.store.Entity;
public class UConf extends Entity<UConf>
{
// -------------------------------------------- //
// META
// -------------------------------------------- //
public static UConf get(Object worldNameExtractable)
{
return UConfColls.get().get2(worldNameExtractable);
}
// -------------------------------------------- //
// FIELDS
// -------------------------------------------- //
}

32
src/com/massivecraft/factions/entity/UConfColl.java Normal file
View File

@ -0,0 +1,32 @@
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;
import com.massivecraft.mcore.store.MStore;
public class UConfColl extends Coll<UConf>
{
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public UConfColl(String name)
{
super(name, UConf.class, MStore.getDb(ConfServer.dburi), Factions.get(), true, false);
}
// -------------------------------------------- //
// OVERRIDE
// -------------------------------------------- //
@Override
public void init()
{
super.init();
this.get(MCore.INSTANCE);
}
}

49
src/com/massivecraft/factions/entity/UConfColls.java Normal file
View File

@ -0,0 +1,49 @@
package com.massivecraft.factions.entity;
import com.massivecraft.factions.Const;
import com.massivecraft.factions.Factions;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.store.Colls;
import com.massivecraft.mcore.usys.Aspect;
public class UConfColls extends Colls<UConfColl, UConf>
{
// -------------------------------------------- //
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static UConfColls i = new UConfColls();
public static UConfColls get() { return i; }
// -------------------------------------------- //
// OVERRIDE: COLLS
// -------------------------------------------- //
@Override
public UConfColl createColl(String collName)
{
return new UConfColl(collName);
}
@Override
public Aspect getAspect()
{
return Factions.get().getAspect();
}
@Override
public String getBasename()
{
return Const.COLLECTION_BASENAME_UCONF;
}
@Override
public UConf get2(Object worldNameExtractable)
{
UConfColl coll = this.get(worldNameExtractable);
if (coll == null) return null;
return coll.get(MCore.INSTANCE);
}
}

25
src/com/massivecraft/factions/listeners/TodoFactionsPlayerListener.java
View File

@ -164,9 +164,9 @@ public class TodoFactionsPlayerListener implements Listener
if (Const.MATERIALS_EDIT_ON_INTERACT.contains(material) && ! FPerm.BUILD.has(me, ps, ! justCheck)) return false;
if (Const.MATERIALS_CONTAINER.contains(material) && ! FPerm.CONTAINER.has(me, ps, ! justCheck)) return false;
if (Const.MATERIALS_DOOR.contains(material) && ! FPerm.DOOR.has(me, ps, ! justCheck)) return false;
if (material == Material.STONE_BUTTON && ! FPerm.BUTTON.has(me, ps, ! justCheck)) return false;
if (material == Material.LEVER && ! FPerm.LEVER.has(me, ps, ! justCheck)) return false;
if (Const.MATERIALS_DOOR.contains(material) && ! FPerm.DOOR.has(me, ps, ! justCheck)) return false;
if (material == Material.STONE_BUTTON && ! FPerm.BUTTON.has(me, ps, ! justCheck)) return false;
if (material == Material.LEVER && ! FPerm.LEVER.has(me, ps, ! justCheck)) return false;
return true;
}
@ -177,24 +177,21 @@ public class TodoFactionsPlayerListener implements Listener
{
Block block = event.getBlockClicked();
Player player = event.getPlayer();
if ( ! playerCanUseItemHere(player, PS.valueOf(block), event.getBucket(), false))
{
event.setCancelled(true);
return;
}
if (playerCanUseItemHere(player, PS.valueOf(block), event.getBucket(), false)) return;
event.setCancelled(true);
}
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerBucketFill(PlayerBucketFillEvent event)
{
Block block = event.getBlockClicked();
Player player = event.getPlayer();
if ( ! playerCanUseItemHere(player, PS.valueOf(block), event.getBucket(), false))
{
event.setCancelled(true);
return;
}
if (playerCanUseItemHere(player, PS.valueOf(block), event.getBucket(), false)) return;
event.setCancelled(true);
}