From 491b6bc64648e62baccc42004d70b730f81b7254 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Sun, 3 Apr 2016 17:26:17 +1000 Subject: [PATCH] BUmp version, add check for op --- build.gradle | 2 +- bukkit/build/resources/main/plugin.yml | 2 +- .../com/boydti/fawe/bukkit/BukkitCommand.java | 2 +- bukkit/src/main/resources/plugin.yml | 2 +- forge/.gradle/gradle.log | 47 ++++++++++++++++--- .../com/boydti/fawe/forge/SpongeMain.java | 2 +- pom.xml | 2 +- 7 files changed, 46 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 0908e34b..0fe483ab 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } group = 'com.boydti.fawe' -version = '3.3.5' +version = '3.3.6' description = """FastAsyncWorldEdit""" subprojects { diff --git a/bukkit/build/resources/main/plugin.yml b/bukkit/build/resources/main/plugin.yml index 18e2a830..2cc92946 100644 --- a/bukkit/build/resources/main/plugin.yml +++ b/bukkit/build/resources/main/plugin.yml @@ -1,6 +1,6 @@ name: FastAsyncWorldEdit main: com.boydti.fawe.bukkit.FaweBukkit -version: 3.3.5 +version: 3.3.6 description: Fast Async WorldEdit plugin authors: [Empire92] loadbefore: [WorldEdit] diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java index 27ebfd96..026e1318 100644 --- a/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java +++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java @@ -20,7 +20,7 @@ public class BukkitCommand implements CommandExecutor { @Override public boolean onCommand(final CommandSender sender, final Command cmd, final String label, final String[] args) { final FawePlayer plr = Fawe.imp().wrap(sender); - if (!sender.hasPermission(this.cmd.getPerm())) { + if (!sender.hasPermission(this.cmd.getPerm()) || sender.isOp()) { BBC.NO_PERM.send(plr, this.cmd.getPerm()); return true; } diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 18e2a830..2cc92946 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: FastAsyncWorldEdit main: com.boydti.fawe.bukkit.FaweBukkit -version: 3.3.5 +version: 3.3.6 description: Fast Async WorldEdit plugin authors: [Empire92] loadbefore: [WorldEdit] diff --git a/forge/.gradle/gradle.log b/forge/.gradle/gradle.log index 66eef257..8620bf50 100644 --- a/forge/.gradle/gradle.log +++ b/forge/.gradle/gradle.log @@ -9,20 +9,39 @@ ################################################# Version string 'unspecified' does not match SemVer specification You should try SemVer : http://semver.org/ +Cookie rejected [JSESSIONID="26E6D52C45F2EEB46889F1A779E2FC24", version:0, domain:maven.sk89q.com, path:/artifactory/, expiry:null] Illegal 'path' attribute "/artifactory/". Path of origin: "/repo/org/spongepowered/spongeapi/" +Download http://repo.spongepowered.org/maven/org/spongepowered/spongeapi/4.1.0-SNAPSHOT/spongeapi-4.1.0-20160402.223304-15.jar :core:compileJava +:bukkit:processResources :forge:deobfCompileDummyTask :forge:deobfProvidedDummyTask :forge:extractDependencyATs SKIPPED :forge:extractMcpData -:core:compileJava UP-TO-DATE -:core:processResources UP-TO-DATE -:core:classes UP-TO-DATE -:core:jar UP-TO-DATE +:bukkit:processTestResources UP-TO-DATE +warning: [options] bootstrap class path not set in conjunction with -source 1.7 :forge:extractMcpData SKIPPED :forge:extractMcpMappings SKIPPED :forge:genSrgs SKIPPED :forge:getVersionJson :forge:downloadServer SKIPPED +:forge:splitServerJarNote: Some input files use or override a deprecated API. +Note: Recompile with -Xlint:deprecation for details. +Note: Some input files use unchecked or unsafe operations. +Note: Recompile with -Xlint:unchecked for details. +1 warning + +:core:processResources UP-TO-DATE +:core:classes +:core:jar +:bukkit:compileJava +:core:assemble +:core:compileTestJava UP-TO-DATE +:core:processTestResources UP-TO-DATE +:core:testClasses UP-TO-DATE +:core:test UP-TO-DATE +:core:check UP-TO-DATE +:core:build +warning: [options] bootstrap class path not set in conjunction with -source 1.7 :forge:splitServerJar SKIPPED :forge:deobfMcMCP SKIPPED :forge:sourceApiJava UP-TO-DATE @@ -30,7 +49,22 @@ You should try SemVer : http://semver.org/ :forge:processApiResources UP-TO-DATE :forge:apiClasses UP-TO-DATE :forge:sourceMainJava -:forge:compileJavaC:\Users\Jesse\.gradle\caches\modules-2\files-2.1\com.sk89q.worldedit\worldedit-forge-mc1.8.9\6.1.1\dffd7e1882eba256eb2132fe315682c1d26522b1\worldedit-forge-mc1.8.9-6.1.1.jar(com/sk89q/worldedit/forge/ForgeWorldEdit.class): warning: Cannot find annotation method 'modid()' in type 'Mod': class file for net.minecraftforge.fml.common.Mod not found +:forge:compileJavaNote: Some input files use or override a deprecated API. +Note: Recompile with -Xlint:deprecation for details. +Note: Some input files use unchecked or unsafe operations. +Note: Recompile with -Xlint:unchecked for details. +1 warning + +:bukkit:classes +:bukkit:jar SKIPPED +:bukkit:assemble UP-TO-DATE +:bukkit:compileTestJava UP-TO-DATE +:bukkit:testClasses UP-TO-DATE +:bukkit:test UP-TO-DATE +:bukkit:check UP-TO-DATE +:bukkit:shadowJar +:bukkit:build +C:\Users\Jesse\.gradle\caches\modules-2\files-2.1\com.sk89q.worldedit\worldedit-forge-mc1.8.9\6.1.1\dffd7e1882eba256eb2132fe315682c1d26522b1\worldedit-forge-mc1.8.9-6.1.1.jar(com/sk89q/worldedit/forge/ForgeWorldEdit.class): warning: Cannot find annotation method 'modid()' in type 'Mod': class file for net.minecraftforge.fml.common.Mod not found C:\Users\Jesse\.gradle\caches\modules-2\files-2.1\com.sk89q.worldedit\worldedit-forge-mc1.8.9\6.1.1\dffd7e1882eba256eb2132fe315682c1d26522b1\worldedit-forge-mc1.8.9-6.1.1.jar(com/sk89q/worldedit/forge/ForgeWorldEdit.class): warning: Cannot find annotation method 'name()' in type 'Mod' C:\Users\Jesse\.gradle\caches\modules-2\files-2.1\com.sk89q.worldedit\worldedit-forge-mc1.8.9\6.1.1\dffd7e1882eba256eb2132fe315682c1d26522b1\worldedit-forge-mc1.8.9-6.1.1.jar(com/sk89q/worldedit/forge/ForgeWorldEdit.class): warning: Cannot find annotation method 'version()' in type 'Mod' C:\Users\Jesse\.gradle\caches\modules-2\files-2.1\com.sk89q.worldedit\worldedit-forge-mc1.8.9\6.1.1\dffd7e1882eba256eb2132fe315682c1d26522b1\worldedit-forge-mc1.8.9-6.1.1.jar(com/sk89q/worldedit/forge/ForgeWorldEdit.class): warning: Cannot find annotation method 'acceptableRemoteVersions()' in type 'Mod' @@ -63,7 +97,6 @@ Note: Recompile with -Xlint:deprecation for details. Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 27 warnings - :forge:processResources UP-TO-DATE :forge:classes :forge:jar @@ -86,4 +119,4 @@ remapping source... BUILD SUCCESSFUL -Total time: 41.27 secs +Total time: 1 mins 21.422 secs diff --git a/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java b/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java index 40ce644a..de4d6da4 100644 --- a/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java +++ b/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java @@ -13,7 +13,7 @@ import org.spongepowered.api.plugin.Plugin; import org.spongepowered.api.plugin.PluginContainer; import org.spongepowered.api.profile.GameProfileManager; -@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.3.5") +@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.3.6") public class SpongeMain { public PluginContainer plugin; diff --git a/pom.xml b/pom.xml index 2e6f5938..371418fa 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ UTF-8 FastAsyncWorldEdit - 3.3.5 + 3.3.6 FastAsyncWorldEdit jar