Merge pull request #299 from KosmX/login_emote_sync

KosmX · web-flow · commit 2979cbdc8ed3 · 2022-08-15T14:25:53.000+02:00
Login emote sync + another forge API crash fix
diff --git a/16/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/types/GettersImpl.java b/16/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/types/GettersImpl.java
@@ -9,6 +9,7 @@
 public class GettersImpl implements IGetters {
     @Override
     public IEmotePlayerEntity getPlayerFromUUID(UUID uuid) {
+        if (Minecraft.getInstance().level == null) return null;
         return (IEmotePlayerEntity) Minecraft.getInstance().level.getPlayerByUUID(uuid);
     }
 }
diff --git a/16/fabric/src/main/java/io/github/kosmx/emotes/fabric/mixin/ServerPlayNetworkInstance.java b/16/fabric/src/main/java/io/github/kosmx/emotes/fabric/mixin/ServerPlayNetworkInstance.java
@@ -7,9 +7,11 @@
 import io.github.kosmx.emotes.server.network.EmotePlayTracker;
 import io.github.kosmx.emotes.server.network.IServerNetworkInstance;
 import io.netty.buffer.Unpooled;
+import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -24,6 +26,7 @@ public abstract class ServerPlayNetworkInstance implements IServerNetworkInstanc
     private final EmotePlayTracker emoteTracker = new EmotePlayTracker();
     @Shadow public abstract void send(Packet<?> packet);
 
+    @Shadow public ServerPlayer player;
     HashMap<Byte, Byte> versions = new HashMap<>();
     @Override
     public HashMap<Byte, Byte> getRemoteVersions() {
@@ -65,6 +68,14 @@ public void sendConfigCallback() {
         }
     }
 
+    @Override
+    public void presenceResponse() {
+        IServerNetworkInstance.super.presenceResponse();
+        for (ServerPlayer player : PlayerLookup.tracking(this.player)) {
+            ServerNetwork.getInstance().playerStartTracking(player, this.player);
+        }
+    }
+
     @Override
     public boolean isActive() {
         return false;
diff --git a/16/forge/src/main/java/io/github/kosmx/emotes/forge/mixin/ServerPlayNetworkInstance.java b/16/forge/src/main/java/io/github/kosmx/emotes/forge/mixin/ServerPlayNetworkInstance.java
@@ -62,6 +62,12 @@ public void sendConfigCallback() {
         }
     }
 
+    @Override
+    public void presenceResponse() {
+        IServerNetworkInstance.super.presenceResponse();
+        ServerNetwork.sendConsumer(this.player, otherPlayer -> ServerNetwork.getInstance().playerStartTracking(otherPlayer, ServerPlayNetworkInstance.this.player));
+    }
+
     @Override
     public boolean isActive() {
         return false;
diff --git a/16/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java b/16/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java
@@ -174,13 +174,13 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {
         try {
             PacketDistributor.PLAYER.with(() -> (ServerPlayer) player.getCommandSenderWorld().getPlayerByUUID(target)).send(newS2CEmotesPacket(data, (ServerPlayer) player));
         }
-        catch (IOException e){
+        catch (IOException|RuntimeException e){
             e.printStackTrace();
         }
     }
 
-    private void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
+    public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
         TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());
-        tracker.getPlayersTracking().stream().forEach(consumer);
+        tracker.getPlayersTracking().forEach(consumer);
     }
 }
diff --git a/18/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/types/GettersImpl.java b/18/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/types/GettersImpl.java
@@ -9,6 +9,7 @@
 public class GettersImpl implements IGetters {
     @Override
     public IEmotePlayerEntity getPlayerFromUUID(UUID uuid) {
+        if (Minecraft.getInstance().level == null) return null;
         return (IEmotePlayerEntity) Minecraft.getInstance().level.getPlayerByUUID(uuid);
     }
 }
diff --git a/18/fabric/src/main/java/io/github/kosmx/emotes/fabric/mixin/ServerPlayNetworkInstance.java b/18/fabric/src/main/java/io/github/kosmx/emotes/fabric/mixin/ServerPlayNetworkInstance.java
@@ -7,9 +7,11 @@
 import io.github.kosmx.emotes.server.network.EmotePlayTracker;
 import io.github.kosmx.emotes.server.network.IServerNetworkInstance;
 import io.netty.buffer.Unpooled;
+import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -25,6 +27,8 @@ public abstract class ServerPlayNetworkInstance implements IServerNetworkInstanc
     private final EmotePlayTracker emoteTracker = new EmotePlayTracker();
     @Shadow public abstract void send(Packet<?> packet);
 
