diff --git a/src/main/java/arzumify/networked/impl/BasePresence.java b/src/main/java/arzumify/networked/impl/BasePresence.java index f1172c8..471843d 100644 --- a/src/main/java/arzumify/networked/impl/BasePresence.java +++ b/src/main/java/arzumify/networked/impl/BasePresence.java @@ -1,17 +1,18 @@ package arzumify.networked.impl; import arzumify.presence.maths.Vec3i; +import arzumify.presence.presences.IntegerPresence; import arzumify.presence.presences.Presence; import arzumify.presence.presences.PresenceProvider; -public class BasePresence implements PresenceProvider { +public class BasePresence implements PresenceProvider { public BasePresence(short range, Vec3i... points) { this.presence = new ModifiablePresence(range, points); } public final ModifiablePresence presence; - public Presence presence() { + public Presence presence() { return this.presence; } } diff --git a/src/main/java/arzumify/networked/impl/MatchMaker.java b/src/main/java/arzumify/networked/impl/MatchMaker.java index 20211b2..0161446 100644 --- a/src/main/java/arzumify/networked/impl/MatchMaker.java +++ b/src/main/java/arzumify/networked/impl/MatchMaker.java @@ -1,8 +1,9 @@ package arzumify.networked.impl; import arzumify.presence.matchmaker.Channel; +import arzumify.presence.presences.IntegerPresence; public class MatchMaker { - public static arzumify.presence.matchmaker.MatchMaker matchMaker = new arzumify.presence.matchmaker.MatchMaker<>(); + public static arzumify.presence.matchmaker.MatchMaker matchMaker = new arzumify.presence.matchmaker.MatchMaker<>(); public static final Channel networkDiscovery = new Channel(); } diff --git a/src/main/java/arzumify/networked/impl/ModifiablePresence.java b/src/main/java/arzumify/networked/impl/ModifiablePresence.java index b6136d0..2a4abbd 100644 --- a/src/main/java/arzumify/networked/impl/ModifiablePresence.java +++ b/src/main/java/arzumify/networked/impl/ModifiablePresence.java @@ -2,12 +2,14 @@ package arzumify.networked.impl; import arzumify.presence.maths.Vec2i; import arzumify.presence.maths.Vec3i; +import arzumify.presence.presences.IntegerPresence; import arzumify.presence.presences.Presence; import java.util.*; -public class ModifiablePresence implements Presence { +public class ModifiablePresence extends IntegerPresence implements Presence { public ModifiablePresence(short range, Vec3i... basePositions) { + super(range, basePositions); this.basePositions.addAll(List.of(basePositions)); this.range = range; this.baseChunkPresence = getChunkPresence(this.basePositions); @@ -35,7 +37,7 @@ public class ModifiablePresence implements Presence { } @Override - public boolean Matches(Presence presence) { + public boolean Matches(Presence presence) { return presence instanceof ModifiablePresence && matches((ModifiablePresence) presence); } @@ -54,10 +56,6 @@ public class ModifiablePresence implements Presence { return false; } - public int ManhattanDistance(Vec3i a, Vec3i b) { - return Math.abs(a.x() - b.x()) + Math.abs(a.y() - b.y()) + Math.abs(a.z() - b.z()); - } - private static final Map> cachedCollisionShapes = new HashMap<>(); private static HashSet ComputeCollisionShape(short range, Set basePositions) {