From 168d93c7e2d18b7b559d5f98613b288e7edcdf01 Mon Sep 17 00:00:00 2001 From: michel Date: Wed, 18 Feb 2015 00:15:54 -0500 Subject: [PATCH] Now support all permission systems --- .classpath | 39 +++++-- .../Ant Builder for Lockette.launch | 29 ++--- .gitignore | 2 + .project | 6 ++ PluginCore.jar | Bin 15209 -> 0 bytes plugin.yml | 102 ------------------ pom.xml | 37 +++---- .../org/yi/acru/bukkit/Lockette/Lockette.java | 4 +- .../Lockette/LockettePlayerListener.java | 5 +- src/main/resources/plugin.yml | 1 + 10 files changed, 75 insertions(+), 150 deletions(-) delete mode 100644 PluginCore.jar delete mode 100644 plugin.yml diff --git a/.classpath b/.classpath index 807fe5c..1845049 100644 --- a/.classpath +++ b/.classpath @@ -1,8 +1,31 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.externalToolBuilders/Ant Builder for Lockette.launch b/.externalToolBuilders/Ant Builder for Lockette.launch index 76adc9d..aed7efd 100644 --- a/.externalToolBuilders/Ant Builder for Lockette.launch +++ b/.externalToolBuilders/Ant Builder for Lockette.launch @@ -1,14 +1,15 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 12297e1..2c6c590 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ Thumbs.db target/* +/bin/ +/target/ diff --git a/.project b/.project index 0bdd544..9bff337 100644 --- a/.project +++ b/.project @@ -20,8 +20,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/PluginCore.jar b/PluginCore.jar deleted file mode 100644 index 4ef56b7af893a8356138388362061d921979ba8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15209 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 a1#tyw@IR?55D?6tPd^9{Py**)-~JDX - Edits signs on locked containers. Right click on the sign to edit. - / fix - Fixes an automatic door that is in the wrong position. Look at the door to edit. - / reload - Reloads the configuration files. Operators only. - / version - Reports Lockette version string. -permissions: - lockette.*: - description: Permission for a super admin who can do anything. - children: - lockette.user.create.*: true - lockette.admin.create.*: true - lockette.admin.break: true - lockette.admin.bypass: true - lockette.admin.snoop: true - lockette.admin.reload: true - lockette.towny.wilds: true - lockette.user.*: - description: All the permissions a normal user normally needs. - children: - lockette.user.create.*: true - lockette.towny.wilds: true - lockette.user.create.*: - description: Allows the normal method of locking containers. - children: - lockette.user.create.chest: true - lockette.user.create.furnace: true - lockette.user.create.dispenser: true - lockette.user.create.dropper: true - lockette.user.create.brewingstand: true - lockette.user.create.custom: true - lockette.user.create.trapdoor: true - lockette.user.create.door: true - lockette.admin.*: - description: All the permissions a normal admin normally needs. - children: - lockette.user.create.*: true - lockette.admin.create.*: true - lockette.admin.break: true - lockette.admin.bypass: true - lockette.towny.wilds: true - lockette.admin.create.*: - description: Allows the admin method of locking containers. - children: - lockette.admin.create.chest: true - lockette.admin.create.furnace: true - lockette.admin.create.dispenser: true - lockette.admin.create.dropper: true - lockette.admin.create.brewingstand: true - lockette.admin.create.custom: true - lockette.admin.create.trapdoor: true - lockette.admin.create.door: true - lockette.user.create.chest: - default: op - lockette.user.create.furnace: - default: op - lockette.user.create.dispenser: - default: op - lockette.user.create.dropper: - default: op - lockette.user.create.brewingstand: - default: op - lockette.user.create.custom: - default: op - lockette.user.create.trapdoor: - default: op - lockette.user.create.door: - default: op - lockette.admin.create.chest: - default: op - lockette.admin.create.furnace: - default: op - lockette.admin.create.dispenser: - default: op - lockette.admin.create.dropper: - default: op - lockette.admin.create.brewingstand: - default: op - lockette.admin.create.custom: - default: op - lockette.admin.create.trapdoor: - default: op - lockette.admin.create.door: - default: op - lockette.admin.break: - default: op - lockette.admin.bypass: - default: op - lockette.admin.snoop: - default: false - lockette.admin.reload: - default: false - lockette.towny.wilds: - default: op diff --git a/pom.xml b/pom.xml index 3434571..a7297fc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,24 +4,19 @@ org.yi.acru.bukkit.Lockette Lockette jar - 1.8.13 + 1.9.0 Lockette http://maven.apache.org Cp1252 - - org.bukkit - bukkit - LATEST - system - ${basedir}/lib/spigot-1.8-R0.1-SNAPSHOT.jar - - + + org.bukkit + bukkit + 1.8-R0.1-SNAPSHOT + true + junit junit @@ -31,7 +26,7 @@ org.yi.acru.bukkit PluginCore - 1.4.0 + 1.5.0 compile @@ -64,10 +59,12 @@ shade + true - - org.bukkit - + + org.yi.acru.bukkit:PluginCore + com.googlecode.json-simple:json-simple + @@ -94,9 +91,9 @@ - - bukkit-repo - http://repo.bukkit.org/content/groups/public - + + spigot-repo + https://hub.spigotmc.org/nexus/content/groups/public + diff --git a/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java b/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java index 2fe1d38..c89d053 100644 --- a/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java +++ b/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java @@ -814,9 +814,7 @@ protected boolean pluginEnableOverride(String pluginName){ protected boolean usingExternalPermissions(){ - if(!usePermissions) return(false); - return(super.usingExternalPermissions()); - //return(usePermissions); + return usePermissions; } diff --git a/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java b/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java index 3342c2c..bd1310c 100644 --- a/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java +++ b/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java @@ -8,6 +8,7 @@ package org.yi.acru.bukkit.Lockette; // Imports. +import java.util.HashSet; import java.util.List; import org.bukkit.ChatColor; @@ -23,11 +24,9 @@ import org.bukkit.event.block.Action; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.PluginManager; - import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerQuitEvent; - import org.yi.acru.bukkit.BlockUtil; @@ -528,7 +527,7 @@ else if(Lockette.adminSnoop){ // Returns true if a door wasn't changed. private static boolean fixDoor(Player player){ - Block block = player.getTargetBlock(null, 10); + Block block = player.getTargetBlock(new HashSet(), 10); int type = block.getTypeId(); boolean doCheck = false; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6e80c65..db7c460 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,7 @@ name: Lockette main: org.yi.acru.bukkit.Lockette.Lockette version: ${project.version} +softdepend: [Vault] authors: [Acru, ElgarL, vk2gpz] description: A simple plugin for locking containers and doors without passwords or database files. Inspired by the old hmod plugins Lock by Roman "kingseta" Pramberger and ChestCapsule by Fernando "Fergo". commands: