From ae518bea39d9a025e140fd81d6051a36cad98bb5 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 12 May 2021 02:07:31 +0100 Subject: [PATCH] chore(release): 0.5.14-0 --- .github/workflows/gradle.yml | 8 +-- CHANGELOG.md | 67 +++++++++++++++---- build.gradle | 2 +- .../velocity/AdvancedPortalsPlugin.java | 2 +- src/main/resources/plugin.yml | 2 +- 5 files changed, 60 insertions(+), 21 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 93e9ce2..ff7ac3e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -27,13 +27,13 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Build with Gradle run: ./gradlew build - - name: Upload to Discord (If dev branch) - if: startsWith(github.ref, 'refs/heads/dev/') + - name: Upload to Discord (If pre-release tag) + if: "startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-')" env: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} run: ./gradlew discordupload - - name: Publish to Curseforge (If tagged) - if: startsWith(github.ref, 'refs/tags/') + - name: Publish to Curseforge (If release tag) + if: "startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-')" env: CURSE_API: ${{ secrets.CURSE_API }} run: ./gradlew curseforge diff --git a/CHANGELOG.md b/CHANGELOG.md index 764927c..cf3615f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,46 +1,85 @@ +# Changelog + +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. + +### 0.5.14-0 (2021-05-12) + + * Build Tool Change: Updated versioning and changelog tooling and standards. + ### 0.5.13 -* Added improved support for Velocity (You can now add it directly to Velocity as a plugin) -* Added a ForceEnableProxySupport config option in case any are not detected -* Modern forwarding will be automatically detected. You will no longer need to manually set ForceEnableProxySupport + + * Added improved support for Velocity (You can now add it directly to Velocity as a plugin) + * Added a ForceEnableProxySupport config option in case any are not detected + * Modern forwarding will be automatically detected. You will no longer need to manually set ForceEnableProxySupport + ### 0.5.12 -* Added support for Velocity. -* Also fixed some issues with entity teleporting. + + * Added support for Velocity. + * Also fixed some issues with entity teleporting. + ### 0.5.11 + * Missing changelogs + ### 0.5.10 -* Missing changelogs + + * Missing changelogs + ### 0.5.10 + * Added fix for command portals spam triggering if they didn't teleport you out. * Made portals not activate if you were teleported into them by another portal (to allow linking zones like a star trek warp pad) + ### 0.5.9 + * Missing changelogs + ### 0.5.8 + * Missing changelogs + ### 0.5.7 + + * Extra checks added by @tmantti to fix slow connections to new servers from activating the destination location too quick. + ### 0.5.6 * Fixed packet exploit affecting destinations (only effecting versions 0.5.0 to 0.5.5). + ### 0.5.5 -* Added support for 1.16 -* Reworked chat menus to better use Spigot API -* Changed edit menu to have Activate instead of Teleport to destination -* Compat code changed. You must now use Spigot rather than CraftBukkit. + * Added support for 1.16 + * Reworked chat menus to better use Spigot API + * Changed edit menu to have Activate instead of Teleport to destination + * Compat code changed. You must now use Spigot rather than CraftBukkit. + ### 0.5.4 -* Added bungee backup methods to ensure bungee and desti work correctly together -* Fixed protection region issue -* Reworked the warp command and fixed the surrounding permissions -* Disabling gateway beams is now enabled for placing the blocks as well as by a few other means + * Added bungee backup methods to ensure bungee and desti work correctly together + * Fixed protection region issue + * Reworked the warp command and fixed the surrounding permissions + * Disabling gateway beams is now enabled for placing the blocks as well as by a few other means + ### 0.5.3 + * Fixed destination bug. + ### 0.5.2 + * Fixed issue with bungee destinations. + ### 0.5.1 + * Fixed warp permission info + ### 0.5.0 + * Added command: * Fix for bungee warps + ### 0.4.0 + * Individual portal cooldown added * Bungee improvements + ### Earlier + * See github releases and spigot pages for more info. diff --git a/build.gradle b/build.gradle index 64809ca..9117f79 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ apply plugin: 'eclipse' def branch = System.getenv("GITHUB_REF"); def sha = System.getenv("GITHUB_SHA"); -def isDevBranch = branch == null || (!(branch.startsWith("refs/heads/release/") || branch.startsWith("refs/tags/"))) +def isDevBranch = branch == null || !(branch.startsWith("refs/tags/") && branch.contains("-")) group = 'com.sekwah.advancedportals' version = getPluginData("version") + (isDevBranch ? '-SNAPSHOT' : '') diff --git a/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java index 6e40797..553702c 100644 --- a/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java +++ b/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; */ @Plugin(id = "advancedportals", name = "Advanced Portals", url = "https://www.spigotmc.org/resources/advanced-portals.14356/", - version = "0.5.13") + version = "0.5.14-0") public class AdvancedPortalsPlugin { public HashMap PlayerDestiMap = new HashMap<>(); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e3f2215..c826fd3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ main: com.sekwah.advancedportals.bukkit.AdvancedPortalsPlugin name: AdvancedPortals -version: 0.5.13 +version: 0.5.14-0 author: sekwah41 description: An advanced portals plugin for bukkit. api-version: 1.13