ExoSkye/OpenProximityChat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move inner classes out of Stage1HandshakeBuilder and into their own files

Browse Source
This commit is contained in:
Kai 2022-10-25 07:54:31 +00:00
parent 14de421c44
commit 32c19e7e73
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/muellerssoftware/openproximitychatfabric/connect/ConnectionFilterType.java Normal file
View File

@ -0,0 +1,6 @@
package org.muellerssoftware.openproximitychatfabric.connect;
public enum ConnectionFilterType {
Friend,
Everyone
}

20
src/main/java/org/muellerssoftware/openproximitychatfabric/connect/Stage1Handshake.java Normal file
View File

@ -0,0 +1,20 @@
package org.muellerssoftware.openproximitychatfabric.connect;
import net.minecraft.entity.player.PlayerEntity;
public class Stage1Handshake {
Stage1Handshake(ConnectionFilterType type, PlayerEntity player) {
this.filterType = type;
this.player = player;
}
private final ConnectionFilterType filterType;
private final PlayerEntity player;
public PlayerEntity getPlayer() {
return player;
}
public ConnectionFilterType getFilterType() {
return filterType;
}
}

34
src/main/java/org/muellerssoftware/openproximitychatfabric/connect/Stage1HandshakeBuilder.java
View File

@ -24,25 +24,7 @@ public class Stage1HandshakeBuilder {
}
}
public enum ConnectionFilterType {
Friend,
Everyone
}
public static class Stage1Handshake {
private ConnectionFilterType filterType;
private PlayerEntity player;
public PlayerEntity getPlayer() {
return player;
}
public ConnectionFilterType getFilterType() {
return filterType;
}
}
private ArrayList<Movement> movements = new ArrayList<>();
private final ArrayList<Movement> movements = new ArrayList<>();
private PlayerEntity player;
private static final Movement[] MAGIC_MOVES = {
@ -97,16 +79,20 @@ public class Stage1HandshakeBuilder {
if (handshake != null) {
OPCFabric.LOGGER.debug("Found handshake in {}'s head movements", this.player.getName().asTruncatedString(64));
Stage1Handshake output = new Stage1Handshake();
ConnectionFilterType filterType;
PlayerEntity player;
if (Arrays.equals(handshake.subList(6, 8).toArray(), FRIENDSHIP_MOVES)) {
output.filterType = ConnectionFilterType.Friend;
filterType = ConnectionFilterType.Friend;
}
else if (Arrays.equals(handshake.subList(6, 8).toArray(), OMNIFRIEND_MOVES)){
output.filterType = ConnectionFilterType.Everyone;
filterType = ConnectionFilterType.Everyone;
}
else {
return null;
}
if (this.player != null) {
output.player = this.player;
player = this.player;
}
else {
throw new HandshakeException("Player not set in Stage 1 Handshake");
@ -127,7 +113,7 @@ public class Stage1HandshakeBuilder {
return null;
}
else {
return output;
return new Stage1Handshake(filterType, player);
}
}
else {