fix: most of the main render components are back... Most. Masking looks to need a shader 😢

Author: MichaelHillcox

common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java

@@ -70,6 +70,7 @@ public class FTBChunks {
 	public static final int TILE_SIZE = 16;
 	public static final int TILE_OFFSET = TILES / 2;
 	public static final int MINIMAP_SIZE = TILE_SIZE * TILES;
+
 	public static final XZ[] RELATIVE_SPIRAL_POSITIONS = new XZ[TILES * TILES];
 
 	public static final Registrar<Block> BLOCK_REGISTRY = RegistrarManager.get(MOD_ID).get(Registries.BLOCK);

common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java

@@ -69,9 +69,9 @@ public RowPanel(Panel panel, EntityType<?> entityType) {
 
         @Override
         public void addWidgets() {
-            boolean hiddenState = FTBChunksClientConfig.ENTITY_ICON.get().getOrDefault(resourceKey.toString(), true);
+            boolean hiddenState = FTBChunksClientConfig.ENTITY_ICON.get().getOrDefault(resourceKey.identifier().toString(), true);
             add(hideButton = new ToggleableButton(this, hiddenState, Icons.ACCEPT, Icons.ACCEPT_GRAY, (hideButton, hidden) -> {
-                FTBChunksClientConfig.ENTITY_ICON.get().put(resourceKey.toString(), hidden);
+                FTBChunksClientConfig.ENTITY_ICON.get().put(resourceKey.identifier().toString(), hidden);
                 FTBChunksClientConfig.saveConfig();
             }));
 

common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/EntityIconSettingsScreen.java

@@ -52,8 +52,15 @@ public void requestBake() {
     }
 
     private void upload(NativeImage image) {
-        this.texture = new DynamicTexture(identifier::toString, image);
-        Minecraft.getInstance().getTextureManager().register(identifier, this.texture);
+        if (this.texture == null) {
+            // First time - create texture
+            this.texture = new DynamicTexture(identifier::toString, image);
+            Minecraft.getInstance().getTextureManager().register(identifier, this.texture);
+        } else {
+            // Subsequent times - just update pixels and upload
+            this.texture.setPixels(image);
+            this.texture.upload();
+        }
     }
 
     public void close() {
@@ -77,4 +84,8 @@ public boolean isBaking() {
     public boolean isOpen() {
         return texture != null;
     }
+
+    public @Nullable DynamicTexture bakedTexture() {
+        return texture;
+    }
 }

common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapRegionTexture.java

@@ -25,14 +25,14 @@ public static boolean shouldEntityRender(Entity entity, Player player) {
     }
 
     private static boolean isIconEnabled(ResourceKey<EntityType<?>> key, EntityType<?> type) {
-        if (!FTBChunksClientConfig.ENTITY_ICON.get().containsKey(key.toString())) {
+        if (!FTBChunksClientConfig.ENTITY_ICON.get().containsKey(key.identifier().toString())) {
             // entity not listed in the config (most likely a new mod was added) - get its defaults if possible
             EntityIconSettings settings = EntityIconLoader.getSettings(type).orElse(EntityIconSettings.legacy());
-            FTBChunksClientConfig.ENTITY_ICON.get().put(key.toString(), settings.defaultEnabled());
+            FTBChunksClientConfig.ENTITY_ICON.get().put(key.identifier().toString(), settings.defaultEnabled());
             FTBChunksClientConfig.saveConfig();
             return settings.defaultEnabled();
         } else {
-            return FTBChunksClientConfig.ENTITY_ICON.get().get(key.toString());
+            return FTBChunksClientConfig.ENTITY_ICON.get().get(key.identifier().toString());
         }
     }
 }

common/src/main/java/dev/ftb/mods/ftbchunks/client/mapicon/EntityIconUtils.java

@@ -0,0 +1,95 @@
+package dev.ftb.mods.ftbchunks.client.minimap;
+
+import dev.ftb.mods.ftbchunks.FTBChunks;
+import dev.ftb.mods.ftbchunks.api.FTBChunksAPI;
+import dev.ftb.mods.ftbchunks.client.map.MapDimension;
+import dev.ftb.mods.ftbchunks.client.map.MapRegion;
+import dev.ftb.mods.ftblibrary.math.XZ;
+import com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
+
+import java.util.function.Supplier;
+
+public class MinimapRegionCutoutTexture {
+    private final Identifier identifier = FTBChunksAPI.id("minimap_region_cutout_texture");
+    private final NativeImage image;
+
+    private final DynamicTexture texture;
+
+    private int lastChunkX;
+    private int lastChunkZ;
+
+    public MinimapRegionCutoutTexture() {
+        var size = FTBChunks.MINIMAP_SIZE;
+
+        // Reserve the texture.
+        image = new NativeImage(NativeImage.Format.RGBA, size, size, true);
+        image.fillRect(0, 0, size, size, 0);
+
+        texture = new DynamicTexture(identifier::toString, image);
+        Minecraft.getInstance().getTextureManager().register(identifier, texture);
+    }
+
+    public void update(ResourceKey<Level> key, int chunkX, int chunkZ) {
+        if (chunkX == lastChunkX && chunkZ == lastChunkZ) {
+            return;
+        }
+
+        // Update the last chunk positions.
+        lastChunkX = chunkX;
+        lastChunkZ = chunkZ;
+
+        MapDimension dim = MapDimension.getCurrent().get();
+        if (dim.dimension != key) {
+            return;
+        }
+
+        var size = FTBChunks.MINIMAP_SIZE;
+
+        image.fillRect(0, 0, size, size, 0);
+
+        // Time to update.
+        for (int mz = 0; mz < FTBChunks.TILES; mz++) {
+            for (int mx = 0; mx < FTBChunks.TILES; mx++) {
+                int ox = chunkX + mx - FTBChunks.TILE_OFFSET;
+                int oz = chunkZ + mz - FTBChunks.TILE_OFFSET;
+
+                MapRegion region = dim.getRegion(XZ.regionFromChunk(ox, oz));
+                DynamicTexture dynamicTexture = region.regionTexture().bakedTexture();
+                if (dynamicTexture == null) {
+                    continue;
+                }
+
+                NativeImage regionImage = dynamicTexture.getPixels();
+                if (regionImage == null) {
+                    continue;
+                }
+
+                int imgSize = regionImage.getWidth();
+                int chunksPerRegion = imgSize / 16;
+
+                int srcX = (ox & (chunksPerRegion - 1)) * 16;
+                int srcZ = (oz & (chunksPerRegion - 1)) * 16;
+
+                int dstX = mx * 16;
+                int dstZ = mz * 16;
+
+                regionImage.copyRect(image, srcX, srcZ, dstX, dstZ, 16, 16, false, false);
+            }
+        }
+
+        texture.upload();
+    }
+
+    public DynamicTexture getTexture() {
+        return texture;
+    }
+
+    public Identifier identifier() {
+        return identifier;
+    }
+}