From b02cd6b85808e45f48b16403655f03c9d4b4b075 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:01:48 -0500 Subject: Added a toast builder for the future --- .../me/xmrvizzy/skyblocker/utils/ToastBuilder.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java new file mode 100644 index 00000000..910c8a6c --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java @@ -0,0 +1,34 @@ +package me.xmrvizzy.skyblocker.utils; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.toast.Toast; +import net.minecraft.client.toast.ToastManager; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; + +@Environment(value= EnvType.CLIENT) +public class ToastBuilder implements Toast { + private final Text title; + private final Text description; + + public ToastBuilder(Text title, Text description) { + this.title = title; + this.description = description; + } + + @Override + public Toast.Visibility draw(MatrixStack matrices, ToastManager manager, long startTime) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, TEXTURE); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + + manager.drawTexture(matrices, 0, 0, 0, 0, this.getWidth(), this.getHeight()); + manager.getClient().textRenderer.draw(matrices, title, 7.0f, 7.0f, -11534256); + manager.getClient().textRenderer.draw(matrices, description, 7.0f, 18.0f, -16777216); + return startTime >= 3000L ? Toast.Visibility.HIDE : Toast.Visibility.SHOW; + } +} -- cgit From 3e7f0d4c2ab64d7483788a9afc9614e3516bf813 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 1 Feb 2022 20:05:47 -0500 Subject: Added auction bought notification --- .../chat/chatevents/AuctionSoldEvent.java | 26 ++++++++++++++++++++++ .../me/xmrvizzy/skyblocker/utils/ToastBuilder.java | 1 - .../resources/assets/skyblocker/lang/en_us.json | 5 ++++- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java b/src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java new file mode 100644 index 00000000..73aee79f --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java @@ -0,0 +1,26 @@ +package me.xmrvizzy.skyblocker.chat.chatevents; + +import me.xmrvizzy.skyblocker.chat.ChatListener; +import me.xmrvizzy.skyblocker.utils.ToastBuilder; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.TranslatableText; + +public class AuctionSoldEvent extends ChatListener{ + private final TranslatableText toastTitle = new TranslatableText("skyblocker.auction_sold.title"); + private final TranslatableText toastDesc = new TranslatableText("skyblocker.auction_sold.desc"); + + public AuctionSoldEvent() { + super("/^(?=.*Auction)(?=.*bought).*$/gm"); + } + + @Override + public boolean isEnabled() { + return true; + } + + @Override + public boolean onMessage(String[] groups) { + MinecraftClient.getInstance().getToastManager().add(new ToastBuilder(toastTitle, toastDesc)); + return true; + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java index 910c8a6c..fd3122f7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java @@ -3,7 +3,6 @@ package me.xmrvizzy.skyblocker.utils; import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.toast.Toast; import net.minecraft.client.toast.ToastManager; diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index d3e7db26..1116ba2c 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -48,5 +48,8 @@ "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2There is a new version available!", "skyblocker.update.update_link": " §2§nClick here§r", "skyblocker.update.update_message_end" : " §ato find out about latest features.", - "skyblocker.update.hover_text": "Open Modrinth" + "skyblocker.update.hover_text": "Open Modrinth", + + "skyblocker.auction_sold.title": "Auction Bought!", + "skyblocker.auction_sold.desc" : "Collect your coins in chat!" } \ No newline at end of file -- cgit From e398b26148195c928b6fa28dc72987b9ed0c5da7 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 1 Feb 2022 20:09:52 -0500 Subject: Revert "Added auction bought notification" This reverts commit 3e7f0d4c2ab64d7483788a9afc9614e3516bf813. --- .../chat/chatevents/AuctionSoldEvent.java | 26 ---------------------- .../me/xmrvizzy/skyblocker/utils/ToastBuilder.java | 1 + .../resources/assets/skyblocker/lang/en_us.json | 5 +---- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java b/src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java deleted file mode 100644 index 73aee79f..00000000 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/chatevents/AuctionSoldEvent.java +++ /dev/null @@ -1,26 +0,0 @@ -package me.xmrvizzy.skyblocker.chat.chatevents; - -import me.xmrvizzy.skyblocker.chat.ChatListener; -import me.xmrvizzy.skyblocker.utils.ToastBuilder; -import net.minecraft.client.MinecraftClient; -import net.minecraft.text.TranslatableText; - -public class AuctionSoldEvent extends ChatListener{ - private final TranslatableText toastTitle = new TranslatableText("skyblocker.auction_sold.title"); - private final TranslatableText toastDesc = new TranslatableText("skyblocker.auction_sold.desc"); - - public AuctionSoldEvent() { - super("/^(?=.*Auction)(?=.*bought).*$/gm"); - } - - @Override - public boolean isEnabled() { - return true; - } - - @Override - public boolean onMessage(String[] groups) { - MinecraftClient.getInstance().getToastManager().add(new ToastBuilder(toastTitle, toastDesc)); - return true; - } -} diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java index fd3122f7..910c8a6c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java @@ -3,6 +3,7 @@ package me.xmrvizzy.skyblocker.utils; import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.toast.Toast; import net.minecraft.client.toast.ToastManager; diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 1116ba2c..d3e7db26 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -48,8 +48,5 @@ "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2There is a new version available!", "skyblocker.update.update_link": " §2§nClick here§r", "skyblocker.update.update_message_end" : " §ato find out about latest features.", - "skyblocker.update.hover_text": "Open Modrinth", - - "skyblocker.auction_sold.title": "Auction Bought!", - "skyblocker.auction_sold.desc" : "Collect your coins in chat!" + "skyblocker.update.hover_text": "Open Modrinth" } \ No newline at end of file -- cgit