1.0.1

Author: samolego

README.md

@@ -4,6 +4,6 @@
 [![Server environment](https://img.shields.io/badge/Environment-server-blue?style=flat-square)](https://github.com/samolego/Taterzens)
 [![Singleplayer environment](https://img.shields.io/badge/Environment-singleplayer-yellow?style=flat-square)](https://github.com/samolego/Taterzens)
 
-A fabric citizens attempt.
+A fabric / forge citizens attempt.
 
 You can find documentation [here](https://samolego.github.io/Taterzens/).

common/src/main/java/org/samo_lego/taterzens/mixin/ServerPlayNetworkHandlerMixin_PacketFaker.java

@@ -27,9 +27,10 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.Collections;
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static net.minecraft.network.packet.s2c.play.PlayerListS2CPacket.Action.ADD_PLAYER;
 import static net.minecraft.network.packet.s2c.play.PlayerListS2CPacket.Action.REMOVE_PLAYER;
@@ -42,14 +43,15 @@
 public abstract class ServerPlayNetworkHandlerMixin_PacketFaker {
 
     @Shadow public ServerPlayerEntity player;
+
+    @Shadow public abstract void sendPacket(Packet<?> packet);
+
     @Unique
     private boolean taterzens$skipCheck;
     @Unique
-    private final HashSet<PlayerListS2CPacket> taterzens$tablistQueue = new HashSet<>();
+    private final List<TaterzenNPC> taterzens$tablistQueue = new ArrayList<TaterzenNPC>();
     private int taterzens$queueTimer;
 
-    @Shadow public abstract void sendPacket(Packet<?> packet);
-
     /**
      * Changes entity type if entity is an instance of {@link TaterzenNPC}.
      *
@@ -78,9 +80,7 @@ private void changeEntityType(Packet<?> packet, GenericFutureListener<? extends
             PlayerListS2CPacket playerAddPacket = new PlayerListS2CPacket(ADD_PLAYER);
             //noinspection ConstantConditions
             ((PlayerListS2CPacketAccessor) playerAddPacket).setEntries(
-                    Collections.singletonList(
-                            playerAddPacket.new Entry(profile, 0, GameMode.SURVIVAL, npc.getName())
-                    )
+                    Arrays.asList(playerAddPacket.new Entry(profile, 0, GameMode.SURVIVAL, npc.getName()))
             );
             taterzens$skipCheck = true;
             this.sendPacket(playerAddPacket);
@@ -91,18 +91,12 @@ playerAddPacket.new Entry(profile, 0, GameMode.SURVIVAL, npc.getName())
             this.sendPacket(packet);
 
             PlayerListS2CPacket playerRemovePacket = new PlayerListS2CPacket(REMOVE_PLAYER);
-            //noinspection ConstantConditions
-            ((PlayerListS2CPacketAccessor) playerRemovePacket).setEntries(
-                    Collections.singletonList(
-                            playerRemovePacket.new Entry(profile, 0, GameMode.SURVIVAL, npc.getName())
-                    )
-            );
             // And now we can remove it from tablist
             // we must delay the tablist packet so as to allow
             // the client to fetch skin.
             // If player is immediately removed from the tablist,
             // client doesn't care about the skin.
-            this.taterzens$tablistQueue.add(playerRemovePacket);
+            this.taterzens$tablistQueue.add(npc);
             this.taterzens$queueTimer = config.taterzenTablistTimeout;
 
             this.taterzens$skipCheck = false;
@@ -123,8 +117,23 @@ playerRemovePacket.new Entry(profile, 0, GameMode.SURVIVAL, npc.getName())
     private void removeTaterzenFromTablist(PlayerMoveC2SPacket packet, CallbackInfo ci) {
         if(!this.taterzens$tablistQueue.isEmpty() && --this.taterzens$queueTimer == 0) {
             this.taterzens$skipCheck = true;
-            this.taterzens$tablistQueue.forEach(this::sendPacket);
+
+            PlayerListS2CPacket taterzensRemovePacket = new PlayerListS2CPacket(REMOVE_PLAYER);
+            List<PlayerListS2CPacket.Entry> taterzenList = this.taterzens$tablistQueue
+                    .stream()
+                    .map(npc -> taterzensRemovePacket.new Entry(
+                                    npc.getGameProfile(),
+                                    0,
+                                    GameMode.SURVIVAL,
+                                    npc.getName()
+                            )
+                    )
+                    .collect(Collectors.toList());
+            //noinspection ConstantConditions
+            ((PlayerListS2CPacketAccessor) taterzensRemovePacket).setEntries(taterzenList);
+            this.sendPacket(taterzensRemovePacket);
             this.taterzens$tablistQueue.clear();
+
             this.taterzens$skipCheck = false;
         }
     }

common/src/main/java/org/samo_lego/taterzens/mixin/accessors/EntityAccessor.java

@@ -10,6 +10,4 @@ public interface MobSpawnS2CPacketAccessor {
     @Accessor("id")
     int getId();
 
-    @Accessor("entityTypeId")
-    int getEntityTypeId();
 }

common/src/main/java/org/samo_lego/taterzens/mixin/accessors/MobSpawnS2CPacketAccessor.java

@@ -86,7 +86,7 @@ public static class Permissions {
          * Permission level required to execute /taterzens command.
          * Valid only if LuckPerms isn't present.
          */
-        @SerializedName("npc_command_permission_level")
+        @SerializedName("taterzens_command_permission_level")
         public int taterzensCommandPermissionLevel = 4;
 
         public final String _comment_allowSettingHigherPermissionLevel1 = "// Whether to allow players to set the permission level";

common/src/main/java/org/samo_lego/taterzens/storage/TaterConfig.java

@@ -10,7 +10,6 @@
     "ServerPlayNetworkHandlerMixin_MsgEditor",
     "ServerPlayNetworkHandlerMixin_PacketFaker",
     "ThreadedAnvilChunkStorageMixin_TaterzenList",
-    "accessors.EntityAccessor",
     "accessors.EntityTrackerEntryAccessor",
     "accessors.EntityTrackerUpdateS2CPacketAccessor",
     "accessors.MobSpawnS2CPacketAccessor",

common/src/main/resources/assets/taterzens/icon.png

@@ -42,6 +42,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
 
+
     // LuckPerms
     modImplementation 'me.lucko:fabric-permissions-api:0.1-SNAPSHOT'
     /*modRuntime group: 'me.lucko.luckperms', name: 'luckperms-api', version: '4.0'

common/src/main/resources/taterzens.common.mixins.json

@@ -39,13 +39,13 @@ public class NetworkRegistryMixin_MarkServerside {
     private static void taterzens$removeTaterzensFromRegistrySync(BiFunction<NetworkInstance, String, Boolean> testFunction, CallbackInfoReturnable<List<String>> cir, List<String> results) {
         //results.remove("taterzens");
         if(config.disableRegistrySync) {
-            System.out.println(results);
+            /*System.out.println(results);
             instances.values().forEach(networkInstance -> {
                 System.out.println("Checking: split");
                 System.out.println(((NetworkInstanceAccessor) networkInstance).networkProtocolVersion());
                 System.out.println(((NetworkInstanceAccessor) networkInstance).clientAcceptedVersions());
                 System.out.println(((NetworkInstanceAccessor) networkInstance).getServerAcceptedVersions());
-            });
+            });*/
             cir.setReturnValue(Collections.emptyList());
         }
     }

fabric/build.gradle

@@ -13,6 +13,6 @@ fabric_version=0.32.5+1.16
 forge_version=36.0.46
 
 # Mod Properties
-mod_version = 1.0.0
+mod_version = 1.0.1
 maven_group = org.samo_lego
 archives_base_name = taterzens