Fix baking of models and updating Scena to handle combined models with fluids better.

Author: marchermans

core/src/main/java/mod/flatcoloredblocks/core/client/model/loader/ColoredBlockModelLoader.java

@@ -82,8 +82,7 @@ public record ModelSpecification(ResourceLocation parentModel,
 
         @Override
             public BakedModel bake(IModelBakingContext iModelBakingContext, ModelBaker modelBaker, Function<Material, TextureAtlasSprite> function, ModelState modelState) {
-                final UnbakedModel unbakedModel = modelBaker.getModel(parentModel);
-                final BakedModel parentBakedModel = IModelManager.getInstance().adaptToPlatform(unbakedModel.bake(modelBaker, function, modelState));
+                final BakedModel parentBakedModel = modelBaker.bake(parentModel, modelState);
 
                 final Block block;
                 if (!BuiltInRegistries.BLOCK.containsKey(mimickedBlock)) {

core/src/main/java/mod/flatcoloredblocks/core/client/model/loader/ColoredItemModelLoader.java

@@ -79,8 +79,7 @@ public record ModelSpecification(ResourceLocation parentModel) implements IModel
 
         @Override
             public BakedModel bake(IModelBakingContext iModelBakingContext, ModelBaker modelBaker, Function<Material, TextureAtlasSprite> function, ModelState modelState) {
-                final UnbakedModel unbakedModel = modelBaker.getModel(parentModel);
-                final BakedModel parentBakedModel = IModelManager.getInstance().adaptToPlatform(unbakedModel.bake(modelBaker, function, modelState));
+                final BakedModel parentBakedModel = modelBaker.bake(parentModel, modelState);
 
                 return new Baked(parentBakedModel);
             }
@@ -243,7 +242,7 @@ private List<BakedQuad> buildRecoloredQuadData(final List<BakedQuad> parentQuads
 
         private BakedModel buildStackModel(final ItemStack stack, int color)
         {
-            color = IRenderingManager.getInstance().adaptVertexColor(color);
+            //color = IRenderingManager.getInstance().adaptVertexColor(color);
             final SimpleBakedModel.Builder builder = new SimpleBakedModel.Builder(
                     useAmbientOcclusion(),
                     usesBlockLight(),

gradle.properties

@@ -41,8 +41,8 @@ curse.id.fabric=691037
 ### Dependency versioning
 jetbrains.annotations.version=+
 communi.suggestu.saecularia.caudices.version=[21.1.5,)
-communi.suggestu.scena.version=[21.1.10,)
-chisels.and.bits.version=[21.1,)
+communi.suggestu.scena.version=[21.1.11,)
+chisels.and.bits.version=1.21.1-local
 
 ### Versioning
 localVersion=1.21.1-local