From 3ac7a8c6ff62a9b628b2f32e65669dee5bdf5e1b Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 12 May 2021 01:19:01 +0100 Subject: [PATCH 1/9] ci: Adding changelog generation as well as changes to pipelines --- .github/workflows/gradle.yml | 3 +-- .versionrc.js | 18 ++++++++++++++++++ build.gradle | 14 ++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 .versionrc.js diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 74ae1e3..93e9ce2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -3,8 +3,7 @@ name: Build Project on: push: branches: - - '*/*' - - '!release/*' + - '**' tags: - '*' pull_request: diff --git a/.versionrc.js b/.versionrc.js new file mode 100644 index 0000000..f7369e5 --- /dev/null +++ b/.versionrc.js @@ -0,0 +1,18 @@ +let versionRegex = /(\nversion=)([0-9.-]+)/; + +const tracker = { + filename: 'gradle.properties', + updater: { + 'readVersion': (contents) => { + return versionRegex.exec(contents)[2]; + }, + 'writeVersion': (contents, version) => { + return contents.replace(versionRegex, `$1${version}`); + } + } +} + +module.exports = { + bumpFiles: [tracker], + packageFiles: [tracker] +} diff --git a/build.gradle b/build.gradle index 416bfbd..64809ca 100644 --- a/build.gradle +++ b/build.gradle @@ -183,3 +183,17 @@ task runJar() { } } } + +task updateChangelog(type: Exec) { + commandLine 'cmd', '/c', 'npx standard-version' + ext.output = { + return standardOutput.toString() + } +} + +task updateChangelogPreRelease(type: Exec) { + commandLine 'cmd', '/c', 'npx standard-version --prerelease' + ext.output = { + return standardOutput.toString() + } +} From fd6ef9ac08702db98a5f9c5b2af16ba9a6fae6c2 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 12 May 2021 01:22:50 +0100 Subject: [PATCH 2/9] docs: Updating Readme --- README.md | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index c4e8250..b08c364 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,9 @@ Advanced Portals ![GitHub Workflow Status](https://img.shields.io/github/workflo ============== An advanced portals plugin for bukkit made by sekwah41 designed to have a wide range of features which are easy to use. It adds a bunch of commands to create and edit portals and destinations. This plugin not only enable normal teleportation but also cross server teleportation for networks using bungee. -# Branch Layout - * [master](https://github.com/sekwah41/Advanced-Portals/) (Release Build) - * [dev](https://github.com/sekwah41/Advanced-Portals/tree/dev) (Dev Build) - * [recode](https://github.com/sekwah41/Advanced-Portals/tree/recode) (Recode) - -Once the recode is done the master branch will be releases and the dev branch will be where work is done. +# Recode +We are currently slowly working on a complete re-code of the plugin with a full API. +For now maintaining the current 1.13+ spigot versions is our main priority. # Help [Command Documentation & Guides](https://www.guilded.gg/Sekwah/groups/MDqAZyrD/channels/72ffdaa3-9273-4722-bf47-b75408b371af/docs/1807463914) @@ -31,17 +28,13 @@ Once the recode is done the master branch will be releases and the dev branch wi # Usage Data Usage stats can be found here https://bstats.org/plugin/bukkit/AdvancedPortals -# Velocity Support -We add basic Velocity support though it isn't really a priority. - -By default, the bungee: tag works without there being a plugin on velocity however for desti: to work -for now ensure that on spigot you have the bungeecord setting enabled to register the necessary packet channels. - -We will look into adding better support for proxies (Especially Velocity as it looks better) - # API The api isn't implemented in this version, sorry for any inconvenience. Check the recode tree for possibly a working recode at some point. -# Contribution -If you are going to change any of the reflection make sure you test it against the suggested supported versions at the moment e.g. 1.13 as well as 1.14 otherwise most will be accepted from just reviewing the code unless it changes something drastic which would effect other functionality in a bad way. +## Contributing +Please ensure that your commits are in the following style for PR's + +https://www.conventionalcommits.org/en/v1.0.0/ + +This will help with changelogs and tracking bugfixes. From 4278cd5d7a26ff540ca107c5f3a2d7512a6143f5 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 12 May 2021 02:01:52 +0100 Subject: [PATCH 3/9] ci: Fixed version bumping --- .versionrc.js | 25 ++++++++++++++----- .../velocity/AdvancedPortalsPlugin.java | 1 - 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.versionrc.js b/.versionrc.js index f7369e5..84bf848 100644 --- a/.versionrc.js +++ b/.versionrc.js @@ -1,7 +1,8 @@ -let versionRegex = /(\nversion=)([0-9.-]+)/; +let versionRegex = /(\nversion:\s)([0-9.-]+)/; +let velocityVersionRegex = /(\sversion\s=\s")([0-9.-]+)("\))/; -const tracker = { - filename: 'gradle.properties', +const plugin = { + filename: 'src/main/resources/plugin.yml', updater: { 'readVersion': (contents) => { return versionRegex.exec(contents)[2]; @@ -12,7 +13,19 @@ const tracker = { } } -module.exports = { - bumpFiles: [tracker], - packageFiles: [tracker] +const velocity_plugin = { + filename: 'src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java', + updater: { + 'readVersion': (contents) => { + return velocityVersionRegex.exec(contents)[2]; + }, + 'writeVersion': (contents, version) => { + return contents.replace(velocityVersionRegex, `$1${version}$3`); + } + } +} + +module.exports = { + bumpFiles: [plugin, velocity_plugin], + packageFiles: [plugin, velocity_plugin] } diff --git a/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java index 56d453c..6e40797 100644 --- a/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java +++ b/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java @@ -12,7 +12,6 @@ import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ServerConnection; -import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier; import org.slf4j.Logger; From ae518bea39d9a025e140fd81d6051a36cad98bb5 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 12 May 2021 02:07:31 +0100 Subject: [PATCH 4/9] 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 From e8cbb403c5237fa4ffb61d5ccc6b50b0f461324e Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 12 May 2021 02:52:43 +0100 Subject: [PATCH 5/9] ci: Fix issue with wrong dev mode --- .versionrc.js | 27 +++++++++++++++++-- build.gradle | 2 +- .../velocity/AdvancedPortalsPlugin.java | 2 +- src/main/resources/bungee.yml | 2 +- src/main/resources/plugin.yml | 2 +- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.versionrc.js b/.versionrc.js index 84bf848..ad1f0ae 100644 --- a/.versionrc.js +++ b/.versionrc.js @@ -1,6 +1,17 @@ let versionRegex = /(\nversion:\s)([0-9.-]+)/; let velocityVersionRegex = /(\sversion\s=\s")([0-9.-]+)("\))/; + +const ymlUpdater = { + updater: { + 'readVersion': (contents) => { + return versionRegex.exec(contents)[2]; + }, + 'writeVersion': (contents, version) => { + return contents.replace(versionRegex, `$1${version}`); + } + } +} const plugin = { filename: 'src/main/resources/plugin.yml', updater: { @@ -13,6 +24,16 @@ const plugin = { } } +const bungee = { + filename: 'src/main/resources/bungee.yml', + ...ymlUpdater, +} + +const plugin = { + filename: 'src/main/resources/plugin.yml', + ...ymlUpdater, +} + const velocity_plugin = { filename: 'src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java', updater: { @@ -25,7 +46,9 @@ const velocity_plugin = { } } +const files = [plugin, velocity_plugin, bungee]; + module.exports = { - bumpFiles: [plugin, velocity_plugin], - packageFiles: [plugin, velocity_plugin] + bumpFiles: files, + packageFiles: files } diff --git a/build.gradle b/build.gradle index 9117f79..33bfaf3 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/tags/") && branch.contains("-")) +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 553702c..706f20d 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.14-0") + version = "0.5.13-0") public class AdvancedPortalsPlugin { public HashMap PlayerDestiMap = new HashMap<>(); diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 7c4275c..3557274 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ main: com.sekwah.advancedportals.bungee.AdvancedPortalsPlugin name: AdvancedPortals -version: 0.5.13 +version: 0.5.13-0 author: sekwah41 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c826fd3..07c6038 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.14-0 +version: 0.5.13-0 author: sekwah41 description: An advanced portals plugin for bukkit. api-version: 1.13 From a1121adc10addfcce515d1358d1274232109fdfd Mon Sep 17 00:00:00 2001 From: Sekwah Date: Thu, 13 May 2021 00:33:28 +0100 Subject: [PATCH 6/9] feat: Added configurable proxy teleport delay --- .../bukkit/config/ConfigHelper.java | 13 ++++--- .../listeners/PluginMessageReceiver.java | 34 ++++++++++++++----- src/main/resources/config.yml | 4 +++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java b/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java index d7a66b4..8c7162e 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java @@ -4,13 +4,15 @@ import org.bukkit.configuration.file.FileConfiguration; public class ConfigHelper { - public static String CONFIG_VERSION = "ConfigVersion"; + public static final String CONFIG_VERSION = "ConfigVersion"; - public static String COMMAND_LOGS = "CommandLogs"; + public static final String COMMAND_LOGS = "CommandLogs"; - public static String FORCE_ENABLE_PROXY_SUPPORT = "ForceEnableProxySupport"; + public static final String FORCE_ENABLE_PROXY_SUPPORT = "ForceEnableProxySupport"; - public static String DISABLE_GATEWAY_BEAM = "DisableGatewayBeam"; + public static final String PROXY_TELEPORT_DELAY = "ProxyTeleportDelay"; + + public static final String DISABLE_GATEWAY_BEAM = "DisableGatewayBeam"; private final FileConfiguration config; @@ -22,7 +24,7 @@ public class ConfigHelper { * Recursively for each time there is a future update */ public void update() { - String configVersion = config.getString("ConfigVersion"); + String configVersion = config.getString(CONFIG_VERSION); // Added in 0.5.4 if(configVersion == null || configVersion.equals("true") || configVersion.equals("0.5.3")) { config.set(ConfigHelper.CONFIG_VERSION, "0.5.4"); @@ -35,6 +37,7 @@ public class ConfigHelper { } else if(configVersion.equals("0.5.10") || configVersion.equals("0.5.11")) { config.set(ConfigHelper.CONFIG_VERSION, "0.5.13"); config.set(ConfigHelper.FORCE_ENABLE_PROXY_SUPPORT, false); + config.set(ConfigHelper.PROXY_TELEPORT_DELAY, 0); } } } diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java index 640982d..693462d 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java @@ -3,6 +3,8 @@ package com.sekwah.advancedportals.bukkit.listeners; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; import com.sekwah.advancedportals.bukkit.AdvancedPortalsPlugin; +import com.sekwah.advancedportals.bukkit.config.ConfigAccessor; +import com.sekwah.advancedportals.bukkit.config.ConfigHelper; import com.sekwah.advancedportals.bukkit.destinations.Destination; import com.sekwah.advancedportals.bungee.BungeeMessages; import org.bukkit.entity.Player; @@ -13,9 +15,12 @@ import java.util.UUID; public class PluginMessageReceiver implements PluginMessageListener { private final AdvancedPortalsPlugin plugin; + private final int teleportDelay; public PluginMessageReceiver(AdvancedPortalsPlugin plugin) { this.plugin = plugin; + ConfigAccessor config = new ConfigAccessor(plugin, "config.yml"); + teleportDelay = config.getConfig().getInt(ConfigHelper.PROXY_TELEPORT_DELAY, 0); } @Override @@ -34,22 +39,33 @@ public class PluginMessageReceiver implements PluginMessageListener { Player targetPlayer = this.plugin.getServer().getPlayer(UUID.fromString(bungeeUUID)); - if (targetPlayer != null) { - Destination.warp(targetPlayer, targetDestination, false, true); - - } - else { - plugin.getPlayerDestiMap().put(bungeeUUID, targetDestination); - + if(teleportDelay <= 0) { + teleportPlayerToDesti(targetPlayer, targetDestination, bungeeUUID); + } else { plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> - plugin.getPlayerDestiMap().remove(bungeeUUID), - 20L * 10 + teleportPlayerToDesti(targetPlayer, targetDestination, bungeeUUID), + 20L * teleportDelay ); } } } + public void teleportPlayerToDesti(Player player, String desti, String bungeeUUID) { + if (player != null) { + Destination.warp(player, desti, false, true); + + } + else { + plugin.getPlayerDestiMap().put(bungeeUUID, desti); + + plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> + plugin.getPlayerDestiMap().remove(bungeeUUID), + 20L * 10 + ); + } + } + /** * Example forward packet. * diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 9bf16db..849668b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -91,3 +91,7 @@ CommandLogs: true # If you want to use bungee or velocity and it is not automatically detected (make sure you have advanced portals on the proxy, especially with velocity) ForceEnableProxySupport: false + +# How many seconds after the proxy event fires should the player be teleported (should help with on spawn plugins and such) +# 0 is disabled and anything higher causes a delay. +ProxyTeleportDelay: 0 From d884db3d6c14cf26bfc1190baebe109a6875c2d2 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Thu, 13 May 2021 00:44:25 +0100 Subject: [PATCH 7/9] chore(release): 0.5.13-1 --- CHANGELOG.md | 15 +++++++++++---- .../velocity/AdvancedPortalsPlugin.java | 2 +- src/main/resources/bungee.yml | 2 +- src/main/resources/plugin.yml | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf3615f..e913f6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ -# 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. - +# 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.13-1 (2021-05-12) + + +### Features + +* Added configurable proxy teleport delay ([a1121ad](https://github.com/sekwah41/Advanced-Portals/commit/a1121adc10addfcce515d1358d1274232109fdfd)) + ### 0.5.14-0 (2021-05-12) * Build Tool Change: Updated versioning and changelog tooling and standards. diff --git a/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java index 706f20d..49d9709 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-0") + version = "0.5.13-1") public class AdvancedPortalsPlugin { public HashMap PlayerDestiMap = new HashMap<>(); diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 3557274..72f2b58 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ main: com.sekwah.advancedportals.bungee.AdvancedPortalsPlugin name: AdvancedPortals -version: 0.5.13-0 +version: 0.5.13-1 author: sekwah41 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 07c6038..97f61ee 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-0 +version: 0.5.13-1 author: sekwah41 description: An advanced portals plugin for bukkit. api-version: 1.13 From e22b068a972aef38ca878c6c4a311459b736eee5 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Thu, 13 May 2021 00:45:13 +0100 Subject: [PATCH 8/9] ci: Fix changelog generator --- .versionrc.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.versionrc.js b/.versionrc.js index ad1f0ae..0966c47 100644 --- a/.versionrc.js +++ b/.versionrc.js @@ -12,17 +12,6 @@ const ymlUpdater = { } } } -const plugin = { - filename: 'src/main/resources/plugin.yml', - updater: { - 'readVersion': (contents) => { - return versionRegex.exec(contents)[2]; - }, - 'writeVersion': (contents, version) => { - return contents.replace(versionRegex, `$1${version}`); - } - } -} const bungee = { filename: 'src/main/resources/bungee.yml', From df7bceea6eb9bab3244dd93b57c580bbb10ca86b Mon Sep 17 00:00:00 2001 From: Sekwah Date: Thu, 13 May 2021 00:47:46 +0100 Subject: [PATCH 9/9] docs: Fix version issue in CHANGELOG.md --- CHANGELOG.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e913f6d..8777919 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,15 @@ -# 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.13-1 (2021-05-12) - - -### Features - -* Added configurable proxy teleport delay ([a1121ad](https://github.com/sekwah41/Advanced-Portals/commit/a1121adc10addfcce515d1358d1274232109fdfd)) - -### 0.5.14-0 (2021-05-12) +# 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.13-1 (2021-05-12) + + +### Features + +* Added configurable proxy teleport delay ([a1121ad](https://github.com/sekwah41/Advanced-Portals/commit/a1121adc10addfcce515d1358d1274232109fdfd)) + +### 0.5.13-0 (2021-05-12) * Build Tool Change: Updated versioning and changelog tooling and standards.