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..51915c7c --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemOverridesMixin.java @@ -0,0 +1,21 @@ +package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources; + +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.callback.CallbackInfoReturnable; + +@Mixin(ItemOverrides.class) +public class ItemOverridesMixin { + @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/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index e8196a13..82af6054 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -31,6 +31,8 @@ public class ModernFixEarlyConfig { private final Map options = new HashMap<>(); private final Multimap optionsByCategory = HashMultimap.create(); + private static final boolean ALLOW_OVERRIDE_OVERRIDES = Boolean.getBoolean("modernfix.unsupported.allowOverriding"); + public static final boolean OPTIFINE_PRESENT; private File configFile; @@ -263,6 +265,9 @@ public class ModernFixEarlyConfig { } private void readProperties(Properties props) { + if(ALLOW_OVERRIDE_OVERRIDES) + LOGGER.fatal("JVM argument given to override mod overrides. Issues opened with this option present will be ignored unless they can be reproduced without."); + for (Map.Entry entry : props.entrySet()) { String key = (String) entry.getKey(); String value = (String) entry.getValue(); @@ -285,7 +290,7 @@ public class ModernFixEarlyConfig { continue; } - if(!option.isModDefined()) + if(ALLOW_OVERRIDE_OVERRIDES || !option.isModDefined()) option.setEnabled(enabled, true); else LOGGER.warn("Option '{}' already disabled by a mod. Ignoring user configuration", key); 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 51db8374..167a3c4a 100644 --- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java +++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java @@ -23,6 +23,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; @@ -73,6 +74,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; + } +} diff --git a/common/src/main/resources/modernfix.accesswidener b/common/src/main/resources/modernfix.accesswidener index 28794e6a..48333b21 100644 --- a/common/src/main/resources/modernfix.accesswidener +++ b/common/src/main/resources/modernfix.accesswidener @@ -32,3 +32,5 @@ accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (L accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map; accessible field net/minecraft/client/renderer/block/model/multipart/MultiPart definition Lnet/minecraft/world/level/block/state/StateDefinition; accessible field net/minecraft/server/packs/resources/MultiPackResourceManager namespacedManagers Ljava/util/Map; +accessible field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel; +mutable field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel; diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ItemOverridesFabricMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ItemOverridesFabricMixin.java new file mode 100644 index 00000000..83eb0547 --- /dev/null +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ItemOverridesFabricMixin.java @@ -0,0 +1,24 @@ +package org.embeddedt.modernfix.fabric.mixin.perf.dynamic_resources; + +import net.minecraft.client.renderer.block.model.BlockModel; +import net.minecraft.client.renderer.block.model.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.UnbakedModel; +import net.minecraft.resources.ResourceLocation; +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.callback.CallbackInfoReturnable; + +import java.util.function.Function; + +@Mixin(ItemOverrides.class) +public class ItemOverridesFabricMixin { + @Inject(method = "bakeModel", at = @At("HEAD"), cancellable = true) + private void useDynamicallyBakedModel(ModelBakery baker, BlockModel model, Function modelGetter, ItemOverride override, CallbackInfoReturnable cir) { + cir.setReturnValue(ItemOverrideBakedModel.of(override.getModel())); + } +} diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java new file mode 100644 index 00000000..935601b0 --- /dev/null +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java @@ -0,0 +1,45 @@ +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources; + +import net.minecraft.client.renderer.block.model.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.Material; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.UnbakedModel; +import net.minecraft.resources.ResourceLocation; +import org.embeddedt.modernfix.dynamicresources.ItemOverrideBakedModel; +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.CallbackInfoReturnable; + +import java.util.function.Function; + +@Mixin(ItemOverrides.class) +public class ItemOverridesForgeMixin { + @Shadow @Final private ItemOverrides.BakedOverride[] overrides; + private volatile boolean forceLoadedModels = false; + + @Inject(method = "bakeModel", at = @At("HEAD"), cancellable = true, remap = false) + private void useDynamicallyBakedModel(ModelBakery baker, UnbakedModel model, Function function, Function textureGetter, ItemOverride override, CallbackInfoReturnable cir) { + cir.setReturnValue(ItemOverrideBakedModel.of(override.getModel())); + } + + @Inject(method = "getOverrides", at = @At("HEAD"), remap = false) + private void doForceloadModels(CallbackInfoReturnable cir) { + if(!forceLoadedModels) { + synchronized (this) { + if(!forceLoadedModels) { + for(ItemOverrides.BakedOverride override : overrides) { + if(override != null && override.model instanceof ItemOverrideBakedModel) + override.model = ((ItemOverrideBakedModel)override.model).getRealModel(); + } + forceLoadedModels = true; + } + } + } + } +}