[fix] server-side not detecting incompatible clients post-refactor

JackFred2 · Aug 20, 2023 · c1c627d · c1c627d
1 parent 48bd675
commit c1c627d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
-# WhereIsIt
+# Where Is It
 
 Minecraft mod to locate items in nearby inventories. Press Y over an item to search.
 
+![An example image of the mod showing 4 results](https://i.imgur.com/lvebo0v.png)
+
 ## Requirements
 
 - [Fabric API](https://modrinth.com/mod/fabric-api)

diff --git a/images/config.png b/images/config.png
diff --git a/images/enchantment filtering.png b/images/enchantment filtering.png
diff --git a/images/nested searching.png b/images/nested searching.png
diff --git a/images/server side.png b/images/server side.png
diff --git a/images/standard.png b/images/standard.png
diff --git a/src/main/java/red/jackf/whereisit/networking/ClientboundResultsPacket.java b/src/main/java/red/jackf/whereisit/networking/ClientboundResultsPacket.java
@@ -23,7 +23,7 @@
  * <li>numberOfOtherPositions: Collection&lt;BlockPos&gt;</li>
  */
 public record ClientboundResultsPacket(long id, Collection<SearchResult> results) implements FabricPacket {
-    public static final PacketType<ClientboundResultsPacket> TYPE = PacketType.create(WhereIsIt.id("c2s_searchforitem"), ClientboundResultsPacket::new);
+    public static final PacketType<ClientboundResultsPacket> TYPE = PacketType.create(WhereIsIt.id("s2c_founditem"), ClientboundResultsPacket::new);
     public static final long WHEREIS_COMMAND_ID = -1L;
 
     public ClientboundResultsPacket(FriendlyByteBuf buf) {

diff --git a/src/main/java/red/jackf/whereisit/search/SearchHandler.java b/src/main/java/red/jackf/whereisit/search/SearchHandler.java
@@ -29,6 +29,7 @@ public static void handleFromPacket(ServerboundSearchForItemPacket packet, Serve
     }
 
     public static void handle(SearchRequest request, ServerPlayer player) {
+        // clear last server side results
         ServerSideRenderer.fadeServerSide(player);
 
         // check rate limit for players
@@ -44,8 +45,6 @@ public static void handle(SearchRequest request, ServerPlayer player) {
             RateLimiter.add(player, time);
         }
 
-        // clear last server side results
-
         // empty requests
         if (!request.hasCriteria()) {
             WhereIsIt.LOGGER.warn("Empty request from {}", player.getGameProfile().getName());
@@ -96,7 +95,7 @@ public static void handle(SearchRequest request, ServerPlayer player) {
 
         // send to player
         if (!results.isEmpty()) {
-            if (WhereIsItConfig.INSTANCE.getConfig().getCommon().forceServerSideHighlightsOnly) {
+            if (WhereIsItConfig.INSTANCE.getConfig().getCommon().forceServerSideHighlightsOnly || !ServerPlayNetworking.canSend(player, ClientboundResultsPacket.TYPE)) {
                 ServerSideRenderer.doServersideRendering(player, results.values());
             } else {
                 // send packet