+    @Shadow public abstract ServerPlayer getPlayer();
+
     HashMap<Byte, Byte> versions = new HashMap<>();
     @Override
     public HashMap<Byte, Byte> getRemoteVersions() {
@@ -66,6 +70,14 @@ public void sendConfigCallback() {
         }
     }
 
+    @Override
+    public void presenceResponse() {
+        IServerNetworkInstance.super.presenceResponse();
+        for (ServerPlayer player : PlayerLookup.tracking(this.getPlayer())) {
+            ServerNetwork.getInstance().playerStartTracking(player, this.getPlayer());
+        }
+    }
+
     @Override
     public boolean isActive() {
         return true;
diff --git a/18/forge/src/main/java/io/github/kosmx/emotes/forge/mixin/ServerPlayNetworkInstance.java b/18/forge/src/main/java/io/github/kosmx/emotes/forge/mixin/ServerPlayNetworkInstance.java
@@ -67,6 +67,12 @@ public void sendConfigCallback() {
         }
     }
 
+    @Override
+    public void presenceResponse() {
+        IServerNetworkInstance.super.presenceResponse();
+        ServerNetwork.sendConsumer(this.player, otherPlayer -> ServerNetwork.getInstance().playerStartTracking(otherPlayer, ServerPlayNetworkInstance.this.player));
+    }
+
     @Override
     public boolean isActive() {
         return false;
diff --git a/18/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java b/18/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java
@@ -174,12 +174,12 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {
         try {
             PacketDistributor.PLAYER.with(() -> (ServerPlayer) player.getCommandSenderWorld().getPlayerByUUID(target)).send(newS2CEmotesPacket(data, (ServerPlayer) player));
         }
-        catch (IOException e){
+        catch (IOException|RuntimeException e){
             e.printStackTrace();
         }
     }
 
-    private void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
+    public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
         TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());
         tracker.getPlayersTracking().forEach(serverPlayerConnection -> consumer.accept(serverPlayerConnection.getPlayer()));
     }
diff --git a/19/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/types/GettersImpl.java b/19/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/types/GettersImpl.java
@@ -9,6 +9,7 @@
 public class GettersImpl implements IGetters {
     @Override
     public IEmotePlayerEntity getPlayerFromUUID(UUID uuid) {
+        if (Minecraft.getInstance().level == null) return null;
         return (IEmotePlayerEntity) Minecraft.getInstance().level.getPlayerByUUID(uuid);
     }
 }
diff --git a/19/fabric/src/main/java/io/github/kosmx/emotes/fabric/mixin/ServerPlayNetworkInstance.java b/19/fabric/src/main/java/io/github/kosmx/emotes/fabric/mixin/ServerPlayNetworkInstance.java
@@ -7,9 +7,11 @@
 import io.github.kosmx.emotes.server.network.EmotePlayTracker;
 import io.github.kosmx.emotes.server.network.IServerNetworkInstance;
 import io.netty.buffer.Unpooled;
+import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -25,6 +27,8 @@ public abstract class ServerPlayNetworkInstance implements IServerNetworkInstanc
     private final EmotePlayTracker emoteTracker = new EmotePlayTracker();
     @Shadow public abstract void send(Packet<?> packet);
 
+    @Shadow public abstract ServerPlayer getPlayer();
+
     HashMap<Byte, Byte> versions = new HashMap<>();
     @Override
     public HashMap<Byte, Byte> getRemoteVersions() {
@@ -66,6 +70,14 @@ public void sendConfigCallback() {
         }
     }
 
