From 34e4eff0c2c6bdccead09f48d7081980a2dd5da6 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Fri, 18 Aug 2023 18:31:35 +0800
Subject: Use ObjectIntPair
---
.../skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java | 12 ++++++------
.../skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'src/main/java/me')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java
index 0043fc77..61878033 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java
@@ -1,8 +1,8 @@
package me.xmrvizzy.skyblocker.skyblock.dungeon.secrets;
import com.google.gson.JsonObject;
-import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.ints.IntSortedSet;
+import it.unimi.dsi.fastutil.objects.ObjectIntPair;
import net.minecraft.block.MapColor;
import net.minecraft.item.map.MapIcon;
import net.minecraft.item.map.MapState;
@@ -52,7 +52,7 @@ public class DungeonMapUtils {
}
@Nullable
- public static Pair<Vector2ic, Integer> getMapEntrancePosAndRoomSize(@NotNull MapState map) {
+ public static ObjectIntPair<Vector2ic> getMapEntrancePosAndRoomSize(@NotNull MapState map) {
Vector2ic mapPos = getMapPlayerPos(map);
Queue<Vector2ic> posToCheck = new ArrayDeque<>();
Set<Vector2ic> checked = new HashSet<>();
@@ -60,8 +60,8 @@ public class DungeonMapUtils {
checked.add(mapPos);
while ((mapPos = posToCheck.poll()) != null) {
if (isEntranceColor(map, mapPos)) {
- Pair<Vector2ic, Integer> mapEntranceAndRoomSizePos = getMapEntrancePosAndRoomSizeAt(map, mapPos);
- if (mapEntranceAndRoomSizePos.right() > 0) {
+ ObjectIntPair<Vector2ic> mapEntranceAndRoomSizePos = getMapEntrancePosAndRoomSizeAt(map, mapPos);
+ if (mapEntranceAndRoomSizePos.rightInt() > 0) {
return mapEntranceAndRoomSizePos;
}
}
@@ -85,7 +85,7 @@ public class DungeonMapUtils {
return null;
}
- private static Pair<Vector2ic, Integer> getMapEntrancePosAndRoomSizeAt(MapState map, Vector2ic mapPosImmutable) {
+ private static ObjectIntPair<Vector2ic> getMapEntrancePosAndRoomSizeAt(MapState map, Vector2ic mapPosImmutable) {
Vector2i mapPos = new Vector2i(mapPosImmutable);
// noinspection StatementWithEmptyBody
while (isEntranceColor(map, mapPos.sub(1, 0))) {
@@ -94,7 +94,7 @@ public class DungeonMapUtils {
//noinspection StatementWithEmptyBody
while (isEntranceColor(map, mapPos.sub(0, 1))) {
}
- return Pair.of(mapPos.add(0, 1), getMapRoomSize(map, mapPos));
+ return ObjectIntPair.of(mapPos.add(0, 1), getMapRoomSize(map, mapPos));
}
public static int getMapRoomSize(MapState map, Vector2ic mapEntrancePos) {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
index db1db452..889c2829 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
@@ -3,9 +3,9 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon.secrets;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.objects.Object2ByteMap;
import it.unimi.dsi.fastutil.objects.Object2ByteOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectIntPair;
import me.xmrvizzy.skyblocker.SkyblockerMod;
import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
import me.xmrvizzy.skyblocker.utils.Utils;
@@ -238,12 +238,12 @@ public class DungeonSecrets {
return;
}
if (mapEntrancePos == null || mapRoomSize == 0) {
- Pair<Vector2ic, Integer> mapEntrancePosAndSize = DungeonMapUtils.getMapEntrancePosAndRoomSize(map);
+ ObjectIntPair<Vector2ic> mapEntrancePosAndSize = DungeonMapUtils.getMapEntrancePosAndRoomSize(map);
if (mapEntrancePosAndSize == null) {
return;
}
mapEntrancePos = mapEntrancePosAndSize.left();
- mapRoomSize = mapEntrancePosAndSize.right();
+ mapRoomSize = mapEntrancePosAndSize.rightInt();
LOGGER.info("[Skyblocker] Started dungeon with map room size {}, map entrance pos {}, player pos {}, and physical entrance pos {}", mapRoomSize, mapEntrancePos, client.player.getPos(), physicalEntrancePos);
}
--
cgit