From 1afbd1cc0c86b2c7905b5220d1f6e48937bbd98e Mon Sep 17 00:00:00 2001 From: vicisacat Date: Sat, 23 Mar 2024 21:41:14 +0100 Subject: REFORMAT WHOLE FILE REFORMAT WHOLE FILE --- .../mixin/HandledScreenProviderMixin.java | 1 - .../skyblock/auction/AuctionBrowserScreen.java | 11 ++++++++--- .../skyblock/auction/AuctionHouseScreenHandler.java | 19 ++++++++++--------- .../skyblock/auction/AuctionViewScreen.java | 13 ++++++++----- .../skyblocker/skyblock/auction/EditBidPopup.java | 4 ++-- .../skyblock/auction/widgets/AuctionTypeWidget.java | 14 +++++++++----- .../skyblock/auction/widgets/CategoryTabWidget.java | 4 ++-- .../skyblock/auction/widgets/RarityWidget.java | 4 ++-- .../skyblock/auction/widgets/SliderWidget.java | 21 +++++++++++---------- .../skyblock/auction/widgets/SortWidget.java | 14 +++++++++----- 10 files changed, 61 insertions(+), 44 deletions(-) (limited to 'src') diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java index 10d65669..75d604a6 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java @@ -2,7 +2,6 @@ package de.hysky.skyblocker.mixin; import de.hysky.skyblocker.config.SkyblockerConfigManager; -import de.hysky.skyblocker.mixin.accessor.HandledScreenAccessor; import de.hysky.skyblocker.skyblock.auction.AuctionBrowserScreen; import de.hysky.skyblocker.skyblock.auction.AuctionHouseScreenHandler; import de.hysky.skyblocker.skyblock.auction.AuctionViewScreen; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java index 11a41d0c..31c84d9e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java @@ -57,7 +57,7 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI categoryTabWidgets = new ArrayList<>(6); - private String search; + private String search = ""; public AuctionBrowserScreen(AuctionHouseScreenHandler handler, PlayerInventory inventory) { super(handler, inventory, Text.literal("Auctions Browser")); @@ -69,8 +69,6 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI this.clickSlot(BACK_BUTTON_SLOT)) + .position(x + backgroundWidth - 16, y+4) + .size(12, 12) + .build()); + if (categoryTabWidgets.isEmpty()) for (int i = 0; i < 6; i++) { CategoryTabWidget categoryTabWidget = new CategoryTabWidget(new ItemStack(Items.SPONGE), this::clickSlot); @@ -261,6 +265,7 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI tooltip = stack.getTooltip(client.player, TooltipContext.BASIC); String str = tooltip.get(1).getString().trim(); str = str.substring(1, str.length() - 1); // remove parentheses diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java index fbc9fb17..28898cdc 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java @@ -15,22 +15,22 @@ public class AuctionHouseScreenHandler extends GenericContainerScreenHandler { int yOffset = (rows - 4) * 18; // Shift player inventory by 2 pixels and also remove the yOffset - for (int i = rows*9; i < slots.size(); i++) { + for (int i = rows * 9; i < slots.size(); i++) { Slot slot = slots.get(i); SlotAccessor slotAccessor = (SlotAccessor) slot; - slotAccessor.setY(slot.y+2-yOffset); + slotAccessor.setY(slot.y + 2 - yOffset); } // disable ALL THE OTHER SLOTS MWAHAHAHA and also move the good ones around and stuff - for (int i = 0; i < rows*9; i++) { + for (int i = 0; i < rows * 9; i++) { int lineI = i % 9; Slot slot = slots.get(i); - if (!isView && i>9 && i<(rows-1)*9 && lineI > 1 && lineI < 8) { - int miniInventorySlot = lineI - 2 + (i/9 - 1)*6; + if (!isView && i > 9 && i < (rows - 1) * 9 && lineI > 1 && lineI < 8) { + int miniInventorySlot = lineI - 2 + (i / 9 - 1) * 6; SlotAccessor slotAccessor = (SlotAccessor) slot; - slotAccessor.setX(8 + miniInventorySlot%8 * 18); - slotAccessor.setY(18 + miniInventorySlot/8 * 18); + slotAccessor.setX(8 + miniInventorySlot % 8 * 18); + slotAccessor.setY(18 + miniInventorySlot / 8 * 18); } else { - slots.set(i, new Slot(slot.inventory, slot.getIndex(), slot.x, slot.y){ + slots.set(i, new Slot(slot.inventory, slot.getIndex(), slot.x, slot.y) { @Override public boolean isEnabled() { return false; @@ -39,8 +39,9 @@ public class AuctionHouseScreenHandler extends GenericContainerScreenHandler { } } } - + public static AuctionHouseScreenHandler of(GenericContainerScreenHandler original, boolean isView) { + assert MinecraftClient.getInstance().player != null; return new AuctionHouseScreenHandler(original.getType(), original.syncId, MinecraftClient.getInstance().player.getInventory(), diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java index d482ccd8..84d77933 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java @@ -24,7 +24,7 @@ import net.minecraft.util.Identifier; import java.util.List; public class AuctionViewScreen extends AbstractCustomHypixelGUI { - protected static final Identifier BACKGROUND_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE,"textures/gui/auctions_gui/browser/background_view.png"); + protected static final Identifier BACKGROUND_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/auctions_gui/browser/background_view.png"); DirectionalLayoutWidget verticalLayout = DirectionalLayoutWidget.vertical(); @@ -59,7 +59,7 @@ public class AuctionViewScreen extends AbstractCustomHypixelGUI { + verticalLayout.add(ButtonWidget.builder(Text.literal(isBinAuction ? "Buy!" : "Bid!"), button -> { if (buySlotID == -1) return; clickSlot(buySlotID); }).size(50, 12).build()); @@ -83,7 +83,7 @@ public class AuctionViewScreen extends AbstractCustomHypixelGUIthis.x+75 && xthis.y+13 && y this.x + 75 && x < this.x + 75 + 26 && y > this.y + 13 && y < this.y + 13 + 26) { context.drawTooltip(this.textRenderer, this.getTooltipFromItem(handler.getSlot(13).getStack()), x, y); } } @@ -156,6 +158,7 @@ public class AuctionViewScreen extends AbstractCustomHypixelGUI tooltip) { if (priceParsed) return; String minBid = null; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java index ccdb7353..1b046d66 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java @@ -4,7 +4,6 @@ import de.hysky.skyblocker.utils.render.gui.BarebonesPopupScreen; import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.*; import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket; import net.minecraft.text.Style; @@ -69,7 +68,7 @@ public class EditBidPopup extends BarebonesPopupScreen { } private void done(ButtonWidget widget) { - if(!isStringGood(textFieldWidget.getText().trim())) return; + if (!isStringGood(textFieldWidget.getText().trim())) return; sendPacket(textFieldWidget.getText().trim()); this.close(); } @@ -88,6 +87,7 @@ public class EditBidPopup extends BarebonesPopupScreen { @Override public void close() { if (!packetSent) sendPacket(""); + assert this.client != null; this.client.setScreen(null); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java index 64410d72..0caa233a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java @@ -9,9 +9,9 @@ import net.minecraft.util.math.MathHelper; public class AuctionTypeWidget extends SliderWidget { /** - * @param x x position - * @param y y position - * @param slotClick IDK figure it out + * @param x x position + * @param y y position + * @param slotClick IDK figure it out */ public AuctionTypeWidget(int x, int y, SlotClickHandler slotClick) { super(x, y, 17, 17, Text.literal("Auction Type Widget"), slotClick, Option.ALL); @@ -25,13 +25,17 @@ public class AuctionTypeWidget extends SliderWidget { private final Identifier texture; private static final String prefix = "textures/gui/auctions_gui/auction_type_widget/"; private static final Identifier HOVER_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE, prefix + "hover.png"); - private static final Identifier BACK_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE,prefix + "back.png"); + private static final Identifier BACK_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE, prefix + "back.png"); Option(String textureName) { texture = new Identifier(SkyblockerMod.NAMESPACE, prefix + textureName); } + private static final AuctionTypeWidget.Option[] values = values(); - public static AuctionTypeWidget.Option get(int ordinal) {return values[MathHelper.clamp(ordinal, 0, values.length-1)];} + + public static AuctionTypeWidget.Option get(int ordinal) { + return values[MathHelper.clamp(ordinal, 0, values.length - 1)]; + } @Override public boolean isVertical() { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/CategoryTabWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/CategoryTabWidget.java index 6c515e50..f200179a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/CategoryTabWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/CategoryTabWidget.java @@ -33,11 +33,11 @@ public class CategoryTabWidget extends ToggleButtonWidget { if (textures == null) return; Identifier identifier = textures.get(true, this.toggled); int x = getX(); - if (toggled) x-=2; + if (toggled) x -= 2; //RenderSystem.disableDepthTest(); context.drawGuiTexture(identifier, x, this.getY(), this.width, this.height); //RenderSystem.enableDepthTest(); - context.drawItem(icon, x+9, getY()+5); + context.drawItem(icon, x + 9, getY() + 5); if (isMouseOver(mouseX, mouseY)) { context.getMatrices().push(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/RarityWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/RarityWidget.java index 1affdc0c..a5bc34a3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/RarityWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/RarityWidget.java @@ -45,8 +45,8 @@ public class RarityWidget extends ClickableWidget { matrices.push(); //matrices.translate(-7-getX(), -5.5f-getY(), 0); matrices.translate(7, 5.5f, 0); - matrices.scale(34.f/textWidth, 34.f/textWidth, 1.f); - context.drawText(textRenderer, current, 0, -textRenderer.fontHeight/2, color, false); + matrices.scale(34.f / textWidth, 34.f / textWidth, 1.f); + context.drawText(textRenderer, current, 0, -textRenderer.fontHeight / 2, color, false); matrices.pop(); } else { context.drawText(textRenderer, current, 7, 2, color, false); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SliderWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SliderWidget.java index 97543d23..c1f73f20 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SliderWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SliderWidget.java @@ -21,13 +21,12 @@ public class SliderWidget & SliderWidget.OptionInfo> extends C float posProgress; /** - * - * @param x x position - * @param y y position - * @param width width - * @param height height - * @param message probably useless, just put the widget name - * @param clickSlot the parent AuctionsBrowser + * @param x x position + * @param y y position + * @param width width + * @param height height + * @param message probably useless, just put the widget name + * @param clickSlot the parent AuctionsBrowser * @param defaultOption the default option should be the one at ordinal 0 */ public SliderWidget(int x, int y, int width, int height, Text message, SlotClickHandler clickSlot, E defaultOption) { @@ -51,8 +50,8 @@ public class SliderWidget & SliderWidget.OptionInfo> extends C context.getMatrices().push(); context.getMatrices().translate(getX(), getY(), 0); - int x = current.isVertical() ? 0: Math.round(posProgress); - int y = current.isVertical() ? Math.round(posProgress): 0; + int x = current.isVertical() ? 0 : Math.round(posProgress); + int y = current.isVertical() ? Math.round(posProgress) : 0; int optionWidth = current.getOptionSize()[0]; int optionHeight = current.getOptionSize()[1]; @@ -89,7 +88,9 @@ public class SliderWidget & SliderWidget.OptionInfo> extends C } @Override - protected void appendClickableNarrations(NarrationMessageBuilder builder) {} + protected void appendClickableNarrations(NarrationMessageBuilder builder) { + } + public interface OptionInfo { boolean isVertical(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java index 62c3a497..dab3c6b4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java @@ -9,9 +9,9 @@ import net.minecraft.util.math.MathHelper; public class SortWidget extends SliderWidget { /** - * @param x x position - * @param y y position - * @param clickSlot the parent AuctionsBrowser + * @param x x position + * @param y y position + * @param clickSlot the parent AuctionsBrowser */ public SortWidget(int x, int y, SlotClickHandler clickSlot) { super(x, y, 36, 9, Text.literal("Sort Widget"), clickSlot, Option.HIGH); @@ -26,17 +26,21 @@ public class SortWidget extends SliderWidget { private final Identifier texture; private static final String prefix = "textures/gui/auctions_gui/sort_widget/"; private static final Identifier HOVER_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE, prefix + "hover.png"); - private static final Identifier BACK_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE,prefix + "back.png"); + private static final Identifier BACK_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE, prefix + "back.png"); Option(String textureName) { texture = new Identifier(SkyblockerMod.NAMESPACE, prefix + textureName); } + public Identifier getOptionTexture() { return texture; } private static final Option[] values = values(); - public static Option get(int ordinal) {return values[MathHelper.clamp(ordinal, 0, values.length-1)];} + + public static Option get(int ordinal) { + return values[MathHelper.clamp(ordinal, 0, values.length - 1)]; + } @Override public boolean isVertical() { -- cgit