aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java24
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java14
2 files changed, 19 insertions, 19 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
index 4dcdf5c1..8e9f0b26 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -1,5 +1,13 @@
package me.xmrvizzy.skyblocker.skyblock.dwarven;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import it.unimi.dsi.fastutil.ints.IntIntPair;
import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget;
import me.xmrvizzy.skyblocker.utils.Scheduler;
@@ -10,14 +18,6 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
-import net.minecraft.util.Pair;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
public class DwarvenHud {
@@ -57,21 +57,21 @@ public class DwarvenHud {
});
}
- public static Pair<Integer, Integer> getDimForConfig(List<Commission> commissions) {
+ public static IntIntPair getDimForConfig(List<Commission> commissions) {
switch (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.style) {
case SIMPLE:
HudCommsWidget.INSTANCE_CFG.updateData(commissions, false);
- return new Pair<Integer, Integer>(
+ return IntIntPair.of(
HudCommsWidget.INSTANCE_CFG.getWidth(),
HudCommsWidget.INSTANCE_CFG.getHeight());
case FANCY :
HudCommsWidget.INSTANCE_CFG.updateData(commissions, true);
- return new Pair<Integer, Integer>(
+ return IntIntPair.of(
HudCommsWidget.INSTANCE_CFG.getWidth(),
HudCommsWidget.INSTANCE_CFG.getHeight());
case CLASSIC:
default:
- return new Pair<Integer, Integer>(200, 20 * commissions.size());
+ return IntIntPair.of(200, 20 * commissions.size());
}
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
index e7db0a66..d3c0fa76 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -3,6 +3,7 @@ package me.xmrvizzy.skyblocker.skyblock.dwarven;
import java.awt.Color;
import java.util.List;
+import it.unimi.dsi.fastutil.ints.IntIntPair;
import me.shedaniel.autoconfig.AutoConfig;
import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud.Commission;
@@ -11,7 +12,6 @@ import me.xmrvizzy.skyblocker.utils.RenderUtils;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.Text;
-import net.minecraft.util.Pair;
public class DwarvenHudConfigScreen extends Screen {
@@ -34,10 +34,10 @@ public class DwarvenHudConfigScreen extends Screen {
@Override
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
- Pair<Integer, Integer> dims = DwarvenHud.getDimForConfig(CFG_COMMS);
+ IntIntPair dims = DwarvenHud.getDimForConfig(CFG_COMMS);
if (RenderUtils.pointExistsInArea((int) mouseX, (int) mouseY, hudX, hudY, hudX + 200, hudY + 40) && button == 0) {
- hudX = (int) Math.max(Math.min(mouseX - dims.getLeft()/2, this.width - dims.getLeft()), 0);
- hudY = (int) Math.max(Math.min(mouseY - dims.getRight()/2, this.height - dims.getRight()), 0);
+ hudX = (int) Math.max(Math.min(mouseX - dims.leftInt()/2, this.width - dims.leftInt()), 0);
+ hudY = (int) Math.max(Math.min(mouseY - dims.rightInt()/2, this.height - dims.rightInt()), 0);
}
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
}
@@ -45,9 +45,9 @@ public class DwarvenHudConfigScreen extends Screen {
@Override
public boolean mouseClicked(double mouseX, double mouseY, int button) {
if (button == 1) {
- Pair<Integer, Integer> dims = DwarvenHud.getDimForConfig(CFG_COMMS);
- hudX = this.width / 2 - dims.getLeft();
- hudY = this.height / 2 - dims.getRight();
+ IntIntPair dims = DwarvenHud.getDimForConfig(CFG_COMMS);
+ hudX = this.width / 2 - dims.leftInt();
+ hudY = this.height / 2 - dims.rightInt();
}
return super.mouseClicked(mouseX, mouseY, button);
}