Merge 1.18 into 1.19.2

Author: embeddedt

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

@@ -74,7 +74,8 @@ public DynamicBakedModelProvider(ModelBakery bakery, Map<Triple<ResourceLocation
         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

@@ -353,6 +353,7 @@ public void clear() {
         this.topLevelModels.clear();
         this.topLevelModels.put(MISSING_MODEL_LOCATION, this.missingModel);
         this.smallLoadingCache.clear();
+        DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
     }
 
     /**

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

@@ -211,6 +211,7 @@ private void skipBake(TextureManager resourceManager, ProfilerFiller profiler, C
         profiler.pop();
         // ensure missing model is a permanent override
         this.bakedTopLevelModels.put(MISSING_MODEL_LOCATION, this.bake(MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0, this.atlasSet::getSprite));
+        DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
         cir.setReturnValue(atlasSet);
     }