From c0cdbd122e1afd5ff57ba4e7af739d8d00566cce Mon Sep 17 00:00:00 2001 From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com> Date: Wed, 25 Oct 2023 11:26:01 -0700 Subject: [PATCH] Unify ModelMangerMixin (#265) --- .../dynamic_resources/ModelManagerMixin.java | 2 +- .../dynamic_resources/ModelManagerMixin.java | 66 ------------------- 2 files changed, 1 insertion(+), 67 deletions(-) rename {fabric/src/main/java/org/embeddedt/modernfix/fabric => common/src/main/java/org/embeddedt/modernfix/common}/mixin/perf/dynamic_resources/ModelManagerMixin.java (98%) delete mode 100644 forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java similarity index 98% rename from fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelManagerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java index 62179e16..683f4169 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelManagerMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.fabric.mixin.perf.dynamic_resources; +package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources; import com.google.common.collect.ImmutableList; import net.minecraft.client.renderer.block.model.BlockModel; diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java deleted file mode 100644 index 98066097..00000000 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources; - -import com.google.common.collect.ImmutableList; -import net.minecraft.client.renderer.block.model.BlockModel; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelManager; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; -import net.minecraft.util.GsonHelper; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import org.embeddedt.modernfix.ModernFix; -import org.embeddedt.modernfix.util.LambdaMap; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import java.io.BufferedReader; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; -import java.util.stream.Collectors; - -@Mixin(ModelManager.class) -public class ModelManagerMixin { - @Redirect(method = "reload", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/ModelManager;loadBlockModels(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;")) - private CompletableFuture> deferBlockModelLoad(ResourceManager manager, Executor executor) { - return CompletableFuture.completedFuture(new LambdaMap<>(location -> loadSingleBlockModel(manager, location))); - } - - @Redirect(method = "reload", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/ModelManager;loadBlockStates(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;")) - private CompletableFuture>> deferBlockStateLoad(ResourceManager manager, Executor executor) { - return CompletableFuture.completedFuture(new LambdaMap<>(location -> loadSingleBlockState(manager, location))); - } - - @Redirect(method = "loadModels", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;")) - private ImmutableList skipCollection(StateDefinition definition) { - return ImmutableList.of(); - } - - private BlockModel loadSingleBlockModel(ResourceManager manager, ResourceLocation location) { - return manager.getResource(location).map(resource -> { - try (BufferedReader reader = resource.openAsReader()) { - return BlockModel.fromStream(reader); - } catch(IOException e) { - ModernFix.LOGGER.error("Couldn't load model", e); - return null; - } - }).orElse(null); - } - - private List loadSingleBlockState(ResourceManager manager, ResourceLocation location) { - return manager.getResourceStack(location).stream().map(resource -> { - try (BufferedReader reader = resource.openAsReader()) { - return new ModelBakery.LoadedJson(resource.sourcePackId(), GsonHelper.parse(reader)); - } catch(IOException e) { - ModernFix.LOGGER.error("Couldn't load blockstate", e); - return null; - } - }).filter(Objects::nonNull).collect(Collectors.toList()); - } -}