From ac436db4567e5e20ad0f068d6bfaee83629b9593 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:50:16 -0400 Subject: [PATCH] Add support to dynamic resources for item overrides --- .../dynamic_resources/ItemOverridesMixin.java | 30 ++++++++ .../DynamicBakedModelProvider.java | 2 + .../ItemOverrideBakedModel.java | 77 +++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemOverridesMixin.java create mode 100644 common/src/main/java/org/embeddedt/modernfix/dynamicresources/ItemOverrideBakedModel.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemOverridesMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemOverridesMixin.java new file mode 100644 index 00000000..794757dc --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemOverridesMixin.java @@ -0,0 +1,30 @@ +package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources; + +import net.minecraft.client.renderer.block.model.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.resources.model.BakedModel; +import org.embeddedt.modernfix.dynamicresources.ItemOverrideBakedModel; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.function.Function; + +@Mixin(ItemOverrides.class) +public class ItemOverridesMixin { + @ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;map(Ljava/util/function/Function;)Ljava/util/stream/Stream;"), index = 0) + private Function itemToBaked(Function original) { + return override -> ItemOverrideBakedModel.of(override.getModel()); + } + + @Inject(method = "resolve", at = @At("RETURN"), cancellable = true) + private void getRealModel(CallbackInfoReturnable cir) { + BakedModel original = cir.getReturnValue(); + if(original instanceof ItemOverrideBakedModel) { + ItemOverrideBakedModel override = (ItemOverrideBakedModel)original; + cir.setReturnValue(override.getRealModel()); + } + } +} diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java index 250a8272..28dd1ca5 100644 --- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java +++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java @@ -22,6 +22,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; public class DynamicBakedModelProvider implements Map { + public static DynamicBakedModelProvider currentInstance = null; private final ModelBakery bakery; private final Map, BakedModel> bakedCache; private final Map permanentOverrides; @@ -72,6 +73,7 @@ public class DynamicBakedModelProvider implements Map()); + currentInstance = this; } public void setMissingModel(BakedModel model) { diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ItemOverrideBakedModel.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ItemOverrideBakedModel.java new file mode 100644 index 00000000..bfe9eacf --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ItemOverrideBakedModel.java @@ -0,0 +1,77 @@ +package org.embeddedt.modernfix.dynamicresources; + +import com.google.common.collect.ImmutableList; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.Direction; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; + +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Delegate model that stores the location of an actual baked model, for use in ItemOverrides. + */ +public class ItemOverrideBakedModel implements BakedModel { + private static final Map OVERRIDE_MODELS = new ConcurrentHashMap<>(); + public final ResourceLocation realLocation; + + private ItemOverrideBakedModel(ResourceLocation realLocation) { + this.realLocation = realLocation; + } + + public static ItemOverrideBakedModel of(ResourceLocation realLocation) { + return OVERRIDE_MODELS.computeIfAbsent(realLocation, ItemOverrideBakedModel::new); + } + + public BakedModel getRealModel() { + return DynamicBakedModelProvider.currentInstance.get(realLocation); + } + + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction direction, Random random) { + return ImmutableList.of(); + } + + @Override + public boolean useAmbientOcclusion() { + return false; + } + + @Override + public boolean isGui3d() { + return false; + } + + @Override + public boolean usesBlockLight() { + return false; + } + + @Override + public boolean isCustomRenderer() { + return false; + } + + @Override + public TextureAtlasSprite getParticleIcon() { + return null; + } + + @Override + public ItemTransforms getTransforms() { + return ItemTransforms.NO_TRANSFORMS; + } + + @Override + public ItemOverrides getOverrides() { + return null; + } +}