chore(ci): add pre-commit as well as split variables out

.github/workflows/pre-commit-check.yaml

@@ -0,0 +1,41 @@
+name: "Pre-commit consistency check"
+
+on:
+  workflow_dispatch:
+  pull_request:
+
+concurrency:
+  group: ${{ github.head_ref }}-precommit
+  cancel-in-progress: true
+
+jobs:
+  pre-commit-check:
+    name: Run pre-commit checks
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          list-files: shell
+          filters: |
+            addedOrModified:
+              - added|modified: '**'
+
+      # run only if changed files were detected
+      - name: Run against changes
+        uses: pre-commit/action@v2.0.3
+        if: steps.filter.outputs.addedOrModified == 'true'
+        with:
+          extra_args: --files ${{ steps.filter.outputs.addedOrModified_files }}
+
+      # run if no changed files were detected (e.g. workflow_dispatch on master branch)
+      - name: Run against all files
+        uses: pre-commit/action@v2.0.3
+        if: steps.filter.outputs.addedOrModified != 'true'
+        with:
+          extra_args: --all-files

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+# See https://pre-commit.com for more information
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: fix-byte-order-marker
+      - id: mixed-line-ending
+      - id: check-merge-conflict
+      - id: check-case-conflict
+
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.1.10
+    hooks:
+      - id: remove-crlf
+      - id: remove-tabs

.versionrc.js

@@ -1,65 +1,65 @@
-let versionRegex = /(\nversion:\s)([0-9.-]+)/;
+let versionRegex = /(\nversion:\s)([0-9.-]+)/;
-let velocityVersionRegex = /(\sversion\s=\s")([0-9.-]+)("\))/;
+let velocityVersionRegex = /(\sversion\s=\s")([0-9.-]+)("\))/;
-
+
-
+
-const ymlUpdater = {
+const ymlUpdater = {
-  updater: {
+  updater: {
-    'readVersion': (contents) => {
+    'readVersion': (contents) => {
-      return versionRegex.exec(contents)[2];
+      return versionRegex.exec(contents)[2];
-    },
+    },
-    'writeVersion': (contents, version) => {
+    'writeVersion': (contents, version) => {
-      return contents.replace(versionRegex, `$1${version}`);
+      return contents.replace(versionRegex, `$1${version}`);
-    }
+    }
-  }
+  }
-}
+}
-
+
-const bungee = {
+const bungee = {
-  filename: 'src/main/resources/bungee.yml',
+  filename: 'src/main/resources/bungee.yml',
-  ...ymlUpdater,
+  ...ymlUpdater,
-}
+}
-
+
-const spigotPlugin = {
+const spigotPlugin = {
-  filename: 'spigot/src/main/resources/plugin.yml',
+  filename: 'spigot/src/main/resources/plugin.yml',
-  ...ymlUpdater,
+  ...ymlUpdater,
-}
+}
-
+
-
+
-const gradleTracker = {
+const gradleTracker = {
-  filename: 'gradle.properties',
+  filename: 'gradle.properties',
-  updater: {
+  updater: {
-    'readVersion': (contents) => {
+    'readVersion': (contents) => {
-      return versionRegex.exec(contents)[2];
+      return versionRegex.exec(contents)[2];
-    },
+    },
-    'writeVersion': (contents, version) => {
+    'writeVersion': (contents, version) => {
-      return contents.replace(versionRegex, `$1${version}`);
+      return contents.replace(versionRegex, `$1${version}`);
-    }
+    }
-  }
+  }
-}
+}
-
+
-
+
-const velocity_plugin = {
+const velocity_plugin = {
-  filename: 'src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java',
+  filename: 'src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java',
-  updater: {
+  updater: {
-    'readVersion': (contents) => {
+    'readVersion': (contents) => {
-      return velocityVersionRegex.exec(contents)[2];
+      return velocityVersionRegex.exec(contents)[2];
-    },
+    },
-    'writeVersion': (contents, version) => {
+    'writeVersion': (contents, version) => {
-      return contents.replace(velocityVersionRegex, `$1${version}$3`);
+      return contents.replace(velocityVersionRegex, `$1${version}$3`);
-    }
+    }
-  }
+  }
-}
+}
-
+
-const files = [gradleTracker] // spigotPlugin, velocity_plugin, bungee
+const files = [gradleTracker] // spigotPlugin, velocity_plugin, bungee
-
+
-module.exports = {
+module.exports = {
-  bumpFiles: files,
+  bumpFiles: files,
-  packageFiles: files,
+  packageFiles: files,
-  // In case you need to force a version change (mostly due to change of scope of the update e.g. major now instead of patch)
+  // In case you need to force a version change (mostly due to change of scope of the update e.g. major now instead of patch)
-  //releaseAs: '1.0.0',
+  //releaseAs: '1.0.0',
-  header:"# Changelog\n" +
+  header:"# Changelog\n" +
-      "\n" +
+      "\n" +
-      "All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n" +
+      "All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n" +
-      "\n" +
+      "\n" +
-      "For the release changelogs see [CHANGELOG.md](CHANGELOG.md)  \n" +
+      "For the release changelogs see [CHANGELOG.md](CHANGELOG.md)  \n" +
-      "For the snapshot changelogs see [SNAPSHOT_CHANGELOG.md](SNAPSHOT_CHANGELOG.md)\n",
+      "For the snapshot changelogs see [SNAPSHOT_CHANGELOG.md](SNAPSHOT_CHANGELOG.md)\n",
-}
+}

