From 45d31ac5223886d41b53e5c66efc7edc6a1a2360 Mon Sep 17 00:00:00 2001 From: RappyTV Date: Sun, 13 Oct 2024 19:27:48 +0200 Subject: [PATCH 1/4] Remove API from core module and bump wrapper in the api module --- api/build.gradle.kts | 2 +- core/build.gradle.kts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 4fe56f1..13388b9 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -3,7 +3,7 @@ import net.labymod.labygradle.common.extension.LabyModAnnotationProcessorExtensi dependencies { labyProcessor() labyApi("api") - addonMavenDependency("com.rappytv.globaltags:GlobalTagsJava:1.1.4") + addonMavenDependency("com.rappytv.globaltags:GlobalTagsJava:1.1.5") } labyModAnnotationProcessor { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b2edd53..ebb0291 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -3,7 +3,6 @@ import net.labymod.labygradle.common.extension.LabyModAnnotationProcessorExtensi dependencies { labyProcessor() api(project(":api")) - addonMavenDependency("com.rappytv.globaltags:GlobalTagsJava:1.1.4") } labyModAnnotationProcessor { From cff079452d4f59e053e1dfbc10f328c9c1ced321 Mon Sep 17 00:00:00 2001 From: RappyTV Date: Sun, 13 Oct 2024 19:28:16 +0200 Subject: [PATCH 2/4] Update discord invite url --- .../java/com/rappytv/globaltags/config/GlobalTagConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/com/rappytv/globaltags/config/GlobalTagConfig.java b/core/src/main/java/com/rappytv/globaltags/config/GlobalTagConfig.java index acaec37..dbbc8ed 100644 --- a/core/src/main/java/com/rappytv/globaltags/config/GlobalTagConfig.java +++ b/core/src/main/java/com/rappytv/globaltags/config/GlobalTagConfig.java @@ -34,7 +34,7 @@ public class GlobalTagConfig extends AddonConfig { @SpriteSlot(size = 32, y = 2, x = 3) @ButtonSetting public void joinDiscord(Setting setting) { - Laby.references().chatExecutor().openUrl("https://gt.rappytv.com/discord"); + Laby.references().chatExecutor().openUrl("https://globaltags.xyz/discord"); } @SettingSection("display") From ba72016bb3ed4c0a4f78c944e7267d4c7361636c Mon Sep 17 00:00:00 2001 From: RappyTV Date: Sun, 13 Oct 2024 19:28:25 +0200 Subject: [PATCH 3/4] Update translations --- core/src/main/resources/assets/globaltags/i18n/de_de.json | 1 + core/src/main/resources/assets/globaltags/i18n/en_us.json | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/main/resources/assets/globaltags/i18n/de_de.json b/core/src/main/resources/assets/globaltags/i18n/de_de.json index df369c1..974940f 100644 --- a/core/src/main/resources/assets/globaltags/i18n/de_de.json +++ b/core/src/main/resources/assets/globaltags/i18n/de_de.json @@ -72,6 +72,7 @@ "description": "Dieses Icon wird global links neben deinem Tag angezeigt.", "entries": { "none": "None", + "custom": "Eigenes Icon", "android": "Android", "apple": "Apple", "bereal": "BeReal.", diff --git a/core/src/main/resources/assets/globaltags/i18n/en_us.json b/core/src/main/resources/assets/globaltags/i18n/en_us.json index b7975cb..9939ba7 100644 --- a/core/src/main/resources/assets/globaltags/i18n/en_us.json +++ b/core/src/main/resources/assets/globaltags/i18n/en_us.json @@ -72,6 +72,7 @@ "description": "This icon will be displayed left to your tag globally.", "entries": { "none": "None", + "custom": "Custom", "android": "Android", "apple": "Apple", "bereal": "BeReal.", From 042dfd311cf7fd82caa995d3f17b8724d6f5c47f Mon Sep 17 00:00:00 2001 From: RappyTV Date: Sun, 13 Oct 2024 19:28:56 +0200 Subject: [PATCH 4/4] Bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f2e148a..e912190 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";") group = "org.example" -version = providers.environmentVariable("VERSION").getOrElse("1.3.0") +version = providers.environmentVariable("VERSION").getOrElse("1.3.1") labyMod { defaultPackageName = "com.rappytv.globaltags" //change this to your main package name (used by all modules)