From 1dd3400aabda56cdbcc208dc395feac65fc33cce Mon Sep 17 00:00:00 2001 From: Matt <4009945+MattBDev@users.noreply.github.com> Date: Wed, 17 Apr 2019 20:20:31 -0400 Subject: [PATCH 1/9] Add Mojang repository --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 853a547fe..b0c8b5aef 100644 --- a/build.gradle +++ b/build.gradle @@ -87,6 +87,7 @@ subprojects { maven {url "http://repo.dmulloy2.net/content/groups/public/"} maven {url "https://repo.destroystokyo.com/repository/maven-public//"} maven {url "http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/"} + maven { url "https://libraries.minecraft.net" } mavenLocal() maven {url "http://empcraft.com/maven2"} maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"} From 72c766a87b415f71c5a2db6343b2a77adae9e453 Mon Sep 17 00:00:00 2001 From: Matt <4009945+MattBDev@users.noreply.github.com> Date: Wed, 17 Apr 2019 20:22:54 -0400 Subject: [PATCH 2/9] Add DataFixerUpper --- worldedit-core/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/worldedit-core/build.gradle b/worldedit-core/build.gradle index eb0f957c3..d87c8a774 100644 --- a/worldedit-core/build.gradle +++ b/worldedit-core/build.gradle @@ -23,6 +23,7 @@ dependencies { compile ("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") { transitive = false } + compile 'com.mojang:datafixerupper:1.0.20' compile 'com.github.luben:zstd-jni:1.1.1' compile 'co.aikar:fastutil-lite:1.0' } From 7a1cc5845ce29c58fa45e2290f6b643880b90dbf Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sat, 27 Apr 2019 16:16:04 +0200 Subject: [PATCH 3/9] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index ff84251a8..c0b09d09b 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,19 +1,29 @@ -# Bug report for FastAsyncWorldEdit 1.13.x - +# Bug report for FastAsyncWorldEdit 1.13.2 + + - -**Debug paste link**: - + +**[REQUIRED] FastAsyncWorldEdit Version Number:** + -**Description of the problem:** - +**[REQUIRED] Spigot/Paper Version Number:** + + +**Links to config.yml and config-legacy.yml file:** + + +**[REQUIRED] Description of the problem:** + + +**Plugins being used on the server:** + **How to replicate**: **Checklist**: -- [] I included a `/fawe debugpaste` link -- [] I made sure there aren't duplicates of this report [(Use Search)](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues?utf8=%E2%9C%93&q=is%3Aissue) -- [] I made sure I am using an up-to-date version of [FAWE for 1.13.x](https://ci.athion.net/job/FAWE-1.13/) +- [] I included all information required in the sections above +- [] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues?utf8=%E2%9C%93&q=is%3Aissue) +- [] I made sure I am using an up-to-date version of [FastAsyncWorldEdit for 1.13.2](https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/) - [] I made sure the bug/error is not caused by any other plugin From 4199e09bc8863562e9cb50bfe02263fb50e47206 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sat, 27 Apr 2019 21:28:46 +0200 Subject: [PATCH 4/9] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c8494060a..e0087776d 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,11 @@ FAWE is a fork of WorldEdit that has huge speed and memory improvements and cons ## Downloads ### 1.13+ -* [Download](https://incendo.org/download/) -* [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit-1.13/) +* [Download](https://empcraft.com/fawe/download/) +* [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/) ### < 1.12.2 -* [Download](https://incendo.org/download/) +* [Download](https://empcraft.com/fawe/download/?bukkit) * [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit/) * [Repository](https://github.com/boy0001/FastAsyncWorldedit) From 1b03d14f919d69223b5db1614253ab28d4f611f9 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sun, 28 Apr 2019 11:38:30 +0200 Subject: [PATCH 5/9] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index c0b09d09b..070ba585a 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -4,15 +4,16 @@ **[REQUIRED] FastAsyncWorldEdit Version Number:** - + **[REQUIRED] Spigot/Paper Version Number:** - + **Links to config.yml and config-legacy.yml file:** **[REQUIRED] Description of the problem:** + **Plugins being used on the server:** From d9914d7f0abc1148b79fd757a895eae3b4559aaa Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Wed, 1 May 2019 21:42:18 +0200 Subject: [PATCH 6/9] Re-add paste service And move issue template --- ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md | 0 .../src/main/java/com/boydti/fawe/util/IncendoPaster.java | 4 ++-- .../java/com/sk89q/worldedit/command/WorldEditCommands.java | 2 +- .../java/com/sk89q/worldedit/util/paste/IncendoPaste.java | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) rename ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md (100%) diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md similarity index 100% rename from ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE.md diff --git a/worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java b/worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java index 58fb8fa6b..86a415298 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java @@ -23,7 +23,7 @@ public final class IncendoPaster { /** * Upload service URL */ - public static final String UPLOAD_PATH = "https://incendo.org/paste/upload"; + public static final String UPLOAD_PATH = "https://athion.net/ISPaster/paste/upload"; /** * Valid paste applications */ @@ -238,7 +238,7 @@ public final class IncendoPaster { if (jsonObject.has("created")) { final String pasteId = jsonObject.get("paste_id").getAsString(); - return String.format("https://incendo.org/paste/view/%s", pasteId); + return String.format("https://athion.net/ISPaster/paste/view/%s", pasteId); } else { throw new IOException(String.format("Failed to upload files: %s", jsonObject.get("response").getAsString())); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index d640b01e2..05a856f43 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -108,7 +108,7 @@ public class WorldEditCommands { @Command( aliases = {"debugpaste"}, usage = "", - desc = "Upload latest.log, config.yml, message.yml and your commands.yml to https://incendo.org", + desc = "Upload latest.log, config.yml, message.yml and your commands.yml to https://athion.net/ISPaster/paste", min = 0, max = 0 ) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/IncendoPaste.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/IncendoPaste.java index 634f77eb5..38c460764 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/IncendoPaste.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/IncendoPaste.java @@ -25,7 +25,7 @@ public final class IncendoPaste implements Paster{ /** * Upload service URL */ - public static final String UPLOAD_PATH = "https://incendo.org/paste/upload"; + public static final String UPLOAD_PATH = "https://athion.net/ISPaster/paste/upload"; /** * Valid paste applications */ @@ -242,6 +242,7 @@ public final class IncendoPaste implements Paster{ } incendoPaster.addFile(new PasteFile("config.yml", readFile(new File(Fawe.imp().getDirectory(), "config.yml")))); + incendoPaster.addFile(new PasteFile("config-legacy.yml", readFile(new File(Fawe.imp().getDirectory(), "config-legacy.yml")))); incendoPaster.addFile(new PasteFile("message.yml", readFile(new File(Fawe.imp().getDirectory(), "message.yml")))); incendoPaster.addFile(new PasteFile("commands.yml", readFile(new File(Fawe.imp().getDirectory(), "commands.yml")))); @@ -255,7 +256,7 @@ public final class IncendoPaste implements Paster{ if (jsonObject.has("created")) { final String pasteId = jsonObject.get("paste_id").getAsString(); - return String.format("https://incendo.org/paste/view/%s", pasteId); + return String.format("https://athion.net/ISPaster/paste/view/%s", pasteId); } else { throw new IOException(String.format("Failed to upload files: %s", jsonObject.get("response").getAsString())); From 0911202260a9c12898078eea21692f00b85ba92d Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 2 May 2019 19:28:09 +0200 Subject: [PATCH 7/9] Generate javadocs --- .gitignore | 3 ++- build.gradle | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index f632b0d1f..18c977f27 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ lib/ *.bat worldedit-bukkit/src/main/java/ignore/* todo.txt -mvn/* \ No newline at end of file +mvn/* +docs/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index adbe1f09e..2d42f2d6a 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,6 @@ plugins { } apply plugin: 'java' -clean { delete "target" } - def splashFile = new File('splash.txt') if (splashFile.exists()) { @@ -58,23 +56,24 @@ ext { } } -if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion - version = "unknown" -} else { - version = String.format("%s.%s", rootVersion, buildNumber) -} +version = String.format("%s.%s", rootVersion, buildNumber) + description = rootProject.name subprojects { apply plugin: 'java' apply plugin: 'maven' apply plugin: 'com.github.johnrengelman.shadow' - // Enable this requires putting license header files in many, many FAWE files + //Enable this requires putting license header files in many, many FAWE files //apply plugin: 'net.minecrell.licenser' sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + clean.doFirst { + delete "../target" + } + compileJava { options.compilerArgs += ["-parameters"] } repositories { @@ -97,23 +96,6 @@ subprojects { maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" } } - if (JavaVersion.current().isJava8Compatible()) { - // Java 8 turns on doclint which we fail - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } - } - - task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir - } - - artifacts { - archives jar - archives javadocJar - } - if (!(name.equals('worldedit-forge') || name.equals('worldedit-sponge'))) { task sourcesJar(type: Jar, dependsOn: classes) { classifier = 'sources' @@ -146,3 +128,21 @@ subprojects { // include '**/*.java' //} } +task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all child projects as if it was a single project', group: 'Documentation') { + destinationDir = file("./docs/javadoc") + title = "$project.name $version API" + options.author true + options.links 'http://docs.spring.io/spring/docs/4.3.x/javadoc-api/', 'http://docs.oracle.com/javase/8/docs/api/', 'http://docs.spring.io/spring-ws/docs/2.3.0.RELEASE/api/', 'http://docs.spring.io/spring-security/site/docs/4.0.4.RELEASE/apidocs/' + options.addStringOption('Xdoclint:none', '-quiet') + + delete "./docs" + + subprojects.each { proj -> + proj.tasks.withType(Javadoc).each { javadocTask -> + source += javadocTask.source + classpath += javadocTask.classpath + excludes += javadocTask.excludes + includes += javadocTask.includes + } + } +} From 317742e3f0125466bd8137567a4ff0acec0c9976 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 2 May 2019 19:52:07 +0200 Subject: [PATCH 8/9] Update links --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e0087776d..08da15539 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,13 @@ FAWE is a fork of WorldEdit that has huge speed and memory improvements and cons ### 1.13+ * [Download](https://empcraft.com/fawe/download/) * [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/) +* [JavaDoc](https://ci.athion.net/job/FastAsyncWorldEdit-1.13/javadoc/) ### < 1.12.2 * [Download](https://empcraft.com/fawe/download/?bukkit) * [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit/) * [Repository](https://github.com/boy0001/FastAsyncWorldedit) +* [JavaDoc](https://ci.athion.net/job/FastAsyncWorldEdit/javadoc/) ## Building From dd0bec89135fede4966d53180256bc346d677b54 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Mon, 13 May 2019 00:37:18 +1000 Subject: [PATCH 9/9] Fix //none removing arbitrary nbt --- .../src/main/java/com/boydti/fawe/util/BrushCache.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java b/worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java index 4adbcdc35..7c885af07 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java @@ -77,8 +77,11 @@ public final class BrushCache { Map map; if (nbt == null) { if (tool == null) { - item.setNbtData(null); - return tool; + Map raw = nbt.getRaw(); + if (raw.remove("weBrushJson") != null && raw.isEmpty()) { + item.setNbtData(null); + } + return null; } nbt = new CompoundTag(map = new HashMap<>()); } else {