From 8a528b26b685615cef75055c256c3d9df2a2a7f4 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Wed, 6 Mar 2019 17:35:42 +0100 Subject: [PATCH] Update P2 repo and minors --- .travis.yml | 18 ------- COMPILING.md | 50 ------------------- README.md | 5 +- build.gradle | 2 +- splash.txt | 1 - .../fawe/regions/general/plot/MoveTo512.java | 8 +-- 6 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 .travis.yml delete mode 100644 COMPILING.md diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f8b8492f7..000000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: java -notifications: - email: false -before_install: chmod +x gradlew -install: ./gradlew setupCIWorkspace -s -script: ./gradlew build -s -jdk: - - oraclejdk8 -# Caching for Gradle files, prevents hitting Maven too much. -before_cache: - - find $HOME/.gradle/ -name '*.lock' -print -exec rm -f {} \; -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ - -# Faster builds without sudo. -sudo: false diff --git a/COMPILING.md b/COMPILING.md deleted file mode 100644 index d3e5bac5c..000000000 --- a/COMPILING.md +++ /dev/null @@ -1,50 +0,0 @@ -Compiling -========= - -You can compile WorldEdit as long as you have the [Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html) for Java 8 or newer. -You only need one version of the JDK installed. - -The build process uses Gradle, which you do *not* need to download. WorldEdit is a multi-module project with four modules: - -* `worldedit-core` contains the WorldEdit API -* `worldedit-bukkit` is the Bukkit plugin -* `worldedit-sponge` is the Sponge plugin -* `worldedit-forge` is the Forge mod - -## To compile... - -### On Windows - -1. Shift + right click the folder with WorldEdit's files and click "Open command prompt". -2. `gradlew clean setupDecompWorkspace` -3. `gradlew build` - -### On Linux, BSD, or Mac OS X - -1. In your terminal, navigate to the folder with WorldEdit's files (`cd /folder/of/worldedit/files`) -2. `./gradlew clean setupDecompWorkspace` -3. `./gradlew build` - -## Then you will find... - -You will find: - -* The core WorldEdit API in **worldedit-core/build/libs** -* WorldEdit for Bukkit in **worldedit-bukkit/build/libs** -* WorldEdit for Sponge in **worldedit-sponge/build/libs** -* WorldEdit for Forge in **worldedit-forge/build/libs** - -If you want to use WorldEdit, use the `-dist` version. - -(The -dist version includes WorldEdit + necessary libraries.) - -### Note regarding `setupDecompWorkspace` -`setupDecompWorkspace` requires more memory than is usually given to Gradle by default. -If it fails, you should put `org.gradle.jvmargs=-Xmx3G` in `gradle.properties`. -Please don't commit this change! - -## Other commands - -* `gradlew idea` will generate an [IntelliJ IDEA](http://www.jetbrains.com/idea/) module for each folder. -* `gradlew eclipse` will generate an [Eclipse](https://www.eclipse.org/downloads/) project for each folder. -* Use `setupCIWorkspace` instead of `setupDecompWorkspace` if you are doing this on a CI server. diff --git a/README.md b/README.md index c0b87b6d7..c4bae6ce9 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,15 @@ FAWE is a fork of WorldEdit that has huge speed and memory improvements and cons * [Download](https://empcraft.com/fawe/download/?bukkit113) * [Jenkins](https://ci.athion.net/job/FAWE-1.13/) -### <1.12.2 +### < 1.12.2 * [Download](https://empcraft.com/fawe/download/?bukkit) * [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit/) * [Repository](https://github.com/boy0001/FastAsyncWorldedit) ## Building -FAWE uses gradle to build +FAWE uses gradle to build +You can safely ignore `gradlew setupDecompWorkspace` if you are not planning to work on the forge side of FAWE. ``` $ gradlew setupDecompWorkspace diff --git a/build.gradle b/build.gradle index a71802690..9c7094c6f 100644 --- a/build.gradle +++ b/build.gradle @@ -75,13 +75,13 @@ subprojects { repositories { mavenCentral() - maven { url "http://repo.bukkit.org/content/groups/public" } maven { url "http://maven.sk89q.com/repo/" } maven { url "http://repo.maven.apache.org/maven2" } // Fawe maven {url "https://mvnrepository.com/artifact/"} 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/"} mavenLocal() maven {url "http://empcraft.com/maven2"} maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"} diff --git a/splash.txt b/splash.txt index 70cf461ed..c63b561f2 100644 --- a/splash.txt +++ b/splash.txt @@ -10,7 +10,6 @@ ======= By Empire92 and WorldEdit team ======= If you encounter trouble: - - Read COMPILING.md if you haven't yet - Run `build` in a separate Gradle run - Use gradlew and not gradle - Ask us! diff --git a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/MoveTo512.java b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/MoveTo512.java index bcd558cc7..7bc11ec16 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/MoveTo512.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/MoveTo512.java @@ -155,10 +155,10 @@ public class MoveTo512 /*extends Command*/ { // @Override // public void execute(PlotPlayer player, String[] args, RunnableVal3 confirm, RunnableVal2 whenDone) throws CommandException { -// checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage()); +// checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage()); // PlotArea area = player.getPlotAreaAbs(); -// check(area, C.COMMAND_SYNTAX, getUsage()); -// checkTrue(area instanceof HybridPlotWorld, C.NOT_VALID_HYBRID_PLOT_WORLD); +// check(area, Captions.COMMAND_SYNTAX, getUsage()); +// checkTrue(area instanceof HybridPlotWorld, Captions.NOT_VALID_HYBRID_PLOT_WORLD); // // WorldUtil.IMP.saveWorld(area.worldname); // @@ -167,7 +167,7 @@ public class MoveTo512 /*extends Command*/ { // // String world = args[0]; // File folder = new File(PS.imp().getWorldContainer(), world + File.separator + "region"); -// checkTrue(!folder.exists(), C.SETUP_WORLD_TAKEN, world); +// checkTrue(!folder.exists(), Captions.SETUP_WORLD_TAKEN, world); // // HybridPlotWorld hpw = (HybridPlotWorld) area; // int minRoad = 7;