Added Fabric model and blockstate datagen for Wooden Mosaics and Terracotta Tiles

Author: MikiP98

src/main/java/io/github/mikip98/humilityafm/datagen/ModelGenerator.java

@@ -1,6 +1,8 @@
 package io.github.mikip98.humilityafm.datagen;
 
 import io.github.mikip98.humilityafm.generators.CabinetBlockGenerator;
+import io.github.mikip98.humilityafm.helpers.TerracottaTilesHelper;
+import io.github.mikip98.humilityafm.helpers.WoodenMosaicHelper;
 import io.github.mikip98.humilityafm.registries.BlockRegistry;
 import io.github.mikip98.humilityafm.util.GenerationData;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
@@ -16,6 +18,7 @@
 import static io.github.mikip98.humilityafm.HumilityAFM.getId;
 
 public class ModelGenerator extends FabricModelProvider {
+    // Cabinet Models
     protected static final Model CABINET_BLOCK_MODEL = new Model(
             Optional.of(getId("block/cabinet_block")),
             Optional.empty()
@@ -24,6 +27,11 @@ public class ModelGenerator extends FabricModelProvider {
             Optional.of(getId("block/cabinet_block_open")),
             Optional.empty()
     );
+    // Checker 2x2 Model
+    protected static final Model CHECKER_2X2 = new Model(
+            Optional.of(getId("block/checker_2x2")),
+            Optional.empty()
+    );
 
 
     public ModelGenerator(FabricDataOutput output) {
@@ -33,11 +41,66 @@ public ModelGenerator(FabricDataOutput output) {
 
     @Override
     public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
+        // ............ TEST BLOCKS & BLOCK ITEMS ............
+        // Cabinet Blocks
         blockStateModelGenerator.registerParentedItemModel(BlockRegistry.CABINET_BLOCK, getId("block/cabinet_block"));
         blockStateModelGenerator.registerParentedItemModel(BlockRegistry.ILLUMINATED_CABINET_BLOCK, getId("block/cabinet_block"));
         blockStateModelGenerator.blockStateCollector.accept(getCabinetBlockstate(BlockRegistry.CABINET_BLOCK, getId("block/cabinet_block"), getId("block/cabinet_block_open")));
         blockStateModelGenerator.blockStateCollector.accept(getCabinetBlockstate(BlockRegistry.ILLUMINATED_CABINET_BLOCK, getId("block/cabinet_block"), getId("block/cabinet_block_open")));
+        // Wooden Mosaic
+        blockStateModelGenerator.registerParentedItemModel(BlockRegistry.WOODEN_MOSAIC, getId("block/checker_2x2"));
+        blockStateModelGenerator.blockStateCollector.accept(getDefaultBlockstate(BlockRegistry.WOODEN_MOSAIC, getId("block/checker_2x2")));
+
+        // ............ FINAL BLOCKS & BLOCK ITEMS ............
+        generateCabinetModelsAndBlockStates(blockStateModelGenerator);
+        generateWoodenMosaicModelsAndBlockStates(blockStateModelGenerator);
+        generateTerracottaTilesModelsAndBlockStates(blockStateModelGenerator);
+    }
 
+    protected static void generateWoodenMosaicModelsAndBlockStates(BlockStateModelGenerator blockStateModelGenerator) {
+        int i = 0;
+        for (String woodType : GenerationData.vanillaWoodTypes) {
+            for (String woodType2 : GenerationData.vanillaWoodTypes) {
+                if (woodType.equals(woodType2)) continue;
+
+                final Identifier woodenMosaicModelId = CHECKER_2X2.upload(
+                        getId("block/wooden_mosaic/wooden_mosaic_" + woodType + "_" + woodType2),
+                        new TextureMap()
+                                .register(TextureKey.of("1"), new Identifier("block/" + woodType + "_planks"))
+                                .register(TextureKey.of("2"), new Identifier("block/" + woodType2 + "_planks"))
+                                .register(TextureKey.PARTICLE, new Identifier("block/" + woodType + "_planks")),
+                        blockStateModelGenerator.modelCollector
+                );
+                blockStateModelGenerator.registerParentedItemModel(WoodenMosaicHelper.woodenMosaicVariants[i], woodenMosaicModelId);
+                blockStateModelGenerator.blockStateCollector.accept(getDefaultBlockstate(WoodenMosaicHelper.woodenMosaicVariants[i], woodenMosaicModelId));
+
+                ++i;
+            }
+        }
+    }
+    protected static void generateTerracottaTilesModelsAndBlockStates(BlockStateModelGenerator blockStateModelGenerator) {
+        int i = 0;
+        for (String color : GenerationData.vanillaColorPallet) {
+            for (String color2 : GenerationData.vanillaColorPallet) {
+                if (color.equals(color2)) continue;
+
+                final Identifier terracottaTileModelId = CHECKER_2X2.upload(
+                        getId("block/terracotta_tiles/terracotta_tiles_" + color + "_" + color2),
+                        new TextureMap()
+                                .register(TextureKey.of("1"), new Identifier("block/" + color + "_terracotta"))
+                                .register(TextureKey.of("2"), new Identifier("block/" + color2 + "_terracotta"))
+                                .register(TextureKey.PARTICLE, new Identifier("block/" + color + "_terracotta")),
+                        blockStateModelGenerator.modelCollector
+                );
+                blockStateModelGenerator.registerParentedItemModel(TerracottaTilesHelper.terracottaTilesVariants[i], terracottaTileModelId);
+                blockStateModelGenerator.blockStateCollector.accept(getDefaultBlockstate(TerracottaTilesHelper.terracottaTilesVariants[i], terracottaTileModelId));
+
+                ++i;
+            }
+        }
+    }
+
+    protected static void generateCabinetModelsAndBlockStates(BlockStateModelGenerator blockStateModelGenerator) {
         int i = 0;
         for (String woodType : GenerationData.vanillaWoodTypes) {
             final Identifier woodTypeCabinetId = CABINET_BLOCK_MODEL.upload(
@@ -86,6 +149,10 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen
     }
 
 
+    protected static VariantsBlockStateSupplier getDefaultBlockstate(Block block, Identifier modelId) {
+        return VariantsBlockStateSupplier.create(block, BlockStateVariant.create().put(VariantSettings.MODEL, modelId));
+    }
+
     protected static MultipartBlockStateSupplier getCabinetBlockstate(Block cabinetBlock, Identifier cabinetModel, Identifier cabinetOpenModel) {
         return MultipartBlockStateSupplier
                 .create(cabinetBlock)