fix space station world border

Argent-Matter · Aug 26, 2024 · 535dd7b · 535dd7b
1 parent fbe16cc
commit 535dd7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java b/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java
@@ -92,12 +92,11 @@ public BlockPos getStationWorldPos(int id) {
 
     @Override
     public List<Integer> getStationsNearPos(Vec2i position, int range) {
-        return stations.int2ObjectEntrySet().stream().filter(obj -> obj.getValue().position().distanceToSqr(position) <= range * range).sorted(Map.Entry.comparingByKey()).map(Int2ObjectMap.Entry::getIntKey).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<Integer> getStationsNearWorldPos(BlockPos position, int range) {
-        return stations.int2ObjectEntrySet().stream().filter(obj -> obj.getValue().position().distanceToBlockSqr(position) <= range * range).sorted(Map.Entry.comparingByKey()).map(Int2ObjectMap.Entry::getIntKey).collect(Collectors.toList());
+        return stations.int2ObjectEntrySet().stream()
+                .filter(obj -> obj.getValue().position().distanceToSqr(position) <= range * range)
+                .sorted(Map.Entry.comparingByKey())
+                .map(Int2ObjectMap.Entry::getIntKey)
+                .collect(Collectors.toList());
     }
 
     @Override

diff --git a/src/main/java/argent_matter/gcyr/util/Vec2i.java b/src/main/java/argent_matter/gcyr/util/Vec2i.java
@@ -1,9 +1,7 @@
 package argent_matter.gcyr.util;
 
-import argent_matter.gcyr.api.space.station.SpaceStation;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.core.BlockPos;
 import org.jetbrains.annotations.NotNull;
 
 public record Vec2i(int x, int y) implements Comparable<Vec2i> {
@@ -22,12 +20,6 @@ public int distanceToSqr(Vec2i other) {
         return f * f + g * g;
     }
 
-    public int distanceToBlockSqr(BlockPos other) {
-        int f = other.getX() - (this.x * SpaceStation.BLOCK_MULTIPLIER - (SpaceStation.BLOCK_MULTIPLIER / 2));
-        int g = other.getZ() - (this.y * SpaceStation.BLOCK_MULTIPLIER - (SpaceStation.BLOCK_MULTIPLIER / 2));
-        return f * f + g * g;
-    }
-
     @Override
     public int compareTo(@NotNull Vec2i other) {
         return this.x == other.x ? this.y - other.y : this.x - other.x;