From bcda3141528caf48c88b379a52bbc220790e83ba Mon Sep 17 00:00:00 2001 From: RappyTV Date: Wed, 6 Dec 2023 22:46:41 +0100 Subject: [PATCH 1/4] Bump labygradle --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index a5bf155..94cf5ba 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ rootProject.name = "toolwarn" pluginManagement { - val labyGradlePluginVersion = "0.3.29" + val labyGradlePluginVersion = "0.3.38" plugins { id("net.labymod.gradle") version (labyGradlePluginVersion) } From b94e43c781db61d4b808d1b69970de98ed28d2fb Mon Sep 17 00:00:00 2001 From: RappyTV Date: Wed, 6 Dec 2023 23:10:53 +0100 Subject: [PATCH 2/4] Add 1.20.3 implementation --- .../toolwarn/v1_20_3/TbwSoundImpl.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 game-runner/src/v1_20_3/java/com/rappytv/toolwarn/v1_20_3/TbwSoundImpl.java diff --git a/game-runner/src/v1_20_3/java/com/rappytv/toolwarn/v1_20_3/TbwSoundImpl.java b/game-runner/src/v1_20_3/java/com/rappytv/toolwarn/v1_20_3/TbwSoundImpl.java new file mode 100644 index 0000000..b443993 --- /dev/null +++ b/game-runner/src/v1_20_3/java/com/rappytv/toolwarn/v1_20_3/TbwSoundImpl.java @@ -0,0 +1,35 @@ +package com.rappytv.toolwarn.v1_20_3; + +import com.rappytv.toolwarn.util.ITbwSounds; +import net.labymod.api.client.resources.ResourceLocation; +import net.labymod.api.models.Implements; +import org.jetbrains.annotations.NotNull; + +import javax.inject.Singleton; + +@Singleton +@Implements(ITbwSounds.class) +public class TbwSoundImpl implements ITbwSounds { + + private final ResourceLocation plingSound = ResourceLocation.create("minecraft", "block.note_block.pling"); + private final ResourceLocation levelUpSound = ResourceLocation.create("minecraft", "entity.player.levelup"); + private final ResourceLocation glassBreakSound = ResourceLocation.create("minecraft", "block.glass.break"); + private final ResourceLocation anvilUseSound = ResourceLocation.create("minecraft", "block.anvil.use"); + + @Override + public ResourceLocation getPlingSound() { + return plingSound; + } + @Override + public ResourceLocation getLevelUpSound() { + return levelUpSound; + } + @Override + public @NotNull ResourceLocation getGlassBreakSound() { + return glassBreakSound; + } + @Override + public ResourceLocation getAnvilUseSound() { + return anvilUseSound; + } +} From d0823a0afee67b917c78340272d177df8bf64596 Mon Sep 17 00:00:00 2001 From: RappyTV Date: Wed, 6 Dec 2023 23:11:13 +0100 Subject: [PATCH 3/4] Remove out-commented prefix --- core/src/main/java/com/rappytv/toolwarn/TbwAddon.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/com/rappytv/toolwarn/TbwAddon.java b/core/src/main/java/com/rappytv/toolwarn/TbwAddon.java index 98de181..70a9221 100644 --- a/core/src/main/java/com/rappytv/toolwarn/TbwAddon.java +++ b/core/src/main/java/com/rappytv/toolwarn/TbwAddon.java @@ -19,7 +19,6 @@ public class TbwAddon extends LabyAddon { @Override protected void enable() { - // "§c§lTBW §8» §7" prefix = Component .text("TBW ", Style.builder().color(NamedTextColor.RED).decorate(TextDecoration.BOLD).build()) .append(Component.text("» ", NamedTextColor.DARK_GRAY)); From 95da86de8f566045557a4efc7439bb990df70df3 Mon Sep 17 00:00:00 2001 From: RappyTV Date: Wed, 6 Dec 2023 23:11:34 +0100 Subject: [PATCH 4/4] Register 1.20.3, adapt version string, bump version --- build.gradle.kts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f77725b..9b5860a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,8 +20,8 @@ labyMod { displayName = "Toolbreak Warning" author = "RappyTV" description = "Stops you from using your currently used tool when its almost destroyed." - minecraftVersion = "1.8<1.20.2" - version = System.getenv().getOrDefault("VERSION", "1.3.1") + minecraftVersion = "1.8<1.20.3" + version = System.getenv().getOrDefault("VERSION", "1.3.2") } minecraft { @@ -35,7 +35,8 @@ labyMod { "1.19.3", "1.19.4", "1.20.1", - "1.20.2" + "1.20.2", + "1.20.3" ) { version, provider -> configureRun(provider, version) }