From 35ec69b7d795b2229861389e4c4a08067299502c Mon Sep 17 00:00:00 2001 From: viciscat <51047087+viciscat@users.noreply.github.com> Date: Sat, 11 May 2024 14:39:49 +0200 Subject: hopefully do requested changes correctly --- .../hysky/skyblocker/config/SkyblockerConfig.java | 4 +-- .../skyblocker/config/SkyblockerConfigManager.java | 4 +-- .../skyblock/events/EventNotifications.java | 11 ------ .../skyblock/events/JacobEventToast.java | 39 ++++++++++++---------- .../tabhud/widget/JacobsContestWidget.java | 2 +- 5 files changed, 27 insertions(+), 33 deletions(-) (limited to 'src/main/java/de/hysky') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index a1f4fa2c..c9246599 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -44,8 +44,8 @@ public class SkyblockerConfig { public QuickNavigationConfig quickNav = new QuickNavigationConfig(); @SerialEntry - public MiscConfig misc = new MiscConfig(); + public EventNotificationsConfig eventNotifications = new EventNotificationsConfig(); @SerialEntry - public EventNotificationsConfig eventNotifications = new EventNotificationsConfig(); + public MiscConfig misc = new MiscConfig(); } diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java index 25da464e..f519473c 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java @@ -83,8 +83,8 @@ public class SkyblockerConfigManager { .category(SlayersCategory.create(defaults, config)) .category(ChatCategory.create(defaults, config)) .category(QuickNavigationCategory.create(defaults, config)) - .category(MiscCategory.create(defaults, config)) - .category(EventNotificationsCategory.create(defaults, config))).generateScreen(parent); + .category(EventNotificationsCategory.create(defaults, config)) + .category(MiscCategory.create(defaults, config))).generateScreen(parent); } /** diff --git a/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java b/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java index 662f6b12..537ee360 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java @@ -19,7 +19,6 @@ import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.sound.SoundEvent; -import org.apache.commons.lang3.builder.ToStringBuilder; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -168,15 +167,5 @@ public class EventNotifications { jsonObject.get("extras").getAsJsonArray().asList().stream().map(JsonElement::getAsString).toArray(String[]::new), location); } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("start", start) - .append("duration", duration) - .append("extras", extras) - .append("warpCommand", warpCommand) - .toString(); - } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java index 18d9a7b2..ca0f08c4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java @@ -1,11 +1,13 @@ package de.hysky.skyblocker.skyblock.events; import com.mojang.blaze3d.systems.RenderSystem; +import de.hysky.skyblocker.skyblock.tabhud.widget.JacobsContestWidget; import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.render.RenderHelper; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.toast.ToastManager; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Colors; @@ -14,10 +16,12 @@ import net.minecraft.util.math.MathHelper; import java.util.HashMap; import java.util.Map; -public class JacobEventToast extends EventToast{ +public class JacobEventToast extends EventToast { private final String[] crops; + private static final ItemStack DEFAULT_ITEM = new ItemStack(Items.IRON_HOE); + public static final Map cropItems = new HashMap<>(); static { @@ -42,34 +46,35 @@ public class JacobEventToast extends EventToast{ public Visibility draw(DrawContext context, ToastManager manager, long startTime) { context.drawGuiTexture(TEXTURE, 0, 0, getWidth(), getHeight()); - int y = (getHeight() - getInnerContentsHeight())/2; + int y = (getHeight() - getInnerContentsHeight()) / 2; TextRenderer textRenderer = manager.getClient().textRenderer; - if (startTime < 3_000){ - int k = MathHelper.floor(MathHelper.clamp((3_000 - startTime) / 200.0f, 0.0f, 1.0f) * 255.0f) << 24 | 0x4000000; + MatrixStack matrices = context.getMatrices(); + if (startTime < 3_000) { + int k = MathHelper.floor(Math.clamp((3_000 - startTime) / 200.0f, 0.0f, 1.0f) * 255.0f) << 24 | 0x4000000; y = 2 + drawMessage(context, 30, y, 0xFFFFFF | k); - } else { - int k = (~MathHelper.floor(MathHelper.clamp((startTime - 3_000) / 200.0f, 0.0f, 1.0f) * 255.0f)) << 24 | 0x4000000; + } else { + int k = (~MathHelper.floor(Math.clamp((startTime - 3_000) / 200.0f, 0.0f, 1.0f) * 255.0f)) << 24 | 0x4000000; String s = "Crops:"; int x = 30 + textRenderer.getWidth(s) + 4; - context.drawText(textRenderer, s, 30, 7 + (16 - textRenderer.fontHeight)/2, Colors.WHITE, false); + context.drawText(textRenderer, s, 30, 7 + (16 - textRenderer.fontHeight) / 2, Colors.WHITE, false); for (int i = 0; i < crops.length; i++) { - context.drawItem(cropItems.get(crops[i]), x + i * (16 + 8), 7); + context.drawItem(JacobsContestWidget.FARM_DATA.getOrDefault(crops[i], DEFAULT_ITEM), x + i * (16 + 8), 7); } // IDK how to make the items transparent, so I just redraw the texture on top - context.getMatrices().push(); - context.getMatrices().translate(0, 0, 400f); - RenderHelper.renderNineSliceColored(context, TEXTURE, 0, 0, getWidth(), getHeight(), 1f, 1f, 1f, (k >> 24)/ 255f); - context.getMatrices().pop(); + matrices.push(); + matrices.translate(0, 0, 400f); + RenderHelper.renderNineSliceColored(context, TEXTURE, 0, 0, getWidth(), getHeight(), 1f, 1f, 1f, (k >> 24) / 255f); + matrices.pop(); y += textRenderer.fontHeight * message.size(); } - context.getMatrices().push(); - context.getMatrices().translate(0, 0, 400f); + matrices.push(); + matrices.translate(0, 0, 400f); drawTimer(context, 30, y); - context.drawItemWithoutEntity(icon, 8, getHeight()/2 - 8); - context.getMatrices().pop(); - return startTime > 5_000 ? Visibility.HIDE: Visibility.SHOW; + context.drawItemWithoutEntity(icon, 8, getHeight() / 2 - 8); + matrices.pop(); + return startTime > 5_000 ? Visibility.HIDE : Visibility.SHOW; } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java index 24dcc229..c28c8679 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java @@ -26,7 +26,7 @@ public class JacobsContestWidget extends Widget { //TODO Properly match the contest placement and display it private static final Pattern CROP_PATTERN = Pattern.compile("(?[☘○]) (?[A-Za-z ]+).*"); - private static final Map FARM_DATA = Map.ofEntries( + public static final Map FARM_DATA = Map.ofEntries( entry("Wheat", new ItemStack(Items.WHEAT)), entry("Sugar Cane", new ItemStack(Items.SUGAR_CANE)), entry("Carrot", new ItemStack(Items.CARROT)), -- cgit