diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
5 files changed, 14 insertions, 19 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java index 0690952e..68f09344 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java @@ -105,7 +105,7 @@ public class SecretsTracker { PlayerEntity playerEntity = MinecraftClient.getInstance().player; if (playerEntity != null) { if (success) { - playerEntity.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.dungeons.secretsTracker.feedback", Text.literal(player).styled(Constants.WITH_COLOR.apply(0xf57542)), "§7" + secrets, getCacheText(cacheAge)))); + playerEntity.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.dungeons.secretsTracker.feedback", Text.literal(player).withColor(0xf57542), "§7" + secrets, getCacheText(cacheAge)))); } else { playerEntity.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.dungeons.secretsTracker.failFeedback"))); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java index 814611e5..d2d463c7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -35,7 +35,7 @@ public class ResultButtonWidget extends ClickableWidget { } @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { MinecraftClient client = MinecraftClient.getInstance(); // this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height); context.drawGuiTexture(BACKGROUND_TEXTURE, this.getX(), this.getY(), this.getWidth(), this.getHeight()); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java index eb744389..28ffc930 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -83,7 +83,7 @@ public class QuickNavButton extends ClickableWidget { * @param mouseY the y-coordinate of the mouse cursor */ @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { this.updateCoordinates(); RenderSystem.disableDepthTest(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java index b6b65896..208b0131 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java @@ -6,7 +6,6 @@ import java.util.regex.Pattern; import de.hysky.skyblocker.skyblock.tabhud.util.Ico; import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr; import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent; -import de.hysky.skyblocker.utils.Constants; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -34,7 +33,7 @@ public class GardenServerWidget extends Widget { this.addSimpleIcoText(Ico.EMERALD, "Gems:", Formatting.GREEN, 43); Text copperText = Widget.simpleEntryText(44, "Copper:", Formatting.WHITE); - ((MutableText) copperText.getSiblings().get(0)).styled(Constants.WITH_COLOR.apply(COPPER_COLOR)); + ((MutableText) copperText.getSiblings().get(0)).withColor(COPPER_COLOR); this.addComponent(new IcoTextComponent(Ico.COPPER, copperText)); diff --git a/src/main/java/de/hysky/skyblocker/utils/Constants.java b/src/main/java/de/hysky/skyblocker/utils/Constants.java index 4fcc1f6c..4c557133 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Constants.java +++ b/src/main/java/de/hysky/skyblocker/utils/Constants.java @@ -1,12 +1,9 @@ package de.hysky.skyblocker.utils; import java.util.List; -import java.util.function.IntFunction; import java.util.function.Supplier; -import java.util.function.UnaryOperator; import net.minecraft.text.MutableText; -import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -15,19 +12,18 @@ import net.minecraft.util.Formatting; */ public interface Constants { String LEVEL_EMBLEMS = "\u2E15\u273F\u2741\u2E19\u03B1\u270E\u2615\u2616\u2663\u213B\u2694\u27B6\u26A1\u2604\u269A\u2693\u2620\u269B\u2666\u2660\u2764\u2727\u238A\u1360\u262C\u269D\u29C9\uA214\u32D6\u2E0E\u26A0\uA541\u3020\u30C4\u2948\u2622\u2623\u273E\u269C\u0BD0\u0A6D\u2742\u16C3\u3023\u10F6\u0444\u266A\u266B\u04C3\u26C1\u26C3\u16DD\uA03E\u1C6A\u03A3\u09EB\u2603\u2654\u26C2\u0FC7\uA925\uA56A\u12DE"; - IntFunction<UnaryOperator<Style>> WITH_COLOR = color -> style -> style.withColor(color); Supplier<MutableText> PREFIX = () -> Text.empty() .append(Text.literal("[").formatted(Formatting.GRAY)) - .append(Text.literal("S").styled(WITH_COLOR.apply(0x00ff4c))) - .append(Text.literal("k").styled(WITH_COLOR.apply(0x02fa60))) - .append(Text.literal("y").styled(WITH_COLOR.apply(0x04f574))) - .append(Text.literal("b").styled(WITH_COLOR.apply(0x07ef88))) - .append(Text.literal("l").styled(WITH_COLOR.apply(0x09ea9c))) - .append(Text.literal("o").styled(WITH_COLOR.apply(0x0be5af))) - .append(Text.literal("c").styled(WITH_COLOR.apply(0x0de0c3))) - .append(Text.literal("k").styled(WITH_COLOR.apply(0x10dad7))) - .append(Text.literal("e").styled(WITH_COLOR.apply(0x12d5eb))) - .append(Text.literal("r").styled(WITH_COLOR.apply(0x14d0ff))) + .append(Text.literal("S").withColor(0x00ff4c)) + .append(Text.literal("k").withColor(0x02fa60)) + .append(Text.literal("y").withColor(0x04f574)) + .append(Text.literal("b").withColor(0x07ef88)) + .append(Text.literal("l").withColor(0x09ea9c)) + .append(Text.literal("o").withColor(0x0be5af)) + .append(Text.literal("c").withColor(0x0de0c3)) + .append(Text.literal("k").withColor(0x10dad7)) + .append(Text.literal("e").withColor(0x12d5eb)) + .append(Text.literal("r").withColor(0x14d0ff)) .append(Text.literal("] ").formatted(Formatting.GRAY)); |