aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-01-14 00:40:31 -0500
committerAaron <51387595+AzureAaron@users.noreply.github.com>2024-01-14 00:40:31 -0500
commit4900c795e355fc30023b4eb56b47259394c3fe6d (patch)
tree576331928f4b095be3ca181f2e0ea30e31fd135a /src/main/java/de/hysky/skyblocker/skyblock
parent48a61ba65eece0f34cd4f5d4a67ae14ea5de1e0d (diff)
downloadSkyblocker-4900c795e355fc30023b4eb56b47259394c3fe6d.tar.gz
Skyblocker-4900c795e355fc30023b4eb56b47259394c3fe6d.tar.bz2
Skyblocker-4900c795e355fc30023b4eb56b47259394c3fe6d.zip
Reformat math
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java20
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java18
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java24
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java10
6 files changed, 40 insertions, 40 deletions
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<OptionDropdownWidget
@Override
protected void renderHeader(DrawContext context, int x, int y) {
- context.drawText(MinecraftClient.getInstance().textRenderer, name, x, y+1, 0xFFD0D0D0, false);
+ context.drawText(MinecraftClient.getInstance().textRenderer, name, x, y + 1, 0xFFD0D0D0, false);
int offset = 10;
- context.fill(x-2, y + offset, x - 3 + getWidth(), y + 15 + offset, 0xFFF0F0F0);
- context.fill(x-1, y+1+offset, x-3 + getWidth()-1, y + 14 + offset, 0xFF000000);
+ context.fill(x - 2, y + offset, x - 3 + getWidth(), y + 15 + offset, 0xFFF0F0F0);
+ context.fill(x - 1, y + 1 + offset, x - 3 + getWidth() - 1, y + 14 + offset, 0xFF000000);
if (selectedOption != null) {
- context.drawText(MinecraftClient.getInstance().textRenderer, selectedOption.message, x+2, y+3+offset, 0xFFFFFFFF, true);
+ context.drawText(MinecraftClient.getInstance().textRenderer, selectedOption.message, x + 2, y + 3 + offset, 0xFFFFFFFF, true);
}
- else context.drawText(MinecraftClient.getInstance().textRenderer, "???", x+2, y+3+offset, 0xFFFFFFFF, true);
+ else context.drawText(MinecraftClient.getInstance().textRenderer, "???", x + 2, y + 3 + offset, 0xFFFFFFFF, true);
}
@Override
@@ -109,10 +109,10 @@ public class OptionDropdownWidget extends ElementListWidget<OptionDropdownWidget
context.drawText(MinecraftClient.getInstance().textRenderer, String.valueOf(backButtonId), getX() + 50, getY() - 10, 0xFFFF0000, true);
}
- int height1 = Math.min(getHeight(), getEntryCount()*itemHeight+4);
+ int height1 = Math.min(getHeight(), getEntryCount() * itemHeight + 4);
int idk = isOpen ? (int) (height1 * animationProgress) : (int) (height1 * (1 - animationProgress));
- context.fill(getX(), getY() + headerHeight, getX() + getWidth()-1, getY() + idk + headerHeight, 0xFFE0E0E0);
- context.fill(getX()+1, getY()+headerHeight+1, getX() + getWidth()-2, getY() + idk + headerHeight - 1, 0xFF000000);
+ context.fill(getX(), getY() + headerHeight, getX() + getWidth() - 1, getY() + idk + headerHeight, 0xFFE0E0E0);
+ context.fill(getX() + 1, getY() + headerHeight + 1, getX() + getWidth() - 2, getY() + idk + headerHeight - 1, 0xFF000000);
super.renderWidget(context, mouseX, mouseY, delta);
if (isOpen) {
@@ -171,7 +171,7 @@ public class OptionDropdownWidget extends ElementListWidget<OptionDropdownWidget
matrices.translate(-x, -iconY, 0);
context.drawItem(icon, x, iconY);
matrices.pop();
- if (PartyFinderScreen.DEBUG) context.drawText(MinecraftClient.getInstance().textRenderer, String.valueOf(optionSlotId), x+8, y, 0xFFFF0000, true);
+ if (PartyFinderScreen.DEBUG) context.drawText(MinecraftClient.getInstance().textRenderer, String.valueOf(optionSlotId), x + 8, y, 0xFFFF0000, true);
context.drawText(MinecraftClient.getInstance().textRenderer, Text.literal(message).fillStyle(Style.EMPTY.withUnderline(hovered)), x + 14, y + 3, 0xFFFFFFFF, false);
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
index d9c69933..fb6ac441 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
@@ -236,7 +236,7 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> {
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<PartyEntry> {
@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<PartyEntry> {
@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<PartyEntry> {
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<Text> 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 {