Merge 1.19.4 into 1.20

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java

@@ -75,7 +75,8 @@ public DynamicBakedModelProvider(ModelBakery bakery, Map<ModelBakery.BakedCacheK
         this.bakery = bakery;
         this.bakedCache = cache;
         this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
-        currentInstance = this;
+        if(currentInstance == null)
+            currentInstance = this;
     }
 
     public void setMissingModel(BakedModel model) {

common/src/main/java/org/embeddedt/modernfix/dynamicresources/ItemOverrideBakedModel.java

@@ -1,6 +1,5 @@
 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;
@@ -37,41 +36,41 @@ public BakedModel getRealModel() {
 
     @Override
     public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction direction, RandomSource random) {
-        return ImmutableList.of();
+        return getRealModel().getQuads(state, direction, random);
     }
 
     @Override
     public boolean useAmbientOcclusion() {
-        return false;
+        return getRealModel().useAmbientOcclusion();
     }
 
     @Override
     public boolean isGui3d() {
-        return false;
+        return getRealModel().isGui3d();
     }
 
     @Override
     public boolean usesBlockLight() {
-        return false;
+        return getRealModel().usesBlockLight();
     }
 
     @Override
     public boolean isCustomRenderer() {
-        return false;
+        return getRealModel().isCustomRenderer();
     }
 
     @Override
     public TextureAtlasSprite getParticleIcon() {
-        return null;
+        return getRealModel().getParticleIcon();
     }
 
     @Override
     public ItemTransforms getTransforms() {
-        return ItemTransforms.NO_TRANSFORMS;
+        return getRealModel().getTransforms();
     }
 
     @Override
     public ItemOverrides getOverrides() {
-        return null;
+        return getRealModel().getOverrides();
     }
 }

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -179,6 +179,7 @@ private ImmutableList<BlockState> fetchBlocks(StateDefinition<Block, BlockState>
     private void captureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) {
         this.ignoreModelLoad = false;
         textureGetter = getter;
+        DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
     }
 
     @Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;"))

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -150,6 +150,7 @@ private ImmutableList<BlockState> fetchBlocks(StateDefinition<Block, BlockState>
     @Inject(method = "bakeModels", at = @At("HEAD"))
     private void storeTextureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) {
         textureGetter = getter;
+        DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
     }
 
     @Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;"))