From 14f98e358b08d63cc4b30f49dd9d98dcc599c185 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 29 Apr 2023 11:17:28 -0400 Subject: [PATCH 1/3] Load every provided blockstate file, not just the first one --- .../dynamic_resources/ModelBakeryMixin.java | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java index 4e973f57..a3c39583 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java @@ -61,6 +61,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.BiFunction; @@ -247,7 +248,6 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { */ private void gatherModelMaterials(Set materialSet) { Stopwatch stopwatch = Stopwatch.createStarted(); - List>> blockStateData = new ArrayList<>(); final Object2IntOpenHashMap blockstateErrors = new Object2IntOpenHashMap<>(); /* * First, gather all vanilla packs, and use listResources on them. This will allow us to (hopefully) avoid @@ -280,23 +280,31 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { allAvailableStates.clear(); allAvailableStates.trim(); - + ConcurrentLinkedQueue> blockStateLoadedFiles = new ConcurrentLinkedQueue<>(); + List> blockStateData = new ArrayList<>(); for(ResourceLocation blockstate : blockStateFiles) { - blockStateData.add(CompletableFuture.supplyAsync(() -> { + blockStateData.add(CompletableFuture.runAsync(() -> { ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), "blockstates/" + blockstate.getPath() + ".json"); - try(Resource resource = this.resourceManager.getResource(fileLocation)) { - JsonParser parser = new JsonParser(); - return Pair.of(blockstate, parser.parse(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8))); - } catch(IOException | JsonParseException e) { + try { + List resources = this.resourceManager.getResources(fileLocation); + for(Resource resource : resources) { + JsonParser parser = new JsonParser(); + try { + blockStateLoadedFiles.add(Pair.of(blockstate, parser.parse(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8)))); + } catch(JsonParseException e) { + logOrSuppressError(blockstateErrors, "blockstate", blockstate, e); + } finally { + resource.close(); + } + } + } catch(IOException e) { logOrSuppressError(blockstateErrors, "blockstate", blockstate, e); } - return Pair.of(blockstate, null); }, ModernFix.resourceReloadExecutor())); } blockStateFiles = null; CompletableFuture.allOf(blockStateData.toArray(new CompletableFuture[0])).join(); - for(CompletableFuture> result : blockStateData) { - Pair pair = result.join(); + for(Pair pair : blockStateLoadedFiles) { if(pair.getSecond() != null) { try { JsonObject obj = pair.getSecond().getAsJsonObject(); @@ -349,6 +357,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { }); blockstateErrors.clear(); blockStateData = null; + blockStateLoadedFiles.clear(); /* figure out which models we should actually load */ gatherAdditionalViaManualScan(allPackResources, allAvailableModels, modelFiles, "models/"); From 99df4cbbe2d8e189b0ed94352c61f4078287f49e Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 29 Apr 2023 11:26:01 -0400 Subject: [PATCH 2/3] Add dynamic model support to Refined Storage --- .../rs/ClientSetupMixin.java | 30 +++++++++++++++++++ src/main/resources/modernfix.mixins.json | 1 + 2 files changed, 31 insertions(+) create mode 100644 src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java new file mode 100644 index 00000000..8facb447 --- /dev/null +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java @@ -0,0 +1,30 @@ +package org.embeddedt.modernfix.mixin.perf.dynamic_resources.rs; + +import com.refinedmods.refinedstorage.render.BakedModelOverrideRegistry; +import com.refinedmods.refinedstorage.setup.ClientSetup; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.common.MinecraftForge; +import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ClientSetup.class) +public class ClientSetupMixin { + @Shadow @Final private BakedModelOverrideRegistry bakedModelOverrideRegistry; + + @Inject(method = "", at = @At("RETURN")) + private void addDynamicListener(CallbackInfo ci) { + MinecraftForge.EVENT_BUS.addListener(this::onDynamicModelBake); + } + + private void onDynamicModelBake(DynamicModelBakeEvent event) { + BakedModelOverrideRegistry.BakedModelOverrideFactory factory = bakedModelOverrideRegistry.get(event.getLocation() instanceof ModelResourceLocation ? new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath()) : event.getLocation()); + if(factory != null) + event.setModel(factory.create(event.getModel(), event.getModelLoader().getBakedTopLevelModels())); + } +} diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json index 71141447..99ce333d 100644 --- a/src/main/resources/modernfix.mixins.json +++ b/src/main/resources/modernfix.mixins.json @@ -95,6 +95,7 @@ "perf.dynamic_resources.ItemRendererMixin", "perf.dynamic_resources.ModelBakeryMixin", "perf.dynamic_resources.ae2.RegistrationMixin", + "perf.dynamic_resources.rs.ClientSetupMixin", "perf.dynamic_resources.ctm.TextureMetadataHandlerMixin", "perf.dynamic_resources.ctm.CTMPackReloadListenerMixin", "perf.dynamic_resources.supermartijncore.ClientRegistrationHandlerMixin", From 4006551afecd56178ab62198c37d542b469e4f79 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 29 Apr 2023 11:36:59 -0400 Subject: [PATCH 3/3] Adjust mixin for 1.18 --- .../perf/dynamic_resources/rs/ClientSetupMixin.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java index 8facb447..67309256 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java @@ -15,15 +15,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ClientSetup.class) public class ClientSetupMixin { - @Shadow @Final private BakedModelOverrideRegistry bakedModelOverrideRegistry; + @Shadow @Final private static BakedModelOverrideRegistry BAKED_MODEL_OVERRIDE_REGISTRY; - @Inject(method = "", at = @At("RETURN")) - private void addDynamicListener(CallbackInfo ci) { - MinecraftForge.EVENT_BUS.addListener(this::onDynamicModelBake); + @Inject(method = "onClientSetup", at = @At("RETURN"), remap = false) + private static void addDynamicListener(CallbackInfo ci) { + MinecraftForge.EVENT_BUS.addListener(ClientSetupMixin::onDynamicModelBake); } - private void onDynamicModelBake(DynamicModelBakeEvent event) { - BakedModelOverrideRegistry.BakedModelOverrideFactory factory = bakedModelOverrideRegistry.get(event.getLocation() instanceof ModelResourceLocation ? new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath()) : event.getLocation()); + private static void onDynamicModelBake(DynamicModelBakeEvent event) { + BakedModelOverrideRegistry.BakedModelOverrideFactory factory = BAKED_MODEL_OVERRIDE_REGISTRY.get(event.getLocation() instanceof ModelResourceLocation ? new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath()) : event.getLocation()); if(factory != null) event.setModel(factory.create(event.getModel(), event.getModelLoader().getBakedTopLevelModels())); }