Fix some loot tables being empty and blocks list resolution

Author: Aedial

CHANGELOG.md

@@ -8,6 +8,19 @@ The format is based on Keep a Changelog and this project adheres to Semantic Ver
 - Semantic Versioning: https://semver.org/spec/v2.0.0.html
 
 
+## [0.2.0] - 2025-12-28
+### Added
+- Add Igloo structure retrieval to VanillaStructureProvider (as test case)
+- Add structure preview for those providing structure schematic data
+- Add biome, dimension, rarity information to StructureInfo and display in GUI
+
+### Fixed
+- Fix loot table resolution vanilla provider (some loot tables were missing)
+
+### Changed
+- Change hardcoded block->item mapping to handle GuiBlocksWindow better
+
+
 ## [0.1.1] - 2025-12-27
 ### Added
 - Keybind handler (`KeybindHandler`) to open the scanner GUI (default: P key)

build.gradle

@@ -14,7 +14,7 @@ buildscript {
 
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "0.1.1"
+version = "0.2.0"
 group = "com.simplestructurescanner"
 archivesBaseName = "simplestructurescanner"
 

src/main/java/com/simplestructurescanner/SimpleStructureScanner.java

@@ -19,7 +19,7 @@
 public class SimpleStructureScanner {
     public static final String MODID = "simplestructurescanner";
     public static final String NAME = "Simple Structure Scanner";
-    public static final String VERSION = "0.1.1";
+    public static final String VERSION = "0.2.0";
 
     public static final Logger LOGGER = LogManager.getLogger(MODID);
 

src/main/java/com/simplestructurescanner/client/event/ClientRenderEvents.java

@@ -107,9 +107,7 @@ public void onRenderOverlay(RenderGameOverlayEvent.Post event) {
         // Calculate dimensions
         int lineHeight = mc.fontRenderer.FONT_HEIGHT;
         int maxWidth = 0;
-        for (String line : lines) {
-            maxWidth = Math.max(maxWidth, mc.fontRenderer.getStringWidth(line));
-        }
+        for (String line : lines) maxWidth = Math.max(maxWidth, mc.fontRenderer.getStringWidth(line));
 
         int boxW = maxWidth + paddingInternal * 2 + 8;  // Extra 8 for color indicator
         int boxH = lines.size() * lineHeight + (lines.size() - 1) * lineSpacing + paddingInternal * 2;

src/main/java/com/simplestructurescanner/client/gui/GuiLootWindow.java

@@ -101,21 +101,25 @@ private void resolveLootTables() {
         simulationCount = LootTableResolver.getSimulationCount();
 
         for (LootEntry entry : lootEntries) {
+            List<LootItem> entryLoot = new ArrayList<>();
+
+            // Try to resolve from loot table ID first
             if (entry.lootTableId != null) {
-                resolvedLoot.add(LootTableResolver.resolveLootTableWithSimulation(
-                    world, entry.lootTableId, mc.player));
+                entryLoot = LootTableResolver.resolveLootTableWithSimulation(
+                    world, entry.lootTableId, mc.player);
             }
-            
-            if (entry.possibleDrops != null) {
-                List<LootItem> directItems = new ArrayList<>();
+
+            // If loot table resolution failed or wasn't available, use possibleDrops as fallback
+            if (entryLoot.isEmpty() && entry.possibleDrops != null && !entry.possibleDrops.isEmpty()) {
                 for (ItemStack stack : entry.possibleDrops) {
                     int count = stack.getCount();
                     stack = stack.copy();
                     stack.setCount(1);
-                    directItems.add(new LootItem(stack, count * simulationCount));
+                    entryLoot.add(new LootItem(stack, count * simulationCount));
                 }
-                resolvedLoot.add(directItems);
             }
+
+            resolvedLoot.add(entryLoot);
         }
     }
 

src/main/java/com/simplestructurescanner/client/gui/GuiStructureScanner.java

@@ -100,9 +100,7 @@ public void initGui() {
         String lastStructure = ModConfig.getClientLastSelectedStructure();
         if (lastStructure != null && !lastStructure.isEmpty()) {
             ResourceLocation id = new ResourceLocation(lastStructure);
-            if (StructureProviderRegistry.getStructureInfo(id) != null) {
-                selectStructure(id);
-            }
+            if (StructureProviderRegistry.getStructureInfo(id) != null) selectStructure(id);
         }
 
         // Restore modal windows if they were hidden for navigation
@@ -547,11 +545,9 @@ private void buildPreviewRenderer(List<StructureLayer> layers) {
             for (int x = 0; x < layer.width; x++) {
                 for (int z = 0; z < layer.depth; z++) {
                     IBlockState state = layer.getBlockState(x, z);
-                    if (state == null || state.getBlock() == Blocks.AIR) continue;
-                    if (state.getBlock() == Blocks.STRUCTURE_VOID) continue;
+                    if (state == null || state.getBlock() == Blocks.AIR || state.getBlock() == Blocks.STRUCTURE_VOID) continue;
 
-                    BlockPos pos = new BlockPos(x, y, z);
-                    previewRenderer.getWorld().addBlock(pos, state);
+                    previewRenderer.getWorld().addBlock(new BlockPos(x, y, z), state);
                 }
             }
         }
@@ -719,20 +715,6 @@ private void applyFilter() {
                 }
             }
 
-            // Sort: selected first, then tracked, then searchable, then alphabetically
-            ResourceLocation currentSelected = parent.selected;
-            filteredStructures.sort(Comparator
-                .<ResourceLocation, Integer>comparing(id -> id.equals(currentSelected) ? 0 : 1)
-                .thenComparing(id -> StructureSearchManager.isTracked(id) ? 0 : 1)
-                .thenComparing(id -> StructureProviderRegistry.canBeSearched(id) ? 0 : 1)
-                .thenComparing(id -> {
-                    if (ClientSettings.i18nNames) {
-                        StructureInfo info = StructureProviderRegistry.getStructureInfo(id);
-                        return info != null ? I18n.format(info.getDisplayName()) : id.getPath();
-                    }
-                    return id.toString();
-                }));
-
             // Clamp scroll
             float maxScroll = getMaxScroll();
             if (scrollOffset > maxScroll) scrollOffset = maxScroll;
@@ -836,11 +818,10 @@ public void draw(int mouseX, int mouseY) {
             int visibleStart = (int) (scrollOffset / entryHeight);
             int visibleEnd = Math.min(filteredStructures.size(), visibleStart + (height / entryHeight) + 2);
 
-            // FIXME: list needs to be sorted by name with current search at the top
+            // FIXME: list needs to be sorted by name with currently tracked at the top
 
             for (int i = visibleStart; i < visibleEnd; i++) {
                 int entryY = y + (i * entryHeight) - (int) scrollOffset;
-
                 if (entryY + entryHeight < y || entryY > y + height) continue;
 
                 ResourceLocation id = filteredStructures.get(i);

src/main/java/com/simplestructurescanner/client/render/DummyChunkProvider.java

@@ -35,9 +35,7 @@ public Chunk getLoadedChunk(int x, int z) {
     @Override
     public Chunk provideChunk(int x, int z) {
         long chunkKey = ChunkPos.asLong(x, z);
-        if (loadedChunks.containsKey(chunkKey)) {
-            return loadedChunks.get(chunkKey);
-        }
+        if (loadedChunks.containsKey(chunkKey)) return loadedChunks.get(chunkKey);
 
         Chunk chunk = new Chunk(world, x, z);
         loadedChunks.put(chunkKey, chunk);

src/main/java/com/simplestructurescanner/client/render/DummyWorld.java

@@ -107,9 +107,7 @@ public boolean setBlockState(@Nonnull BlockPos pos, @Nonnull IBlockState newStat
     @Nonnull
     @Override
     public IBlockState getBlockState(@Nonnull BlockPos pos) {
-        if (!renderedBlocks.contains(pos)) {
-            return Blocks.AIR.getDefaultState();
-        }
+        if (!renderedBlocks.contains(pos)) return Blocks.AIR.getDefaultState();
 
         return super.getBlockState(pos);
     }

src/main/java/com/simplestructurescanner/client/render/StructurePreviewRenderer.java

@@ -39,8 +39,15 @@ public class StructurePreviewRenderer {
     private int backgroundColor = 0xFF1A1A1A;
 
     // Isometric camera settings
+    private enum LightingMode {
+        STRUCTURE,
+        WORLD
+    }
+
     private static final float ISOMETRIC_PITCH = 30f;
     private static final float ROTATION_SPEED = 20f;
+    private static final float ZOOM_FACTOR = 0.75f;
+    private static final LightingMode LIGHTING_MODE = LightingMode.STRUCTURE;
 
     public StructurePreviewRenderer() {
         this.world = new DummyWorld();
@@ -150,9 +157,7 @@ public void render(float guiX, float guiY, float guiWidth, float guiHeight) {
 
         // === RESTORE STATE ===
         // Disable scissor
-        if (!wasScissor) {
-            GL11.glDisable(GL11.GL_SCISSOR_TEST);
-        }
+        if (!wasScissor) GL11.glDisable(GL11.GL_SCISSOR_TEST);
 
         // Restore viewport
         GlStateManager.viewport(oldViewport.get(0), oldViewport.get(1), oldViewport.get(2), oldViewport.get(3));
@@ -169,57 +174,15 @@ public void render(float guiX, float guiY, float guiWidth, float guiHeight) {
 
         // Restore texture binding
         GlStateManager.bindTexture(oldTexture);
-
-        // Restore blend state
-        if (wasBlend) {
-            GlStateManager.enableBlend();
-        } else {
-            GlStateManager.disableBlend();
-        }
         GL11.glBlendFunc(oldBlendSrc, oldBlendDst);
-
-        // Restore depth
-        if (wasDepth) {
-            GlStateManager.enableDepth();
-        } else {
-            GlStateManager.disableDepth();
-        }
-
-        // Restore cull
-        if (wasCull) {
-            GlStateManager.enableCull();
-        } else {
-            GlStateManager.disableCull();
-        }
-
-        // Restore lighting
-        if (wasLighting) {
-            GlStateManager.enableLighting();
-        } else {
-            GlStateManager.disableLighting();
-        }
-
-        // Restore alpha
-        if (wasAlpha) {
-            GlStateManager.enableAlpha();
-        } else {
-            GlStateManager.disableAlpha();
-        }
-
-        // Restore rescale
-        if (wasRescale) {
-            GlStateManager.enableRescaleNormal();
-        } else {
-            GlStateManager.disableRescaleNormal();
-        }
-
-        // Restore color
+        if (wasBlend) GlStateManager.enableBlend(); else GlStateManager.disableBlend();
+        if (wasDepth) GlStateManager.enableDepth(); else GlStateManager.disableDepth();
+        if (wasCull) GlStateManager.enableCull(); else GlStateManager.disableCull();
+        if (wasLighting) GlStateManager.enableLighting(); else GlStateManager.disableLighting();
+        if (wasAlpha) GlStateManager.enableAlpha(); else GlStateManager.disableAlpha();
+        if (wasRescale) GlStateManager.enableRescaleNormal(); else GlStateManager.disableRescaleNormal();
         GlStateManager.color(colorBuf.get(0), colorBuf.get(1), colorBuf.get(2), colorBuf.get(3));
-
-        // Restore depth mask
         GlStateManager.depthMask(true);
-
-        // Disable item lighting that block rendering may have enabled
         RenderHelper.disableStandardItemLighting();
     }
 

src/main/java/com/simplestructurescanner/searching/StructureSearchManager.java

@@ -58,19 +58,15 @@ private static void loadFromConfig() {
 
     private static void saveToConfig() {
         List<String> ids = new ArrayList<>();
-        for (ResourceLocation loc : searchedStructures) {
-            ids.add(loc.toString());
-        }
+        for (ResourceLocation loc : searchedStructures) ids.add(loc.toString());
         ModConfig.setClientTrackedIds(ids);
     }
 
     private static void assignColor(ResourceLocation id) {
         if (!structureColors.containsKey(id)) {
             // Find the first available color index
             int colorIndex = 0;
-            while (usedColorIndices.contains(colorIndex)) {
-                colorIndex++;
-            }
+            while (usedColorIndices.contains(colorIndex)) colorIndex++;
             usedColorIndices.add(colorIndex);
             structureColorIndices.put(id, colorIndex);
             structureColors.put(id, COLORS[colorIndex % COLORS.length]);
@@ -79,9 +75,7 @@ private static void assignColor(ResourceLocation id) {
 
     private static void freeColor(ResourceLocation id) {
         Integer colorIndex = structureColorIndices.remove(id);
-        if (colorIndex != null) {
-            usedColorIndices.remove(colorIndex);
-        }
+        if (colorIndex != null) usedColorIndices.remove(colorIndex);
         structureColors.remove(id);
     }
 
@@ -131,9 +125,7 @@ public static void stopTracking(ResourceLocation id) {
      * on the next client tick.
      */
     public static void requestSearch(ResourceLocation id) {
-        if (searchedStructures.contains(id)) {
-            pendingSearches.add(id);
-        }
+        if (searchedStructures.contains(id)) pendingSearches.add(id);
     }
 
     /**