Loot table reworks

Author: evanbones

common/src/main/java/com/evandev/fieldguide/client/ClientFieldGuideManager.java

@@ -8,8 +8,6 @@
 import com.evandev.fieldguide.config.ModConfig;
 import com.evandev.fieldguide.data.Category;
 import com.evandev.fieldguide.data.CategoryEntry;
-import com.evandev.fieldguide.network.RequestDropsPacket;
-import com.evandev.fieldguide.platform.Services;
 import com.google.gson.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
@@ -65,7 +63,6 @@ public class ClientFieldGuideManager implements ResourceManagerReloadListener {
     private final Set<String> seenEntries = new HashSet<>();
     private final Map<String, Long> discoveryTimes = new HashMap<>();
     private final Map<Object, List<ItemStack>> dropCache = new HashMap<>();
-    private final Set<Object> requestedDrops = new HashSet<>();
     private Path currentSavePath = null;
 
     // Scanning State
@@ -145,6 +142,21 @@ public void updateCategoriesFromServer(List<Category> categories) {
         resolveAllEntries();
     }
 
+    public void updateLootCache(Map<ResourceLocation, List<ItemStack>> lootCache) {
+        for (Map.Entry<ResourceLocation, List<ItemStack>> entry : lootCache.entrySet()) {
+            ResourceLocation id = entry.getKey();
+            List<ItemStack> drops = entry.getValue();
+
+            Optional<EntityType<?>> type = BuiltInRegistries.ENTITY_TYPE.getOptional(id);
+            if (type.isPresent()) {
+                dropCache.put(type.get(), drops);
+            } else {
+                Optional<Block> block = BuiltInRegistries.BLOCK.getOptional(id);
+                block.ifPresent(b -> dropCache.put(b, drops));
+            }
+        }
+    }
+
     public CategoryVisual getCategoryVisual(ResourceLocation categoryId) {
         return categoryVisuals.getOrDefault(categoryId, CategoryVisual.DEFAULT);
     }
@@ -717,20 +729,7 @@ public long getDiscoveryTime(Object entry) {
     }
 
     public List<ItemStack> getDrops(Object entry) {
-        if (dropCache.containsKey(entry)) return dropCache.get(entry);
-        if (!requestedDrops.contains(entry)) {
-            ResourceLocation id = getEntryId(entry);
-            if (id != null) {
-                requestedDrops.add(entry);
-                Services.NETWORK.sendToServer(new RequestDropsPacket(id));
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    public void setDrops(ResourceLocation entryId, List<ItemStack> drops) {
-        getValidEntries().stream().filter(e -> Objects.equals(getEntryId(e), entryId))
-                .findFirst().ifPresent(o -> dropCache.put(o, drops));
+        return dropCache.getOrDefault(entry, Collections.emptyList());
     }
 
     public void onWorldLoad(String serverIdentifier) {

common/src/main/java/com/evandev/fieldguide/config/ModConfig.java

@@ -39,7 +39,7 @@ public class ModConfig {
     public List<String> entityBlacklist = new ArrayList<>();
 
     public List<String> lootRemovals = new ArrayList<>();
-    public List<String> lootAdditions = new ArrayList<>();
+    public List<String> lootAdditions = getDefaultLootAdditions();
 
     public List<String> biomeRemovals = new ArrayList<>();
     public List<String> biomeAdditions = getDefaultBiomeAdditions();
@@ -84,6 +84,12 @@ public static List<String> getDefaultBlacklist() {
         return defaults;
     }
 
+    public static List<String> getDefaultLootAdditions() {
+        List<String> defaults = new ArrayList<>();
+        defaults.add("minecraft:wither|minecraft:nether_star");
+        return defaults;
+    }
+
     public static List<String> getDefaultBiomeAdditions() {
         List<String> defaults = new ArrayList<>();
         // Nether Fortress Mobs

common/src/main/java/com/evandev/fieldguide/network/RequestDropsPacket.java

@@ -0,0 +1,36 @@
+package com.evandev.fieldguide.network;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SyncLootPacket {
+    private final Map<ResourceLocation, List<ItemStack>> lootCache;
+
+    public SyncLootPacket(Map<ResourceLocation, List<ItemStack>> lootCache) {
+        this.lootCache = lootCache;
+    }
+
+    public SyncLootPacket(FriendlyByteBuf buf) {
+        this.lootCache = buf.readMap(
+                FriendlyByteBuf::readResourceLocation,
+                b -> b.readList(FriendlyByteBuf::readItem)
+        );
+    }
+
+    public void encode(FriendlyByteBuf buf) {
+        buf.writeMap(
+                lootCache,
+                FriendlyByteBuf::writeResourceLocation,
+                (b, list) -> b.writeCollection(list, FriendlyByteBuf::writeItem)
+        );
+    }
+
+    public Map<ResourceLocation, List<ItemStack>> getLootCache() {
+        return lootCache;
+    }
+}

common/src/main/java/com/evandev/fieldguide/network/SyncDropsPacket.java

@@ -1,5 +1,8 @@
 package com.evandev.fieldguide.platform.services;
 
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+
 import java.nio.file.Path;
 
 public interface IPlatformHelper {
@@ -42,4 +45,9 @@ default String getEnvironmentName() {
      */
     Path getConfigDirectory();
 
+    /**
+     * Gets a fake player for the given level to simulate player-only loot context.
+     */
+    ServerPlayer getFakePlayer(ServerLevel level);
+
 }