Mirroring, gem blocks

src/main/generated/assets/spectrum/blockstates/budding_citrine.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/budding_citrine"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/budding_moonstone.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/budding_moonstone"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/budding_onyx.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/budding_onyx"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/budding_topaz.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/budding_topaz"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/citrine_block.json

@@ -0,0 +1,12 @@
+{
+  "variants": {
+    "": [
+      {
+        "model": "spectrum:block/citrine_block"
+      },
+      {
+        "model": "spectrum:block/citrine_block_mirrored"
+      }
+    ]
+  }
+}

src/main/generated/assets/spectrum/blockstates/moonstone_block.json

@@ -0,0 +1,12 @@
+{
+  "variants": {
+    "": [
+      {
+        "model": "spectrum:block/moonstone_block"
+      },
+      {
+        "model": "spectrum:block/moonstone_block_mirrored"
+      }
+    ]
+  }
+}

src/main/generated/assets/spectrum/blockstates/onyx_block.json

@@ -0,0 +1,12 @@
+{
+  "variants": {
+    "": [
+      {
+        "model": "spectrum:block/onyx_block"
+      },
+      {
+        "model": "spectrum:block/onyx_block_mirrored"
+      }
+    ]
+  }
+}

src/main/generated/assets/spectrum/blockstates/topaz_block.json

@@ -0,0 +1,12 @@
+{
+  "variants": {
+    "": [
+      {
+        "model": "spectrum:block/topaz_block"
+      },
+      {
+        "model": "spectrum:block/topaz_block_mirrored"
+      }
+    ]
+  }
+}

src/main/resources/assets/spectrum/models/block/budding_citrine.json → src/main/generated/assets/spectrum/models/block/budding_citrine.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/budding_citrine"
   }

src/main/resources/assets/spectrum/models/block/budding_moonstone.json → src/main/generated/assets/spectrum/models/block/budding_moonstone.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/budding_moonstone"
   }

src/main/resources/assets/spectrum/models/block/budding_onyx.json → src/main/generated/assets/spectrum/models/block/budding_onyx.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/budding_onyx"
   }

src/main/resources/assets/spectrum/models/block/budding_topaz.json → src/main/generated/assets/spectrum/models/block/budding_topaz.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/budding_topaz"
   }

src/main/resources/assets/spectrum/models/block/citrine_block.json → src/main/generated/assets/spectrum/models/block/citrine_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/citrine_block"
   }

src/main/generated/assets/spectrum/models/block/citrine_block_mirrored.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_mirrored_all",
+  "textures": {
+    "all": "spectrum:block/citrine_block"
+  }
+}

src/main/resources/assets/spectrum/models/block/moonstone_block.json → src/main/generated/assets/spectrum/models/block/moonstone_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/moonstone_block"
   }

src/main/generated/assets/spectrum/models/block/moonstone_block_mirrored.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_mirrored_all",
+  "textures": {
+    "all": "spectrum:block/moonstone_block"
+  }
+}

src/main/resources/assets/spectrum/models/block/onyx_block.json → src/main/generated/assets/spectrum/models/block/onyx_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/onyx_block"
   }

src/main/generated/assets/spectrum/models/block/onyx_block_mirrored.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_mirrored_all",
+  "textures": {
+    "all": "spectrum:block/onyx_block"
+  }
+}

src/main/resources/assets/spectrum/models/block/topaz_block.json → src/main/generated/assets/spectrum/models/block/topaz_block.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "spectrum:block/topaz_block"
   }

src/main/generated/assets/spectrum/models/block/topaz_block_mirrored.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_mirrored_all",
+  "textures": {
+    "all": "spectrum:block/topaz_block"
+  }
+}

src/main/java/de/dafuqs/spectrum/SpectrumDataGenerator.java → src/main/java/de/dafuqs/spectrum/data/SpectrumDataGenerator.java

@@ -1,10 +1,9 @@
-package de.dafuqs.spectrum;
+package de.dafuqs.spectrum.data;
 
 import de.dafuqs.spectrum.registries.*;
 import net.fabricmc.fabric.api.datagen.v1.*;
 import net.fabricmc.fabric.api.datagen.v1.provider.*;
 import net.minecraft.block.*;
-import net.minecraft.data.client.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.item.*;
 import net.minecraft.registry.*;
@@ -94,23 +93,6 @@ public String getName() {
 		}
 	}
 
-	public static class SpectrumModelProvider extends FabricModelProvider {
-		public SpectrumModelProvider(FabricDataOutput output) {
-			super(output);
-		}
-
-		@Override
-		public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
-			SpectrumBlocks.provideBlockStateModels(blockStateModelGenerator);
-		}
-
-		@Override
-		public void generateItemModels(ItemModelGenerator itemModelGenerator) {
-			SpectrumBlocks.provideItemModels(itemModelGenerator);
-			SpectrumItems.provideItemModels(itemModelGenerator);
-		}
-	}
-
 	public interface TagBuilderCallback<T> {
 		FabricTagProvider<T>.FabricTagBuilder build(FabricTagProvider<T>.FabricTagBuilder provider);
 	}

src/main/java/de/dafuqs/spectrum/data/SpectrumModelProvider.java