TODO.md

@@ -1,18 +0,0 @@
-TODO
-================
-Main Tasks (Generally should be done in order)
-
-Tag registration system (Mostly done, just needs to be tested and implemented)
-
-Portal trigger system
-
-Configs for language files to allow all messages to change
-
-Change item data from strings to an object with strings in maybe
-
-Bungee Support Set Locations
-
-Keept the data storage for destinations and portals generally the same
-but modify it a little to be nicer for the tag registry.
-
-Recode for spongepowered or find a way to make it work easier for them.

build.gradle

@@ -83,15 +83,13 @@ buildscript {
     }
 }
 
+apply from: 'env-variables.gradle'
+
 archivesBaseName = "Advanced-Portals"
 group = 'com.sekwah.advancedportals'
 
 description = ""
 
-def branch = System.getenv("GITHUB_REF");
-def sha = System.getenv("GITHUB_SHA");
-def isDevBranch = branch == null || !(branch.startsWith("refs/tags/") && !branch.contains("-"))
-
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }

core/src/main/java/com/sekwah/advancedportals/core/AdvancedPortalsCore.java

@@ -1,27 +1,27 @@
-package com.sekwah.advancedportals.core;
+package com.sekwah.advancedportals.core;
-
+
-import com.google.inject.Guice;
+import com.google.inject.Guice;
-import com.google.inject.Injector;
+import com.google.inject.Injector;
-import com.sekwah.advancedportals.core.config.CoreModule;
+import com.sekwah.advancedportals.core.config.CoreModule;
-
+
-public class AdvancedPortalsCore {
+public class AdvancedPortalsCore {
-
+
-    /**
+    /**
-     * https://github.com/google/guice/wiki/GettingStarted
+     * https://github.com/google/guice/wiki/GettingStarted
-     *
+     *
-     */
+     */
-    private Injector injector = Guice.createInjector(new CoreModule(this));
+    private Injector injector = Guice.createInjector(new CoreModule(this));
-
+
-    /**
+    /**
-     *  For some platforms we could do this on construction but this just allows for a bit more control
+     *  For some platforms we could do this on construction but this just allows for a bit more control
-     */
+     */
-    public void onEnable() {
+    public void onEnable() {
-        AdvancedPortalsModule module = new AdvancedPortalsModule(this);
+        AdvancedPortalsModule module = new AdvancedPortalsModule(this);
-        injector = module.getInjector();
+        injector = module.getInjector();
-    }
+    }
-
+
-    public void onDisable() {
+    public void onDisable() {
-
+
-    }
+    }
-
+
-}
+}

core/src/main/java/com/sekwah/advancedportals/core/AdvancedPortalsModule.java

