From e65f8fbb32297d693fc552ab1998a3928b2bfe03 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 19 Jul 2023 10:05:09 -0400 Subject: [PATCH 1/3] Add option to override overrides Absolutely no support is guaranteed when this is used --- .../modernfix/core/config/ModernFixEarlyConfig.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 e3413561..d19530da 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; @@ -266,6 +268,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(); @@ -288,7 +293,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); 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 2/3] 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; + } +} From d9b9586af3aa62fbf4b2fadf1756d3239e6f993b Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:08:15 -0400 Subject: [PATCH 3/3] Update item override patch to 1.18 --- .../dynamic_resources/ItemOverridesMixin.java | 9 ---- .../main/resources/modernfix.accesswidener | 4 +- .../ItemOverridesFabricMixin.java | 24 ++++++++++ .../ItemOverridesForgeMixin.java | 45 +++++++++++++++++++ 4 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ItemOverridesFabricMixin.java create mode 100644 forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.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 index 794757dc..51915c7c 100644 --- 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 @@ -1,24 +1,15 @@ 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(); diff --git a/common/src/main/resources/modernfix.accesswidener b/common/src/main/resources/modernfix.accesswidener index babf2c36..84a6a568 100644 --- a/common/src/main/resources/modernfix.accesswidener +++ b/common/src/main/resources/modernfix.accesswidener @@ -31,4 +31,6 @@ accessible class net/minecraft/server/MinecraftServer$ReloadableResources accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map; accessible field net/minecraft/server/packs/resources/MultiPackResourceManager namespacedManagers Ljava/util/Map; -accessible field net/minecraft/resources/RegistryOps registryAccess Lnet/minecraft/core/RegistryAccess; \ No newline at end of file +accessible field net/minecraft/resources/RegistryOps registryAccess Lnet/minecraft/core/RegistryAccess; +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; \ No newline at end of file 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; + } + } + } + } +}