From afe4e41b148afc5737939ab45a2376643145de0f Mon Sep 17 00:00:00 2001 From: Sekwah Date: Mon, 5 Apr 2021 15:07:56 +0100 Subject: [PATCH 1/2] Updated to show dev in file name if not tagged --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8d388f31..d9a4eeb8 100644 --- a/build.gradle +++ b/build.gradle @@ -26,13 +26,13 @@ apply plugin: 'maven-publish' apply plugin: 'idea' apply plugin: 'eclipse' -group = 'com.sekwah.advancedportals' -version = getPluginData("version") + '-snapshot' - def branch = System.getenv("GITHUB_REF"); def sha = System.getenv("GITHUB_SHA"); def isDevBranch = !(branch && (branch.startsWith("refs/heads/release/") || branch.startsWith("refs/tags/"))); +group = 'com.sekwah.advancedportals' +version = getPluginData("version") + '-snapshot' + isDevBranch ? '-dev' : '' + description = "" sourceCompatibility = 1.8 From 2040ea08a83701d71c7cd8a31498f4b2f12d9189 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Thu, 22 Apr 2021 11:49:10 +0100 Subject: [PATCH 2/2] Fixed up velocity packets --- build.gradle | 2 +- .../sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d9a4eeb8..71aa0658 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ def sha = System.getenv("GITHUB_SHA"); def isDevBranch = !(branch && (branch.startsWith("refs/heads/release/") || branch.startsWith("refs/tags/"))); group = 'com.sekwah.advancedportals' -version = getPluginData("version") + '-snapshot' + isDevBranch ? '-dev' : '' +version = getPluginData("version") + '-snapshot' + (isDevBranch ? '-dev' : '') description = "" diff --git a/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java index 9d62195f..56d453c5 100644 --- a/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java +++ b/src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java @@ -12,6 +12,7 @@ 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; @@ -104,6 +105,8 @@ public class AdvancedPortalsPlugin { out.writeUTF(val[1]); out.writeUTF(val[2]); + serverConnection.sendPluginMessage(AP_CHANNEL, out.toByteArray()); + } }); }