@@ -1,38 +1,38 @@
-package com.sekwah.advancedportals.core;
+package com.sekwah.advancedportals.core;
-
+
-import com.google.inject.AbstractModule;
+import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
+import com.google.inject.Guice;
-import com.google.inject.Injector;
+import com.google.inject.Injector;
-import com.sekwah.advancedportals.core.config.Config;
+import com.sekwah.advancedportals.core.config.Config;
-import com.sekwah.advancedportals.core.config.ConfigHandler;
+import com.sekwah.advancedportals.core.config.ConfigHandler;
-
+
-import javax.annotation.Nonnull;
+import javax.annotation.Nonnull;
-
+
-public class AdvancedPortalsModule extends AbstractModule {
+public class AdvancedPortalsModule extends AbstractModule {
-
+
-
+
-    private Injector injector;
+    private Injector injector;
-    private AdvancedPortalsCore advancedPortalsCore;
+    private AdvancedPortalsCore advancedPortalsCore;
-
+
-    public AdvancedPortalsModule(AdvancedPortalsCore advancedPortalsCore) {
+    public AdvancedPortalsModule(AdvancedPortalsCore advancedPortalsCore) {
-        this.advancedPortalsCore = advancedPortalsCore;
+        this.advancedPortalsCore = advancedPortalsCore;
-    }
+    }
-
+
-    @Override
+    @Override
-    protected void configure() {
+    protected void configure() {
-        // Instances
+        // Instances
-        bind(AdvancedPortalsCore.class).toInstance(advancedPortalsCore);
+        bind(AdvancedPortalsCore.class).toInstance(advancedPortalsCore);
-
+
-        // Providers
+        // Providers
-        bind(Config.class).toProvider(ConfigHandler.class);
+        bind(Config.class).toProvider(ConfigHandler.class);
-    }
+    }
-
+
-    public Injector createInjector() {
+    public Injector createInjector() {
-        return Guice.createInjector(this);
+        return Guice.createInjector(this);
-    }
+    }
-
+
-    @Nonnull
+    @Nonnull
-    public Injector getInjector() {
+    public Injector getInjector() {
-        return injector;
+        return injector;
-    }
+    }
-}
+}

core/src/main/java/com/sekwah/advancedportals/core/config/ConfigHandler.java

@@ -1,10 +1,10 @@
-package com.sekwah.advancedportals.core.config;
+package com.sekwah.advancedportals.core.config;
-
+
-import com.google.inject.Provider;
+import com.google.inject.Provider;
-
+
-public class ConfigHandler implements Provider<Config> {
+public class ConfigHandler implements Provider<Config> {
-    @Override
+    @Override
-    public Config get() {
+    public Config get() {
-        return null;
+        return null;
-    }
+    }
-}
+}

core/src/main/java/com/sekwah/advancedportals/core/data/DataStorage.java

