Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to SimpleClans 2 #7

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update to SimpleClans 2 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b96a56
Added README.md
jwrb Mar 22, 2013
39337fb
Initial move to an updated version of SimpleClans
jwrb Mar 22, 2013
2b06906
Default Access to /sc lock and /sc changeowner
jwrb Mar 22, 2013
e18f4a6
Fix Spelling error.
jwrb Mar 22, 2013
044f096
Added is, Fixed permissions
jwrb Mar 22, 2013
ff5e04d
Added Preliminary Support for SimpleClans 2
jwrb Mar 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/Secure-Chests/nbproject/private/
/Secure-Chests/build/
/Secure-Chests/dist/
/Secure-Chests/dist/
/nbproject/private/
/dist/
/build/
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Secure-Chests
=============

Allow users to lock chests, furnaces, potion stands, dispencers, and doors so others can't access them! As well we now have Simple Clans support! I made this plugin because I didn't like all the complicated command structure's and the selection method of the other plugins out there. so here it is! simple chest locking.

23 changes: 11 additions & 12 deletions Secure-Chests/src/me/HAklowner/SecureChests/Commands/AddCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
package me.HAklowner.SecureChests.Commands;

import net.sacredlabyrinth.phaed.simpleclans.Clan;
import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;

import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import me.HAklowner.SecureChests.Permission;
import me.HAklowner.SecureChests.SecureChests;
import com.p000ison.dev.simpleclans2.api.clan.Clan;
import com.p000ison.dev.simpleclans2.api.clan.ClanManager;
import com.p000ison.dev.simpleclans2.api.clanplayer.ClanPlayer;
import me.HAklowner.SecureChests.Config.Config;
import me.HAklowner.SecureChests.Config.Language;
import me.HAklowner.SecureChests.Permission;
import me.HAklowner.SecureChests.SecureChests;
import me.HAklowner.SecureChests.Utils.Atype;
import me.HAklowner.SecureChests.Utils.Vlevel;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