@@ -0,0 +1,86 @@
+package de.dafuqs.spectrum.data;
+
+import de.dafuqs.spectrum.registries.*;
+import net.fabricmc.fabric.api.datagen.v1.*;
+import net.fabricmc.fabric.api.datagen.v1.provider.*;
+import net.minecraft.block.*;
+import net.minecraft.data.client.*;
+import net.minecraft.util.*;
+import net.minecraft.util.math.*;
+
+import static de.dafuqs.spectrum.data.SpectrumDataGenerator.*;
+
+public class SpectrumModelProvider extends FabricModelProvider {
+
+	public static final DeferredRegistrar.Contextual<BlockStateModelGenerator> BLOCK_STATE_MODEL_REGISTRAR = new DeferredRegistrar.Contextual<>(IS_DATAGEN);
+
+	public SpectrumModelProvider(FabricDataOutput output) {
+		super(output);
+	}
+
+	@Override
+	public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
+		BLOCK_STATE_MODEL_REGISTRAR.flush(blockStateModelGenerator);
+	}
+
+	@Override
+	public void generateItemModels(ItemModelGenerator itemModelGenerator) {
+		SpectrumBlocks.provideItemModels(itemModelGenerator);
+		SpectrumItems.provideItemModels(itemModelGenerator);
+	}
+
+	public static void registerSingletonBlockModel(Block block, TexturedModel.Factory factory) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx -> ctx.registerSingleton(block, factory));
+	}
+
+	public static void registerAxisRotatedBlockModel(Block block, TexturedModel.Factory factory) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx -> ctx.registerAxisRotated(block, factory));
+	}
+
+	public static void registerDefaultFacingUpBlockModel(Block block, TexturedModel.Factory factory) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx -> {
+			BlockStateVariantMap variants = BlockStateVariantMap.create(FacingBlock.FACING)
+					.register(Direction.DOWN, BlockStateVariant.create().put(VariantSettings.X, VariantSettings.Rotation.R180))
+					.register(Direction.EAST, BlockStateVariant.create().put(VariantSettings.X, VariantSettings.Rotation.R90).put(VariantSettings.Y, VariantSettings.Rotation.R90))
+					.register(Direction.NORTH, BlockStateVariant.create().put(VariantSettings.X, VariantSettings.Rotation.R90))
+					.register(Direction.SOUTH, BlockStateVariant.create().put(VariantSettings.X, VariantSettings.Rotation.R90).put(VariantSettings.Y, VariantSettings.Rotation.R180))
+					.register(Direction.UP, BlockStateVariant.create())
+					.register(Direction.WEST, BlockStateVariant.create().put(VariantSettings.X, VariantSettings.Rotation.R90).put(VariantSettings.Y, VariantSettings.Rotation.R270));
+			ctx.blockStateCollector.accept(VariantsBlockStateSupplier.create(block, BlockStateVariant.create().put(VariantSettings.MODEL, factory.upload(block, ctx.modelCollector)))
+					.coordinate(variants));
+		});
+	}
+
+	public static void registerSimpleMirroredBlockModel(Block block) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx -> {
+			VariantsBlockStateSupplier variants = VariantsBlockStateSupplier.create(block,
+					BlockStateVariant.create().put(VariantSettings.MODEL, TexturedModel.CUBE_ALL.upload(block, ctx.modelCollector)),
+					BlockStateVariant.create().put(VariantSettings.MODEL, TexturedModel.CUBE_MIRRORED_ALL.upload(block, ctx.modelCollector))
+			);
+			ctx.blockStateCollector.accept(variants);
+		});
+	}
+
+	public static void registerLogBlockModel(Block block) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx -> ctx.registerLog(block).log(block));
+	}
+
+	public static void registerWoodBlockModel(Block block, Block logBlock) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx -> ctx.registerLog(logBlock).wood(block));
+	}
+
+	public static void registerTintableCrossBlockModel(Block block, boolean tinted) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx ->
+				ctx.registerTintableCrossBlockState(block, tinted ? BlockStateModelGenerator.TintType.TINTED : BlockStateModelGenerator.TintType.NOT_TINTED));
+	}
+
+	public static void registerPottedPlantBlockModel(FlowerPotBlock block, boolean tinted) {
+		BLOCK_STATE_MODEL_REGISTRAR.defer(ctx -> {
+			BlockStateModelGenerator.TintType tintType = tinted ? BlockStateModelGenerator.TintType.TINTED : BlockStateModelGenerator.TintType.NOT_TINTED;
+			TextureMap textureMap = TextureMap.plant(block.getContent());
+			Identifier identifier = tintType.getFlowerPotCrossModel().upload(block, textureMap, ctx.modelCollector);
+			ctx.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(block, identifier));
+		});
+	}
+
+}

src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockTags.java

@@ -6,7 +6,7 @@
 import net.minecraft.registry.tag.*;
 import net.minecraft.util.*;
 
-import static de.dafuqs.spectrum.SpectrumDataGenerator.*;
+import static de.dafuqs.spectrum.data.SpectrumDataGenerator.*;
 
 @SuppressWarnings("unused")
 public class SpectrumBlockTags {