From 4900c795e355fc30023b4eb56b47259394c3fe6d Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 14 Jan 2024 00:40:31 -0500 Subject: Reformat math --- .../partyfinder/FinderSettingsContainer.java | 20 +++++++++--------- .../dungeon/partyfinder/OptionDropdownWidget.java | 18 ++++++++-------- .../skyblock/dungeon/partyfinder/PartyEntry.java | 4 ++-- .../dungeon/partyfinder/PartyEntryListWidget.java | 4 ++-- .../dungeon/partyfinder/PartyFinderScreen.java | 24 +++++++++++----------- .../dungeon/partyfinder/RangedValueWidget.java | 10 ++++----- 6 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src/main/java/de/hysky') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java index e9a1d6da..53875a7d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java @@ -37,11 +37,11 @@ public class FinderSettingsContainer extends ContainerWidget{ @Override public void setDimensionsAndPosition(int width, int height, int x, int y) { super.setDimensionsAndPosition(width, height, x, y); - if (this.floorSelector != null) floorSelector.setPosition(x + width/4-70, y + 20); - if (this.dungeonTypeSelector != null) dungeonTypeSelector.setPosition(x + 3*width/4-70, y + 20); - if (this.sortGroupsSelector != null) sortGroupsSelector.setPosition(x + width/2-70, y + 120); - if (this.classLevelRange != null) classLevelRange.setPosition(x + width/4-50, y + 70); - if (this.dungeonLevelRange != null) dungeonLevelRange.setPosition(x + 3*width/4-50, y + 70); + if (this.floorSelector != null) floorSelector.setPosition(x + width / 4 - 70, y + 20); + if (this.dungeonTypeSelector != null) dungeonTypeSelector.setPosition(x + 3 * width / 4 - 70, y + 20); + if (this.sortGroupsSelector != null) sortGroupsSelector.setPosition(x + width / 2 - 70, y + 120); + if (this.classLevelRange != null) classLevelRange.setPosition(x + width / 4 - 50, y + 70); + if (this.dungeonLevelRange != null) dungeonLevelRange.setPosition(x + 3 * width / 4 - 50, y + 70); } @@ -67,35 +67,35 @@ public class FinderSettingsContainer extends ContainerWidget{ if (name.contains("floor")) { //System.out.println("Floor selector created"); - this.floorSelector = new OptionDropdownWidget(screen, stack.getName(), null, getX() + getWidth()/4-70, getY() + 20, 140, 170, slot.id); + this.floorSelector = new OptionDropdownWidget(screen, stack.getName(), null, getX() + getWidth() / 4 - 70, getY() + 20, 140, 170, slot.id); if (!setSelectedElementFromTooltip(slot, stack, floorSelector)) return false; initializedWidgets.add(floorSelector); } else if (name.contains("dungeon type")) { - this.dungeonTypeSelector = new OptionDropdownWidget(screen, stack.getName(), null, getX() + (3*getWidth())/4-70, getY() + 20, 140, 100, slot.id); + this.dungeonTypeSelector = new OptionDropdownWidget(screen, stack.getName(), null, getX() + (3 * getWidth()) / 4 - 70, getY() + 20, 140, 100, slot.id); if (!setSelectedElementFromTooltip(slot, stack, dungeonTypeSelector)) return false; initializedWidgets.add(dungeonTypeSelector); } else if (name.contains("groups")) { - this.sortGroupsSelector = new OptionDropdownWidget(screen, stack.getName(), null, getX() + getWidth()/2-70, getY() + 120, 140, 100, slot.id); + this.sortGroupsSelector = new OptionDropdownWidget(screen, stack.getName(), null, getX() + getWidth() / 2 - 70, getY() + 120, 140, 100, slot.id); if (!setSelectedElementFromTooltip(slot, stack, sortGroupsSelector)) return false; initializedWidgets.add(sortGroupsSelector); } else if (name.contains("class level")) { - this.classLevelRange = new RangedValueWidget(screen, stack.getName(), getX() + getWidth()/4-50, getY() + 70, 100, slot.id); + this.classLevelRange = new RangedValueWidget(screen, stack.getName(), getX() + getWidth() / 4 - 50, getY() + 70, 100, slot.id); if (!setRangeFromTooltip(stack, classLevelRange)) return false; initializedWidgets.add(classLevelRange); } else if (name.contains("dungeon level")) { - this.dungeonLevelRange = new RangedValueWidget(screen, stack.getName(), getX() + 3*(getWidth())/4-50, getY() + 70, 100, slot.id); + this.dungeonLevelRange = new RangedValueWidget(screen, stack.getName(), getX() + 3 * (getWidth()) / 4 - 50, getY() + 70, 100, slot.id); if (!setRangeFromTooltip(stack, dungeonLevelRange)) return false; initializedWidgets.add(dungeonLevelRange); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java index ff15464b..0ce86d9a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java @@ -86,14 +86,14 @@ public class OptionDropdownWidget extends ElementListWidget { matrices.push(); matrices.translate(0, 0, 200f); context.fill(0, 0, entryWidth, entryHeight, 0x90000000); - context.drawText(textRenderer, lockReason, entryWidth/2 - textRenderer.getWidth(lockReason)/2, entryHeight/2 - textRenderer.fontHeight/2, 0xFFFFFF, true); + context.drawText(textRenderer, lockReason, entryWidth / 2 - textRenderer.getWidth(lockReason) / 2, entryHeight / 2 - textRenderer.fontHeight / 2, 0xFFFFFF, true); matrices.pop(); } @@ -289,7 +289,7 @@ public class PartyEntry extends ElementListWidget.Entry { @Override public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; - context.drawCenteredTextWithShadow(textRenderer, Text.translatable("skyblocker.partyFinder.noParties"), x+entryWidth/2, y+entryHeight/2-textRenderer.fontHeight/2, 0xFFFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, Text.translatable("skyblocker.partyFinder.noParties"), x + entryWidth / 2, y + entryHeight / 2 - textRenderer.fontHeight / 2, 0xFFFFFFFF); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java index 0147f5da..66c23baf 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java @@ -69,7 +69,7 @@ public class PartyEntryListWidget extends ElementListWidget { @Override protected int getScrollbarPositionX() { - return this.width/2 + getRowWidth()/2 + 2; + return this.width / 2 + getRowWidth() / 2 + 2; } @@ -94,7 +94,7 @@ public class PartyEntryListWidget extends ElementListWidget { if (children().isEmpty()) { Text string = Text.translatable("skyblocker.partyFinder.loadingError"); TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; - context.drawTextWrapped(textRenderer, string, getRowLeft(), getY()+10, getRowWidth(), 0xFFFFFFFF); + context.drawTextWrapped(textRenderer, string, getRowLeft(), getY() + 10, getRowWidth(), 0xFFFFFFFF); } else super.renderWidget(context, mouseX, mouseY, delta); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java index a75567b7..eccd234f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java @@ -140,7 +140,7 @@ public class PartyFinderScreen extends Screen { partyEntryListWidget.setRenderBackground(false); // Search field - this.searchField = new TextFieldWidget(textRenderer, partyEntryListWidget.getRowLeft()+12, entryListTopY - 12, partyEntryListWidget.getRowWidth()-12*3-6, 12, Text.literal("Search...")); + this.searchField = new TextFieldWidget(textRenderer, partyEntryListWidget.getRowLeft() + 12, entryListTopY - 12, partyEntryListWidget.getRowWidth() - 12 * 3 - 6, 12, Text.literal("Search...")); searchField.setPlaceholder(SEARCH_TEXT); searchField.setChangedListener(s -> partyEntryListWidget.setSearch(s)); // Refresh button @@ -149,7 +149,7 @@ public class PartyFinderScreen extends Screen { clickAndWaitForServer(refreshSlotId); } }) - .position(searchField.getX() + searchField.getWidth()+12*2, searchField.getY()) + .position(searchField.getX() + searchField.getWidth() + 12 * 2, searchField.getY()) .size(12, 12).build(); refreshButton.active = false; @@ -167,18 +167,18 @@ public class PartyFinderScreen extends Screen { clickAndWaitForServer(nextPageSlotId); } }) - .position(searchField.getX() + searchField.getWidth()+12, searchField.getY()) + .position(searchField.getX() + searchField.getWidth() + 12, searchField.getY()) .size(12, 12).build(); nextPageButton.active = false; // Settings container - if (this.settingsContainer == null) this.settingsContainer = new FinderSettingsContainer(partyEntryListWidget.getRowLeft(), entryListTopY-12, widget_height+12); - else settingsContainer.setDimensionsAndPosition(partyEntryListWidget.getRowWidth()-2, widget_height+12, partyEntryListWidget.getRowLeft(), entryListTopY-12); + if (this.settingsContainer == null) this.settingsContainer = new FinderSettingsContainer(partyEntryListWidget.getRowLeft(), entryListTopY - 12, widget_height + 12); + else settingsContainer.setDimensionsAndPosition(partyEntryListWidget.getRowWidth() - 2, widget_height + 12, partyEntryListWidget.getRowLeft(), entryListTopY - 12); // Buttons at the top int searchButtonMargin = 2; - int searchButtonWidth = (partyEntryListWidget.getRowWidth() + 6) / 3 - 2*searchButtonMargin; + int searchButtonWidth = (partyEntryListWidget.getRowWidth() + 6) / 3 - 2 * searchButtonMargin; partyFinderButton = ButtonWidget.builder(Text.translatable("skyblocker.partyFinder.tabs.partyFinder"), (a) -> { @@ -196,7 +196,7 @@ public class PartyFinderScreen extends Screen { clickAndWaitForServer(settingsButtonSlotId); } }) - .position(partyEntryListWidget.getRowLeft() + searchButtonWidth + 3*searchButtonMargin, entryListTopY - 39) + .position(partyEntryListWidget.getRowLeft() + searchButtonWidth + 3 * searchButtonMargin, entryListTopY - 39) .size(searchButtonWidth, topRowButtonsHeight).build(); createPartyButton = ButtonWidget.builder(Text.translatable("skyblocker.partyFinder.tabs.createParty"), (a) -> { @@ -204,7 +204,7 @@ public class PartyFinderScreen extends Screen { clickAndWaitForServer(createPartyButtonSlotId); } }) - .position(partyEntryListWidget.getRowLeft() + searchButtonWidth*2 + 5*searchButtonMargin, entryListTopY - 39) + .position(partyEntryListWidget.getRowLeft() + searchButtonWidth * 2 + 5 * searchButtonMargin, entryListTopY - 39) .size(searchButtonWidth, topRowButtonsHeight).build(); createPartyButton.active = false; @@ -219,7 +219,7 @@ public class PartyFinderScreen extends Screen { addDrawableChild(settingsButton); addDrawableChild(createPartyButton); addDrawableChild(settingsContainer); - addDrawableChild(ButtonWidget.builder(Text.of("DEBUG"), (a) -> DEBUG = !DEBUG).dimensions(width-40, 0, 40, 20).build()); + addDrawableChild(ButtonWidget.builder(Text.of("DEBUG"), (a) -> DEBUG = !DEBUG).dimensions(width - 40, 0, 40, 20).build()); dirtiedTime = System.currentTimeMillis(); @@ -244,7 +244,7 @@ public class PartyFinderScreen extends Screen { public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); if (searchField.visible) { - context.drawGuiTexture(SEARCH_ICON_TEXTURE, partyEntryListWidget.getRowLeft()+1, searchField.getY()+1, 10, 10); + context.drawGuiTexture(SEARCH_ICON_TEXTURE, partyEntryListWidget.getRowLeft() + 1, searchField.getY() + 1, 10, 10); } if (DEBUG) { context.drawText(textRenderer, "Truly a party finder", 20, 20, 0xFFFFFFFF, true); @@ -258,7 +258,7 @@ public class PartyFinderScreen extends Screen { } if (isWaitingForServer()) { String s = "Waiting for server..."; - context.drawText(textRenderer, s, this.width - textRenderer.getWidth(s) - 5, this.height-textRenderer.fontHeight-2, 0xFFFFFFFF, true); + context.drawText(textRenderer, s, this.width - textRenderer.getWidth(s) - 5, this.height-textRenderer.fontHeight - 2, 0xFFFFFFFF, true); } if (!settingsContainer.canInteract(null)) { context.fill(0, 0, width, height, 50, 0x40000000); @@ -388,7 +388,7 @@ public class PartyFinderScreen extends Screen { } int deListSlotId = -1; List tooltips = null; - for (int i = (handler.getRows()-1) * 9; i < handler.getRows() * 9; i++) { + for (int i = (handler.getRows() - 1) * 9; i < handler.getRows() * 9; i++) { Slot slot = handler.slots.get(i); if (!slot.hasStack()) continue; if (slot.getStack().isOf(Items.EMERALD_BLOCK)) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java index 6e9f615c..85252cab 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java @@ -41,12 +41,12 @@ public class RangedValueWidget extends ContainerWidget { this.screen = screen; this.name = name; - this.input = new ModifiedTextFieldWidget(MinecraftClient.getInstance().textRenderer, x, y+25, width-15, 15, Text.empty()); + this.input = new ModifiedTextFieldWidget(MinecraftClient.getInstance().textRenderer, x, y + 25, width - 15, 15, Text.empty()); this.input.setVisible(false); this.input.setMaxLength(3); input.setChangedListener(this::updateConfirmButton); this.okButton = ButtonWidget.builder(Text.literal("✔"), (a) -> sendPacket()) - .dimensions(x+width-15, y+25, 15, 15) + .dimensions(x + width - 15, y + 25, 15, 15) .build(); this.okButton.visible = false; } @@ -223,14 +223,14 @@ public class RangedValueWidget extends ContainerWidget { public void setX(int x) { super.setX(x); this.input.setX(getX()); - this.okButton.setX(getX()+getWidth()-15); + this.okButton.setX(getX() + getWidth() - 15); } @Override public void setY(int y) { super.setY(y); - this.input.setY(getY()+25); - this.okButton.setY(getY()+ 25); + this.input.setY(getY() + 25); + this.okButton.setY(getY() + 25); } public enum State { -- cgit