+    @Override
+    public void presenceResponse() {
+        IServerNetworkInstance.super.presenceResponse();
+        for (ServerPlayer player : PlayerLookup.tracking(this.getPlayer())) {
+                ServerNetwork.getInstance().playerStartTracking(player, this.getPlayer());
+        }
+    }
+
     @Override
     public boolean isActive() {
         return true;
diff --git a/19/forge/src/main/java/io/github/kosmx/emotes/forge/mixin/ServerPlayNetworkInstance.java b/19/forge/src/main/java/io/github/kosmx/emotes/forge/mixin/ServerPlayNetworkInstance.java
@@ -22,6 +22,9 @@ public abstract class ServerPlayNetworkInstance implements IServerNetworkInstanc
     @Shadow public abstract void send(Packet<?> packet);
 
     @Shadow public ServerPlayer player;
+
+    @Shadow public abstract ServerPlayer getPlayer();
+
     HashMap<Byte, Byte> versions = new HashMap<>();
     @Override
     public HashMap<Byte, Byte> getRemoteVersions() {
@@ -60,6 +63,12 @@ public void sendConfigCallback() {
         }
     }
 
+    @Override
+    public void presenceResponse() {
+        IServerNetworkInstance.super.presenceResponse();
+        ServerNetwork.sendConsumer(this.getPlayer(), otherPlayer -> ServerNetwork.getInstance().playerStartTracking(otherPlayer, ServerPlayNetworkInstance.this.player));
+    }
+
     @Override
     public boolean isActive() {
         return false;
diff --git a/19/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java b/19/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java
@@ -175,12 +175,12 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {
         try {
             PacketDistributor.PLAYER.with(() -> (ServerPlayer) player.getCommandSenderWorld().getPlayerByUUID(target)).send(newS2CEmotesPacket(data, (ServerPlayer) player));
         }
-        catch (IOException e){
+        catch (IOException|RuntimeException e){
             e.printStackTrace();
         }
     }
 
-    private void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
+    public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
         TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());
         tracker.getPlayersTracking().forEach(serverPlayerConnection -> consumer.accept(serverPlayerConnection.getPlayer()));
     }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`public class GettersImpl implements IGetters {`
`10`	`10`	`@Override`
`11`	`11`	`public IEmotePlayerEntity getPlayerFromUUID(UUID uuid) {`
	`12`	`+ if (Minecraft.getInstance().level == null) return null;`
`12`	`13`	`return (IEmotePlayerEntity) Minecraft.getInstance().level.getPlayerByUUID(uuid);`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,12 @@ public void sendConfigCallback() {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ @Override`
	`66`	`+ public void presenceResponse() {`
	`67`	`+ IServerNetworkInstance.super.presenceResponse();`
	`68`	`+ ServerNetwork.sendConsumer(this.player, otherPlayer -> ServerNetwork.getInstance().playerStartTracking(otherPlayer, ServerPlayNetworkInstance.this.player));`
	`69`	`+ }`
	`70`	`+`
`65`	`71`	`@Override`
`66`	`72`	`public boolean isActive() {`
`67`	`73`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -174,13 +174,13 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {`
`174`	`174`	`try {`
`175`	`175`	`PacketDistributor.PLAYER.with(() -> (ServerPlayer) player.getCommandSenderWorld().getPlayerByUUID(target)).send(newS2CEmotesPacket(data, (ServerPlayer) player));`
`176`	`176`	`}`
`177`		`- catch (IOException e){`
	`177`	`+ catch (IOException\|RuntimeException e){`
`178`	`178`	`e.printStackTrace();`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`182`		`- private void sendConsumer(Player player, Consumer<ServerPlayer> consumer){`
	`182`	`+ public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){`
`183`	`183`	`TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());`
`184`		`- tracker.getPlayersTracking().stream().forEach(consumer);`
	`184`	`+ tracker.getPlayersTracking().forEach(consumer);`
`185`	`185`	`}`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,12 @@ public void sendConfigCallback() {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ @Override`
	`71`	`+ public void presenceResponse() {`
	`72`	`+ IServerNetworkInstance.super.presenceResponse();`
	`73`	`+ ServerNetwork.sendConsumer(this.player, otherPlayer -> ServerNetwork.getInstance().playerStartTracking(otherPlayer, ServerPlayNetworkInstance.this.player));`
	`74`	`+ }`
	`75`	`+`
`70`	`76`	`@Override`
`71`	`77`	`public boolean isActive() {`
`72`	`78`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -174,12 +174,12 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {`
`174`	`174`	`try {`
`175`	`175`	`PacketDistributor.PLAYER.with(() -> (ServerPlayer) player.getCommandSenderWorld().getPlayerByUUID(target)).send(newS2CEmotesPacket(data, (ServerPlayer) player));`
`176`	`176`	`}`
`177`		`- catch (IOException e){`
	`177`	`+ catch (IOException\|RuntimeException e){`
`178`	`178`	`e.printStackTrace();`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`182`		`- private void sendConsumer(Player player, Consumer<ServerPlayer> consumer){`
	`182`	`+ public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){`
`183`	`183`	`TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());`
`184`	`184`	`tracker.getPlayersTracking().forEach(serverPlayerConnection -> consumer.accept(serverPlayerConnection.getPlayer()));`
`185`	`185`	`}`