@@ -1,149 +1,149 @@
-package com.sekwah.advancedportals.core.data;
+package com.sekwah.advancedportals.core.data;
-
+
-import com.google.gson.Gson;
+import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.google.gson.GsonBuilder;
-import com.google.inject.Inject;
+import com.google.inject.Inject;
-import com.sekwah.advancedportals.core.AdvancedPortalsCore;
+import com.sekwah.advancedportals.core.AdvancedPortalsCore;
-import com.sekwah.advancedportals.util.InfoLogger;
+import com.sekwah.advancedportals.util.InfoLogger;
-
+
-import java.io.*;
+import java.io.*;
-import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
+import java.lang.reflect.Type;
-
+
-public class DataStorage {
+public class DataStorage {
-
+
-    private Gson gson = new GsonBuilder().setPrettyPrinting().create();
+    private Gson gson = new GsonBuilder().setPrettyPrinting().create();
-
+
-    private File dataFolder;
+    private File dataFolder;
-
+
-    @Inject
+    @Inject
-    private AdvancedPortalsCore portalsCore;
+    private AdvancedPortalsCore portalsCore;
-
+
-    @Inject
+    @Inject
-    private InfoLogger infoLogger;
+    private InfoLogger infoLogger;
-
+
-    public DataStorage(File dataStorageLoc) {
+    public DataStorage(File dataStorageLoc) {
-        this.dataFolder = dataStorageLoc;
+        this.dataFolder = dataStorageLoc;
-    }
+    }
-
+
-    /**
+    /**
-     * Copies the default file, defaults to true to keep true to the name
+     * Copies the default file, defaults to true to keep true to the name
-     *
+     *
-     * @param fileLoc
+     * @param fileLoc
-     * @return
+     * @return
-     */
+     */
-    public boolean copyDefaultFile(String fileLoc) {
+    public boolean copyDefaultFile(String fileLoc) {
-        return this.copyDefaultFile(fileLoc, true);
+        return this.copyDefaultFile(fileLoc, true);
-    }
+    }
-
+
-    public void copyDefaultFiles(boolean override, String... fileLocs) {
+    public void copyDefaultFiles(boolean override, String... fileLocs) {
-        for (String fileLoc : fileLocs) {
+        for (String fileLoc : fileLocs) {
-            this.copyDefaultFile(fileLoc, override);
+            this.copyDefaultFile(fileLoc, override);
-        }
+        }
-    }
+    }
-
+
-    public <T> T loadJson(Type dataHolder, String location) {
+    public <T> T loadJson(Type dataHolder, String location) {
-        InputStream jsonResource = this.loadResource(location);
+        InputStream jsonResource = this.loadResource(location);
-        if(jsonResource == null) {
+        if(jsonResource == null) {
-            return null;
+            return null;
-        }
+        }
-        BufferedReader bufReader = new BufferedReader(new InputStreamReader(jsonResource));
+        BufferedReader bufReader = new BufferedReader(new InputStreamReader(jsonResource));
-        T object = gson.fromJson(bufReader, dataHolder);
+        T object = gson.fromJson(bufReader, dataHolder);
-        return object;
+        return object;
-    }
+    }
-    public <T> T loadJson(Class<T> dataHolder, String location) {
+    public <T> T loadJson(Class<T> dataHolder, String location) {
-        InputStream jsonResource = this.loadResource(location);
+        InputStream jsonResource = this.loadResource(location);
-        if(jsonResource == null) {
+        if(jsonResource == null) {
-            try {
+            try {
-                return dataHolder.getDeclaredConstructor().newInstance();
+                return dataHolder.getDeclaredConstructor().newInstance();
-            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-                e.printStackTrace();
+                e.printStackTrace();
-            }
+            }
-            return null;
+            return null;
-        }
+        }
-        BufferedReader bufReader = new BufferedReader(new InputStreamReader(jsonResource));
+        BufferedReader bufReader = new BufferedReader(new InputStreamReader(jsonResource));
-        return gson.fromJson(bufReader, dataHolder);
+        return gson.fromJson(bufReader, dataHolder);
-    }
+    }
-
+
-    public void storeJson(Object dataHolder, String location) {
+    public void storeJson(Object dataHolder, String location) {
-        String json = gson.toJson(dataHolder);
+        String json = gson.toJson(dataHolder);
-        try {
+        try {
-            FileWriter fileWriter = new FileWriter(new File(this.dataFolder, location));
+            FileWriter fileWriter = new FileWriter(new File(this.dataFolder, location));
-            fileWriter.write(json);
+            fileWriter.write(json);
-            fileWriter.close();
+            fileWriter.close();
-        } catch (IOException e) {
+        } catch (IOException e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-     * Copies the specified file out of the plugin and into the plugins folder.
+     * Copies the specified file out of the plugin and into the plugins folder.
-     *
+     *
-     * @param fileLoc
+     * @param fileLoc
-     * @return if the file is copied, will be false if override is false and the file already existed.
+     * @return if the file is copied, will be false if override is false and the file already existed.
-     */
+     */
-    public boolean copyDefaultFile(String fileLoc, boolean overwrite) {
+    public boolean copyDefaultFile(String fileLoc, boolean overwrite) {
-        File outFile = new File(this.dataFolder, fileLoc);
+        File outFile = new File(this.dataFolder, fileLoc);
-        if (!outFile.exists()) {
+        if (!outFile.exists()) {
-            outFile.getParentFile().mkdirs();
+            outFile.getParentFile().mkdirs();
-        }
+        }
-        if (!outFile.exists() || overwrite) {
+        if (!outFile.exists() || overwrite) {
-            try {
+            try {
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileLoc);
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileLoc);
-                if(inputStream == null) {
+                if(inputStream == null) {
-                    return false;
+                    return false;
-                }
+                }
-
+
-                FileOutputStream outStream = new FileOutputStream(outFile);
+                FileOutputStream outStream = new FileOutputStream(outFile);
-
+
-                byte[] buf = new byte[1024];
+                byte[] buf = new byte[1024];
-                int len;
+                int len;
-                while ((len = inputStream.read(buf)) > 0) {
+                while ((len = inputStream.read(buf)) > 0) {
-                    outStream.write(buf, 0, len);
+                    outStream.write(buf, 0, len);
-                }
+                }
-                inputStream.close();
+                inputStream.close();
-                outStream.close();
+                outStream.close();
-            } catch (NullPointerException e) {
+            } catch (NullPointerException e) {
-                e.printStackTrace();
+                e.printStackTrace();
-                this.infoLogger.logWarning("Could not load " + fileLoc + ". The file does" +
+                this.infoLogger.logWarning("Could not load " + fileLoc + ". The file does" +
-                        "not exist or there has been an error reading the file.");
+                        "not exist or there has been an error reading the file.");
-                return false;
+                return false;
-            } catch (FileNotFoundException e) {
+            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                e.printStackTrace();
-                this.infoLogger.logWarning("Could not create " + fileLoc);
+                this.infoLogger.logWarning("Could not create " + fileLoc);
-            } catch (IOException e) {
+            } catch (IOException e) {
-                e.printStackTrace();
+                e.printStackTrace();
-                this.infoLogger.logWarning("File error reading " + fileLoc);
+                this.infoLogger.logWarning("File error reading " + fileLoc);
-            }
+            }
-        }
+        }
-        return true;
+        return true;
-    }
+    }
-
+
-    /**
+    /**
-     * A method to try to grab the files from the plugin and if its in the plugin folder load from there instead.
+     * A method to try to grab the files from the plugin and if its in the plugin folder load from there instead.
-     * <p>
+     * <p>
-     * @param location
+     * @param location
-     * @return
+     * @return
-     */
+     */
-    public InputStream loadResource(String location) {
+    public InputStream loadResource(String location) {
-        File inFile = new File(dataFolder, location);
+        File inFile = new File(dataFolder, location);
-        if (inFile.exists() && !inFile.isDirectory()) {
+        if (inFile.exists() && !inFile.isDirectory()) {
-            try {
+            try {
-                return new FileInputStream(inFile);
+                return new FileInputStream(inFile);
-            } catch (FileNotFoundException e) {
+            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                e.printStackTrace();
-                return null;
+                return null;
-            }
+            }
-        } else {
+        } else {
-            try {
+            try {
-                copyDefaultFile(location, false);
+                copyDefaultFile(location, false);
-                return this.getClass().getClassLoader().getResourceAsStream(location);
+                return this.getClass().getClassLoader().getResourceAsStream(location);
-            } catch (NullPointerException e) {
+            } catch (NullPointerException e) {
-                e.printStackTrace();
+                e.printStackTrace();
-                this.infoLogger.logWarning("Could not load " + location + ". The file does" +
+                this.infoLogger.logWarning("Could not load " + location + ". The file does" +
-                        "not exist or there has been an error reading the file.");
+                        "not exist or there has been an error reading the file.");
-                return null;
+                return null;
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

curse.gradle

@@ -0,0 +1,172 @@
+import org.apache.commons.codec.Charsets
+import org.apache.http.HttpResponse
+import org.apache.http.client.HttpClient
+import org.apache.http.client.config.CookieSpecs
+import org.apache.http.client.config.RequestConfig
+import org.apache.http.client.methods.HttpPost
+import org.apache.http.entity.ContentType
+import org.apache.http.entity.mime.MultipartEntityBuilder
+import org.apache.http.impl.client.HttpClientBuilder
+import org.apache.http.client.methods.HttpGet
+import com.google.gson.Gson
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.apache.httpcomponents:httpmime:4.5.13"
+        classpath "com.google.code.gson:gson:2.8.6"
+        classpath "org.apache.httpcomponents:httpclient:4.5.13"
+    }
+}
+
+apply from: 'env-variables.gradle'
+
+static String getValueFromCurseAPI(apiKey, endpoint) {
+    String API_BASE_URL = 'https://minecraft.curseforge.com'
+
+    HttpClient client = HttpClientBuilder.create()
+            .setDefaultRequestConfig(RequestConfig.custom()
+                    .setCookieSpec(CookieSpecs.IGNORE_COOKIES).build()).build()
+
+    HttpGet get = new HttpGet(API_BASE_URL + endpoint)
+    get.setHeader('X-Api-Token', apiKey)
+
+    HttpResponse response = client.execute(get)
+
+    int statusCode = response.statusLine.statusCode
+
+    if (statusCode == 200) {
+        byte[] data = response.entity.content.bytes
+        return new String(data, Charsets.UTF_8)
+    } else {
+        if (response.getFirstHeader('content-type').value.contains('json')) {
+            InputStreamReader reader = new InputStreamReader(response.entity.content)
+            reader.close()
+            throw new RuntimeException("[CurseForge] Error")
+        } else {
+            throw new RuntimeException("[CurseForge] HTTP Error Code $response.statusLine.statusCode: $response.statusLine.reasonPhrase")
+        }
+    }
+}
+
+/**
+ * Upload a single file (in case you also want to upload the other files like source n stuff)
+ * @param json
+ * @param file
+ * @return
+ * @throws IOException
+ * @throws URISyntaxException
+ */
+UploadResponse uploadFile(Metadata metadata, File file, String apiKey, Gson gson) throws IOException, URISyntaxException {
+    String API_BASE_URL = 'https://minecraft.curseforge.com'
+    String UPLOAD_URL = "/api/projects/%s/upload-file"
+    // Upload
+    // Important info
+    String uploadUrl = String.format(API_BASE_URL + UPLOAD_URL, project.curse_project_id)
+
+    HttpClient client = HttpClientBuilder.create()
+            .setDefaultRequestConfig(RequestConfig.custom()
+                    .setCookieSpec(CookieSpecs.IGNORE_COOKIES).build()).build()
+
+    HttpPost post = new HttpPost(uploadUrl)
+    post.setHeader('X-Api-Token', apiKey)
+
+
+    // https://support.curseforge.com/en/support/solutions/articles/9000197321-curseforge-api
+    post.setEntity(MultipartEntityBuilder.create()
+            .addTextBody('metadata', gson.toJson(metadata), ContentType.APPLICATION_JSON)
+            .addBinaryBody('file', file)
+            .build())
+
+    HttpResponse response = client.execute(post)
+    InputStreamReader reader = new InputStreamReader(response.entity.content)
+    UploadResponse uploadResponse = gson.fromJson(reader, UploadResponse)
+    reader.close()
+    return uploadResponse
+}
+
+class GameVersion {
+    int id
+    int gameVersionTypeID
+    String name
+    String slug
+}
+
+/**
+ * As described here https://support.curseforge.com/en/support/solutions/articles/9000197321-curseforge-api
+ */
+class Metadata {
+    String changelog
+    String changelogType
+    int[] gameVersions
+    String releaseType
+}
+
+class UploadResponse {
+    int id
+}
+
+
+// Based on https://github.com/matthewprenger/CurseGradle as it didnt support Bukkit uploads at the time.
+task curseforge {
+    dependsOn(jar)
+    doLast {
+        String apiKey = null
+
+        if (System.getenv("CURSE_API") != null) {
+            apiKey = System.getenv("CURSE_API")
+        }
+
+        if(apiKey != null) {
+
+            Gson gson =  new Gson()
+
+            //String VERSION_TYPES_URL = "/api/game/version-types"
+            int gameVersionTypeID = 1
+            String VERSION_URL = "/api/game/versions"
+            println("Uploading to CurseForge")
+
+            // Get game versions
+            String gameVersionsString = getValueFromCurseAPI(apiKey, VERSION_URL)
+            GameVersion[] gameVersions = gson.fromJson(gameVersionsString, GameVersion[].class)
+            def versions = gameVersions.findAll {it.gameVersionTypeID == gameVersionTypeID}
+
+            String[] supportedVersions = [
+                    "1.18",
+                    "1.17",
+                    "1.16",
+                    "1.15",
+                    "1.14",
+                    "1.13"
+            ]
+
+            def supportedGameVersions = versions.findAll {supportedVersions.contains(it.name)}
+            int[] supportedGameVersionIds = supportedGameVersions.collect {it.id}.toArray()
+
+            println("Supported Version Id's ${supportedGameVersionIds}")
+
+            Metadata uploadMetadata = new Metadata()
+
+            uploadMetadata.changelog = "${project.github}/blob/${ext.githubSha}/docs/changelogs/CHANGELOG.md"
+            uploadMetadata.changelogType = "markdown"
+            uploadMetadata.releaseType = ext.isDevBranch ? "beta" : "release"
+            uploadMetadata.gameVersions = supportedGameVersionIds
+
+            def uploadId = uploadFile(uploadMetadata, file(jar.archiveFile), apiKey, gson)
+
+            println("Uploaded with ID: ${uploadId.id}")
+
+            println("Published build")
+
+        } else {
+            println("Curse token unspecified")
+        }
+    }
+//        id = project.curse_project_id
+//        // TODO add code to reference this but also cut the latest change logs in for the files
+//        changelog = "${project.github}/blob/${sha}/CHANGELOG.md"
+//        changelogType = 'markdown'
+//        releaseType = 'release'
+}

discord.gradle

@@ -0,0 +1,54 @@
+import org.apache.http.HttpEntity
+import org.apache.http.client.methods.CloseableHttpResponse
+import org.apache.http.client.methods.HttpPost
+import org.apache.http.entity.ContentType
+import org.apache.http.entity.mime.MultipartEntityBuilder
+import org.apache.http.impl.client.CloseableHttpClient
+import org.apache.http.impl.client.HttpClients
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.apache.httpcomponents:httpmime:4.5.13"
+    }
+}
+
+apply from: 'env-variables.gradle'
+
+/** For pre-releases and testers to be able to try the latest commits if they want.
+ * If the builds start exceeding 8MB then we may want to upload to s3 instead and periodically clear.
+ * TODO possibly add a task that announces when builds are made?
+ * Though add a note that it may take a while for Curse to approve the files.
+ */
+task discordupload {
+    dependsOn(jar)
+    doLast {
+        String discordWebhook = System.getenv("DISCORD_WEBHOOK")
+
+        if(discordWebhook != null) {
+            println("Logging Into Discord")
+
+            CloseableHttpClient httpClient = HttpClients.createDefault()
+            HttpPost uploadFile = new HttpPost(discordWebhook)
+
+            MultipartEntityBuilder builder = MultipartEntityBuilder.create()
+            builder.addTextBody("content", "New automated dev build\n\n" +
+                    "Current Features: <${project.github}/blob/${ext.githubSha}/docs/changelogs/SNAPSHOT_CHANGELOG.md>")
+
+            builder.addBinaryBody("file", file(jar.archiveFile).newInputStream(), ContentType.APPLICATION_OCTET_STREAM, jar.archiveName)
+
+            HttpEntity multipart = builder.build()
+
+            uploadFile.setEntity(multipart)
+            CloseableHttpResponse response = httpClient.execute(uploadFile)
+            response.getEntity()
+
+            println("Posted build")
+
+        } else {
+            println("Discord webhook unspecified ${sha}")
+        }
+    }
+}

env-variables.gradle

@@ -0,0 +1,16 @@
+
+def branch = System.getenv("GITHUB_REF")
+if(branch != null) {
+    branch = branch.replace('refs/heads/', '')
+}
+def isRelease = System.getenv("IS_RELEASE") == "true"
+
+def snapshotName = (branch == null || branch.startsWith("release-please")) ? "SNAPSHOT" : branch
+def githubSha = System.getenv("GITHUB_SHA")
+def shaRef = githubSha != null ? "-${githubSha.substring(0, 8)}" : ""
+
+ext.branch = branch
+ext.snapshotName = snapshotName
+ext.githubSha = githubSha
+ext.shaRef = shaRef
+ext.isRelease = isRelease

lang/build.gradle

@@ -1,3 +1 @@
 // Check the root build.gradle under allprojects for common settings
-
-

lang/src/main/resources/lang/en_GB.lang

@@ -90,4 +90,3 @@ command.trans.help=Copy translation new default translation file
 command.version.help=Returns the current version of the plugin
 
 command.subcommand.nopermission= Sorry but you don't have permission for that, please use \u00A7e/%1$s help \u00A7cif you would like a list of possible sub commands.
-

settings.gradle

@@ -1,11 +1,11 @@
-rootProject.name = "advanced-portals"
+rootProject.name = "advanced-portals"
-// Core modules
+// Core modules
-include 'core'
+include 'core'
-include 'lang'
+include 'lang'
-
+
-// Implementations
+// Implementations
-include 'spigot'
+include 'spigot'
-
+
-// Proxies
+// Proxies
-include 'velocity'
+include 'velocity'
-include 'bungee'
+include 'bungee'

version.txt

@@ -0,0 +1 @@
+0.9.2