public class AddCommand {

Expand Down Expand Up @@ -66,13 +65,13 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
{
String clanTag = ChatColor.stripColor(args[0].substring(2));
ClanManager cm = plugin.simpleClans.getClanManager();
if (cm.isClan(clanTag))
if (cm.existsClanByName(clanTag))
{
Clan clan = cm.getClan(clanTag);
plugin.scCmd.put(player, 3); //value of 3 add to access list.
plugin.scAList.put(player, clan.getTag()); //clan tag.
plugin.scAtype.put(player, Atype.Clan); //we want to add a clan.
plugin.sendMessage(Vlevel.COMMAND, player, Config.getLocal(Language.INTERACT_ADD_CLAN).replace("%clantag", clan.getTagLabel() + ChatColor.WHITE));
plugin.sendMessage(Vlevel.COMMAND, player, Config.getLocal(Language.INTERACT_ADD_CLAN).replace("%clantag", clan.getTag() + ChatColor.WHITE));
}
else
{
Expand Down
7 changes: 4 additions & 3 deletions Secure-Chests/src/me/HAklowner/SecureChests/Commands/DenyCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package me.HAklowner.SecureChests.Commands;

import net.sacredlabyrinth.phaed.simpleclans.Clan;
import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
import com.p000ison.dev.simpleclans2.api.clan.Clan;
import com.p000ison.dev.simpleclans2.api.clan.ClanManager;
import com.p000ison.dev.simpleclans2.api.clanplayer.ClanPlayer;

import org.bukkit.ChatColor;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -66,7 +67,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
{
String clanTag = args[0].substring(2);
ClanManager cm = plugin.simpleClans.getClanManager();
if (cm.isClan(clanTag))
if (cm.existsClanByName(clanTag))
{
Clan clan = cm.getClan(clanTag);
plugin.sendMessage(Vlevel.COMMAND, player, Config.getLocal(Language.INTERACT_DENY_CLAN).replace("%clantag", clanTag + ChatColor.WHITE));
Expand Down
7 changes: 4 additions & 3 deletions Secure-Chests/src/me/HAklowner/SecureChests/Commands/GaddCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.HAklowner.SecureChests.Commands;

import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
import com.p000ison.dev.simpleclans2.api.clan.ClanManager;
import com.p000ison.dev.simpleclans2.api.clanplayer.ClanPlayer;

import org.bukkit.ChatColor;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -65,12 +66,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
{
String clanTag = ChatColor.stripColor(args[0].substring(2));
ClanManager cm = plugin.simpleClans.getClanManager();
if (cm.isClan(clanTag))
if (cm.existsClanByName(clanTag))
{
if (!plugin.getLockManager().clanOnGlobalList(player.getName(), clanTag))
{
plugin.getLockManager().addToGlobalList(player.getName(), clanTag, "clan");
clanTag = cm.getClan(clanTag).getTagLabel();
clanTag = cm.getClan(clanTag).getTag();
plugin.sendMessage(Vlevel.COMMAND, player, Config.getLocal(Language.NOTICE_GADD_CLAN).replace("%clantag", clanTag + ChatColor.WHITE));
}
else
Expand Down
7 changes: 5 additions & 2 deletions Secure-Chests/src/me/HAklowner/SecureChests/Commands/GinfoCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.HAklowner.SecureChests.Commands;

import com.p000ison.dev.simpleclans2.api.clan.Clan;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand All @@ -11,7 +12,9 @@
import me.HAklowner.SecureChests.Config.Language;
import me.HAklowner.SecureChests.Utils.Atype;
import me.HAklowner.SecureChests.Utils.Vlevel;
import net.sacredlabyrinth.phaed.simpleclans.Clan;

import com.p000ison.dev.simpleclans2.api.clan.ClanManager;
import com.p000ison.dev.simpleclans2.api.clanplayer.ClanPlayer;

import org.bukkit.ChatColor;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -92,7 +95,7 @@ else if (args.length == 1)
{
Clan c = plugin.simpleClans.getClanManager().getClan(tag);
if (c != null) {
ctag = c.getTagLabel() + ChatColor.GREEN;
ctag = c.getTag() + ChatColor.GREEN;
}
}
fixedlist.add(ctag);
Expand Down
7 changes: 4 additions & 3 deletions Secure-Chests/src/me/HAklowner/SecureChests/Commands/GremoveCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.HAklowner.SecureChests.Commands;

import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
import com.p000ison.dev.simpleclans2.api.clan.ClanManager;
import com.p000ison.dev.simpleclans2.api.clanplayer.ClanPlayer;

import org.bukkit.ChatColor;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -63,9 +64,9 @@ else if (args[0].toLowerCase().startsWith("c:")) { //they want to add a clan not
if (plugin.usingSimpleClans)
{
ClanManager cm = plugin.simpleClans.getClanManager();
if (cm.isClan(clanTag))
if (cm.existsClanByName(clanTag))
{
colorTag = cm.getClan(clanTag).getTagLabel();
colorTag = cm.getClan(clanTag).getTag();

}
}
Expand Down
7 changes: 4 additions & 3 deletions Secure-Chests/src/me/HAklowner/SecureChests/Commands/RemoveCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.HAklowner.SecureChests.Commands;

import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
import com.p000ison.dev.simpleclans2.api.clan.ClanManager;
import com.p000ison.dev.simpleclans2.api.clanplayer.ClanPlayer;

import org.bukkit.ChatColor;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -67,8 +68,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
String colorTag = clanTag;
if (plugin.usingSimpleClans) {
ClanManager cm = plugin.simpleClans.getClanManager();
if (cm.isClan(clanTag)) {
colorTag = cm.getClan(clanTag).getTagLabel();
if (cm.existsClanByName(clanTag)) {
colorTag = cm.getClan(clanTag).getTag();
}
}
plugin.sendMessage(Vlevel.COMMAND, player, Config.getLocal(Language.INTERACT_REMOVE_CLAN).replace("%clantag", colorTag + ChatColor.WHITE));
Expand Down
23 changes: 13 additions & 10 deletions Secure-Chests/src/me/HAklowner/SecureChests/Listeners/SecureChestsPlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
import me.HAklowner.SecureChests.Config.Language;
import me.HAklowner.SecureChests.Utils.Atype;
import me.HAklowner.SecureChests.Utils.Vlevel;
import net.sacredlabyrinth.phaed.simpleclans.Clan;

import com.p000ison.dev.simpleclans2.api.clan.Clan;

import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.entity.Player;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
Expand Down Expand Up @@ -74,7 +75,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
Clan clan = plugin.simpleClans.getClanManager().getClan(aListEntry);
if (clan != null)
{
clantag = clan.getTagLabel();
clantag = clan.getTag();
}
else
{
Expand Down Expand Up @@ -113,8 +114,8 @@ else if (cmdStatus == 12 && (Permission.has(player, Permission.INFO) || access =
{
Map<String, Boolean> info = lock.getPlayerAccessList();
Set<String> names = info.keySet();
Set<String> allow = new HashSet<String>();
Set<String> deny = new HashSet<String>();
Set<String> allow = new HashSet<>();
Set<String> deny = new HashSet<>();
if(plugin.usingSimpleClans)
{
Map<String, Boolean> cinfo = lock.getClanAccessList();
Expand All @@ -125,7 +126,7 @@ else if (cmdStatus == 12 && (Permission.has(player, Permission.INFO) || access =
if (c != null)
{
plugin.sendMessage(Vlevel.DEBUG, player, cname + " found");
String ctag = c.getColorTag();
String ctag = c.getTag();

if (cinfo.get(cname))
{
Expand Down Expand Up @@ -179,12 +180,14 @@ else if (cmdStatus == 12 && (Permission.has(player, Permission.INFO) || access =
}

String pub = ChatColor.RED + Config.getLocal(Language.LANG_NO);
if (lock.isPublic())
pub = ChatColor.GREEN + Config.getLocal(Language.LANG_YES);
if (lock.isPublic()) {
pub = ChatColor.GREEN + Config.getLocal(Language.LANG_YES);
}

String reslock = ChatColor.RED + Config.getLocal(Language.LANG_NO);
if (lock.isResouseLocked())
reslock = ChatColor.GREEN + Config.getLocal(Language.LANG_YES);
if (lock.isResouseLocked()) {
reslock = ChatColor.GREEN + Config.getLocal(Language.LANG_YES);
}

plugin.sendMessage(Vlevel.COMMAND, player, ChatColor.GOLD + "======== "+owner+"'s "+blockName+" ========");
plugin.sendMessage(Vlevel.COMMAND, player, ChatColor.AQUA + Config.getLocal(Language.PUBLIC) +": " + pub + ChatColor.AQUA + " " + Config.getLocal(Language.RESOURCE_LOCK) +": " + reslock);
Expand Down
Loading