Switch virtual pack to cache based approach. Hopefully fixes #14.

Author: PlatinPython

build.gradle

@@ -68,16 +68,20 @@ minecraft {
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
+sourceSets.main.java {
+    exclude 'platinpython/rgbblocks/util/compat/cb/**'
+}
+
 repositories {
     maven { // TOP
         url "https://www.cursemaven.com/"
         content {
             includeGroup "curse.maven"
         }
     }
-    maven { // C&B
-        url 'https://ldtteam.jfrog.io/ldtteam/modding/'
-    }
+//    maven { // C&B
+//        url 'https://ldtteam.jfrog.io/ldtteam/modding/'
+//    }
 }
 
 dependencies {
@@ -88,10 +92,10 @@ dependencies {
     implementation fg.deobf("curse.maven:the-one-probe-245211:4629624")
     implementation fg.deobf("curse.maven:framedblocks-441647:4657096")
 
-    compileOnly fg.deobf("com.communi-suggestu.scena:scena-core:1.0.98")
-    compileOnly fg.deobf("com.communi-suggestu.saecularia-caudices:saecularia-caudices-core:1.0.20")
-    compileOnly fg.deobf("mod.chiselsandbits:chisels-and-bits-api:1.4.148")
-    runtimeOnly fg.deobf("mod.chiselsandbits:chisels-and-bits-forge:1.4.148")
+//    compileOnly fg.deobf("com.communi-suggestu.scena:scena-core:1.0.98")
+//    compileOnly fg.deobf("com.communi-suggestu.saecularia-caudices:saecularia-caudices-core:1.0.20")
+//    compileOnly fg.deobf("mod.chiselsandbits:chisels-and-bits-api:1.4.148")
+//    runtimeOnly fg.deobf("mod.chiselsandbits:chisels-and-bits-forge:1.4.148")
 }
 
 jar {

gradle.properties

@@ -5,4 +5,4 @@ org.gradle.daemon=false
 
 #version info
 minecraft_version=1.20.1
-mod_version=1.1.9.1
+mod_version=1.1.9.2

src/main/java/platinpython/rgbblocks/util/ClientUtils.java

@@ -1,5 +1,6 @@
 package platinpython.rgbblocks.util;
 
+import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -11,7 +12,6 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.client.event.ModelEvent;
-import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
 import net.minecraftforge.client.event.RegisterColorHandlersEvent;
 import net.minecraftforge.event.AddPackFindersEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -31,27 +31,27 @@
 
 @EventBusSubscriber(modid = RGBBlocks.MOD_ID, bus = Bus.MOD, value = Dist.CLIENT)
 public class ClientUtils {
-    public static final RGBBlocksPack VIRTUAL_PACK = new RGBBlocksPack();
-
     @SubscribeEvent
     public static void addPackFinders(AddPackFindersEvent event) {
+        if (event.getPackType() != PackType.CLIENT_RESOURCES) {
+            return;
+        }
         event.addRepositorySource(
-            (infoConsumer) -> infoConsumer.accept(
+            infoConsumer -> infoConsumer.accept(
                 Pack.create(
-                    "rgbblocks_textures", Component.translatable("rgbblocks.pack_title"), true, id -> VIRTUAL_PACK,
+                    "rgbblocks_textures", Component.translatable("rgbblocks.pack_title"), true,
+                    id -> new RGBBlocksPack(),
                     new Pack.Info(
-                        Component.translatable("rgbblocks.pack_description"), 0, 0, FeatureFlagSet.of(), false
-                    ), PackType.CLIENT_RESOURCES, Pack.Position.TOP, true, PackSource.BUILT_IN
+                        Component.translatable("rgbblocks.pack_description"),
+                        SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA),
+                        SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES),
+                        FeatureFlagSet.of(), false
+                    ), PackType.CLIENT_RESOURCES, Pack.Position.TOP, false, PackSource.BUILT_IN
                 )
             )
         );
     }
 
-    @SubscribeEvent
-    public static void registerReloadListener(RegisterClientReloadListenersEvent event) {
-        event.registerReloadListener(VIRTUAL_PACK);
-    }
-
     @SubscribeEvent
     public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderers event) {
         event.registerEntityRenderer(EntityRegistry.RGB_FALLING_BLOCK.get(), RGBFallingBlockRenderer::new);

src/main/java/platinpython/rgbblocks/util/pack/RGBBlocksPack.java

@@ -1,9 +1,10 @@
 package platinpython.rgbblocks.util.pack;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.JsonObject;
 import com.mojang.blaze3d.platform.NativeImage;
-import com.mojang.datafixers.util.Pair;
+import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -13,11 +14,10 @@
 import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
 import net.minecraft.server.packs.metadata.pack.PackMetadataSectionSerializer;
 import net.minecraft.server.packs.resources.IoSupplier;
-import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.util.GsonHelper;
-import net.minecraft.util.profiling.ProfilerFiller;
-import org.apache.commons.io.IOUtils;
+import net.minecraftforge.fml.ModList;
+import org.jspecify.annotations.Nullable;
 import platinpython.rgbblocks.RGBBlocks;
 import platinpython.rgbblocks.util.Color;
 
@@ -29,131 +29,99 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
+import java.util.stream.Stream;
 
-public class RGBBlocksPack extends AbstractPackResources implements PreparableReloadListener {
+public class RGBBlocksPack extends AbstractPackResources {
     public static final String TEXTURE_DIRECTORY = "textures/";
     public static final String BLOCK_DIRECTORY = "block/";
     public static final Set<String> NAMESPACES = ImmutableSet.of(RGBBlocks.MOD_ID);
 
+    private static final ImmutableMap<ResourceLocation, ResourceLocation> RESOURCES =
+        Stream.<Map.Entry<String, String>>builder()
+            .add(Map.entry("concrete", "white_concrete"))
+            .add(Map.entry("concrete_powder", "white_concrete_powder"))
+            .add(Map.entry("wool", "white_wool"))
+            .add(Map.entry("planks", "birch_planks"))
+            .add(Map.entry("terracotta", "white_terracotta"))
+            .add(Map.entry("glass", "white_stained_glass"))
+            .add(Map.entry("glass_pane_top", "white_stained_glass_pane_top"))
+            .add(Map.entry("glowstone", "glowstone"))
+            .add(Map.entry("redstone_lamp", "redstone_lamp"))
+            .add(Map.entry("redstone_lamp_on", "redstone_lamp_on"))
+            .add(Map.entry("prismarine", "prismarine"))
+            .add(Map.entry("prismarine_bricks", "prismarine_bricks"))
+            .add(Map.entry("dark_prismarine", "dark_prismarine"))
+            .add(Map.entry("sea_lantern", "sea_lantern"))
+            .build()
+            .flatMap(RGBBlocksPack::makeIDs)
+            .collect(ImmutableMap.toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
+
     private final PackMetadataSection packInfo;
-    private Map<ResourceLocation, IoSupplier<InputStream>> resources = new HashMap<>();
-    private final Map<ResourceLocation, ResourceLocation> textures = new HashMap<>();
+    private final HashMap<ResourceLocation, IoSupplier<InputStream>> resources = new HashMap<>();
 
     public RGBBlocksPack() {
         super("rgbblocks_virtual_pack", true);
-        this.packInfo = new PackMetadataSection(Component.translatable("rgbblocks.pack_description"), 7);
-        fillTexturesMap();
-    }
-
-    private void fillTexturesMap() {
-        Map<String, String> map = new HashMap<>();
-
-        map.put("concrete", "white_concrete");
-        map.put("concrete_powder", "white_concrete_powder");
-        map.put("wool", "white_wool");
-        map.put("planks", "birch_planks");
-        map.put("terracotta", "white_terracotta");
-        map.put("glass", "white_stained_glass");
-        map.put("glass_pane_top", "white_stained_glass_pane_top");
-        map.put("glowstone", "glowstone");
-        map.put("redstone_lamp", "redstone_lamp");
-        map.put("redstone_lamp_on", "redstone_lamp_on");
-        map.put("prismarine", "prismarine");
-        map.put("prismarine_bricks", "prismarine_bricks");
-        map.put("dark_prismarine", "dark_prismarine");
-        map.put("sea_lantern", "sea_lantern");
-
-        map.forEach(
-            (modName, vanillaName) -> textures.put(
-                new ResourceLocation(RGBBlocks.MOD_ID, BLOCK_DIRECTORY + modName),
-                new ResourceLocation(BLOCK_DIRECTORY + vanillaName)
-            )
+        this.packInfo = new PackMetadataSection(
+            Component.translatable("rgbblocks.pack_description"),
+            SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES)
         );
     }
 
-    @Override
-    public CompletableFuture<Void> reload(
-        PreparationBarrier stage,
-        ResourceManager manager,
-        ProfilerFiller workerProfiler,
-        ProfilerFiller mainProfiler,
-        Executor workerExecutor,
-        Executor mainExecutor
-    ) {
-        this.gatherTextureData(manager, mainProfiler);
-        return CompletableFuture.supplyAsync(() -> null, workerExecutor)
-            .thenCompose(stage::wait)
-            .thenAcceptAsync((noResult) -> {}, mainExecutor);
-    }
-
-    protected void gatherTextureData(ResourceManager manager, ProfilerFiller profiler) {
-        Map<ResourceLocation, IoSupplier<InputStream>> resourceStreams = new HashMap<>();
-
-        textures.forEach(
-            (
-                modLocation,
-                vanillaLocation
-            ) -> generateImage(modLocation, vanillaLocation, Minecraft.getInstance().getResourceManager())
-                .ifPresent(pair -> {
-                    NativeImage image = pair.getFirst();
-                    ResourceLocation textureID = makeTextureID(modLocation);
-                    resourceStreams.put(textureID, () -> new ByteArrayInputStream(image.asByteArray()));
-                    pair.getSecond()
-                        .ifPresent(
-                            metadataGetter -> resourceStreams.put(getMetadataLocation(textureID), metadataGetter)
-                        );
-                })
+    private static Stream<Map.Entry<ResourceLocation, ResourceLocation>> makeIDs(Map.Entry<String, String> entry) {
+        Map.Entry<ResourceLocation, ResourceLocation> paths = Map.entry(
+            new ResourceLocation(RGBBlocks.MOD_ID, BLOCK_DIRECTORY + entry.getKey()),
+            new ResourceLocation(BLOCK_DIRECTORY + entry.getValue())
         );
-
-        this.resources = resourceStreams;
+        Map.Entry<ResourceLocation, ResourceLocation> texture =
+            Map.entry(makeTextureID(paths.getKey()), makeTextureID(paths.getValue()));
+        return Stream
+            .of(texture, Map.entry(getMetadataLocation(texture.getKey()), getMetadataLocation(texture.getValue())));
     }
 
-    public static ResourceLocation makeTextureID(ResourceLocation id) {
-        return new ResourceLocation(id.getNamespace(), TEXTURE_DIRECTORY + id.getPath() + ".png");
+    private static ResourceLocation makeTextureID(ResourceLocation id) {
+        return id.withPath(path -> TEXTURE_DIRECTORY + path + ".png");
     }
 
-    public static ResourceLocation getMetadataLocation(ResourceLocation id) {
-        return new ResourceLocation(id.getNamespace(), id.getPath() + ".mcmeta");
+    private static ResourceLocation getMetadataLocation(ResourceLocation id) {
+        return id.withSuffix(".mcmeta");
     }
 
-    public Optional<Pair<NativeImage, Optional<IoSupplier<InputStream>>>> generateImage(
+    private @Nullable IoSupplier<InputStream> computeImage(
         ResourceLocation modLocation,
         ResourceLocation vanillaLocation,
         ResourceManager manager
     ) {
-        ResourceLocation parentFile = makeTextureID(vanillaLocation);
-        try (InputStream inputStream = manager.getResource(parentFile).orElseThrow().open()) {
+        try (InputStream inputStream = manager.getResourceOrThrow(vanillaLocation).open()) {
             NativeImage image = NativeImage.read(inputStream);
             NativeImage transformedImage = this.transformImage(image);
-            ResourceLocation metadata = getMetadataLocation(parentFile);
-            Optional<IoSupplier<InputStream>> metadataLookup = Optional.empty();
-            BufferedReader bufferedReader = null;
-            JsonObject metadataJson;
-            if (manager.getResource(metadata).isPresent()) {
-                try (InputStream metadataStream = manager.getResource(metadata).get().open()) {
-                    bufferedReader = new BufferedReader(new InputStreamReader(metadataStream, StandardCharsets.UTF_8));
-                    metadataJson = GsonHelper.parse(bufferedReader);
-                } catch (Exception e) {
-                    return Optional.empty();
-                } finally {
-                    IOUtils.closeQuietly(bufferedReader);
-                }
-                JsonObject metaDataJsonForLambda = metadataJson;
-                metadataLookup =
-                    Optional.of(() -> new ByteArrayInputStream(metaDataJsonForLambda.toString().getBytes()));
-            }
-            return Optional.of(Pair.of(transformedImage, metadataLookup));
-        } catch (IOException | NoSuchElementException e) {
-            return Optional.empty();
+            return () -> new ByteArrayInputStream(transformedImage.asByteArray());
+        } catch (IOException e) {
+            RGBBlocks.LOGGER.error("Error while generating {}", modLocation, e);
+            return null;
         }
     }
 
-    public NativeImage transformImage(NativeImage image) {
+    private @Nullable IoSupplier<InputStream> computeMetadata(
+        ResourceLocation modLocation,
+        ResourceLocation vanillaLocation,
+        ResourceManager manager
+    ) {
+        return manager.getResource(vanillaLocation).<IoSupplier<InputStream>>map(resource -> {
+            try (
+                BufferedReader bufferedReader =
+                    new BufferedReader(new InputStreamReader(resource.open(), StandardCharsets.UTF_8))
+            ) {
+                JsonObject metadataJson = GsonHelper.parse(bufferedReader);
+                return () -> new ByteArrayInputStream(metadataJson.toString().getBytes());
+            } catch (IOException e) {
+                RGBBlocks.LOGGER.error("Error while generating {}", modLocation, e);
+                return null;
+            }
+        }).orElse(() -> new ByteArrayInputStream("{}".getBytes()));
+    }
+
+    private NativeImage transformImage(NativeImage image) {
         for (int x = 0; x < image.getWidth(); x++) {
             for (int y = 0; y < image.getHeight(); y++) {
                 int oldColor = image.getPixelRGBA(x, y);
@@ -169,19 +137,20 @@ public NativeImage transformImage(NativeImage image) {
         return image;
     }
 
-    @Override
-    public String getName() {
-        return Component.translatable("rgbblocks.pack_title").getString();
-    }
-
     @SuppressWarnings("unchecked")
     @Override
-    public <T> T getMetadataSection(MetadataSectionSerializer<T> serializer) {
+    public <T> @Nullable T getMetadataSection(MetadataSectionSerializer<T> serializer) {
         return serializer instanceof PackMetadataSectionSerializer ? (T) this.packInfo : null;
     }
 
     @Override
-    public IoSupplier<InputStream> getRootResource(String... fileName) {
+    public @Nullable IoSupplier<InputStream> getRootResource(String... elements) {
+        for (String name : elements) {
+            if (!name.equals("pack.png")) {
+                continue;
+            }
+            return IoSupplier.create(ModList.get().getModFileById(RGBBlocks.MOD_ID).getFile().findResource("logo.png"));
+        }
         return null;
     }
 
@@ -194,27 +163,32 @@ public Set<String> getNamespaces(PackType type) {
     }
 
     @Override
-    public IoSupplier<InputStream> getResource(PackType type, ResourceLocation id) {
-        if (this.resources.containsKey(id)) {
-            IoSupplier<InputStream> streamGetter = this.resources.get(id);
-            if (streamGetter == null) {
-                return null;
+    public @Nullable IoSupplier<InputStream> getResource(PackType type, ResourceLocation id) {
+        if (RESOURCES.containsKey(id)) {
+            ResourceManager manager = Minecraft.getInstance().getResourceManager();
+            IoSupplier<InputStream> streamSupplier;
+            if (id.getPath().endsWith(".mcmeta")) {
+                // noinspection DataFlowIssue
+                streamSupplier = this.resources
+                    .computeIfAbsent(id, location -> computeMetadata(location, RESOURCES.get(location), manager));
+            } else {
+                // noinspection DataFlowIssue
+                streamSupplier = this.resources
+                    .computeIfAbsent(id, location -> computeImage(location, RESOURCES.get(location), manager));
             }
-
             try {
-                return streamGetter;
+                return streamSupplier;
             } catch (Exception e) {
                 return null;
             }
-        } else {
-            return null;
         }
+        return null;
     }
 
     @Override
     public void listResources(PackType type, String namespace, String id, ResourceOutput output) {
         if (namespace.equals(RGBBlocks.MOD_ID)) {
-            this.resources.forEach((name, supplier) -> {
+            RESOURCES.forEach((name, ignored) -> {
                 if (name.getPath().startsWith(id)) {
                     output.accept(name, getResource(type, name));
                 }