Add livingrock slate, new textures for catalysts

Xplat/src/main/java/vazkii/botania/common/block/BotaniaBlocks.java

@@ -204,6 +204,7 @@ public final class BotaniaBlocks {
 
 	public static final Block livingrock = new BotaniaBlock(BlockBehaviour.Properties.of().strength(2, 10).sound(SoundType.STONE).mapColor(MapColor.TERRACOTTA_WHITE).requiresCorrectToolForDrops());
 	public static final Block livingrockPolished = new BotaniaBlock(BlockBehaviour.Properties.copy(livingrock));
+	public static final Block livingrockSlate = new BotaniaBlock(BlockBehaviour.Properties.copy(livingrock));
 	public static final Block livingrockBrick = new BotaniaBlock(BlockBehaviour.Properties.copy(livingrock));
 	public static final Block livingrockBrickChiseled = new BotaniaBlock(BlockBehaviour.Properties.copy(livingrock));
 	public static final Block livingrockBrickCracked = new BotaniaBlock(BlockBehaviour.Properties.copy(livingrock));
@@ -728,6 +729,7 @@ public static void registerBlocks(BiConsumer<Block, ResourceLocation> r) {
 		r.accept(livingrockPolishedStairs, prefix(LibBlockNames.LIVING_ROCK_POLISHED + STAIR_SUFFIX));
 		r.accept(livingrockPolishedSlab, prefix(LibBlockNames.LIVING_ROCK_POLISHED + SLAB_SUFFIX));
 		r.accept(livingrockPolishedWall, prefix(LibBlockNames.LIVING_ROCK_POLISHED + WALL_SUFFIX));
+		r.accept(livingrockSlate, prefix(LibBlockNames.LIVING_ROCK_SLATE));
 		r.accept(livingrockBrick, prefix(LibBlockNames.LIVING_ROCK_BRICK));
 		r.accept(livingrockBrickStairs, prefix(LibBlockNames.LIVING_ROCK_BRICK + STAIR_SUFFIX));
 		r.accept(livingrockBrickSlab, prefix(LibBlockNames.LIVING_ROCK_BRICK + SLAB_SUFFIX));
@@ -1212,6 +1214,7 @@ public static void registerItemBlocks(BiConsumer<Item, ResourceLocation> r) {
 		r.accept(new BlockItem(livingrockPolishedStairs, props), BuiltInRegistries.BLOCK.getKey(livingrockPolishedStairs));
 		r.accept(new BlockItem(livingrockPolishedSlab, props), BuiltInRegistries.BLOCK.getKey(livingrockPolishedSlab));
 		r.accept(new BlockItem(livingrockPolishedWall, props), BuiltInRegistries.BLOCK.getKey(livingrockPolishedWall));
+		r.accept(new BlockItem(livingrockSlate, props), BuiltInRegistries.BLOCK.getKey(livingrockSlate));
 		r.accept(new BlockItem(livingrockBrick, props), BuiltInRegistries.BLOCK.getKey(livingrockBrick));
 		r.accept(new BlockItem(livingrockBrickStairs, props), BuiltInRegistries.BLOCK.getKey(livingrockBrickStairs));
 		r.accept(new BlockItem(livingrockBrickSlab, props), BuiltInRegistries.BLOCK.getKey(livingrockBrickSlab));

Xplat/src/main/java/vazkii/botania/common/lib/LibBlockNames.java

@@ -19,6 +19,7 @@ public final class LibBlockNames {
 	public static final String APOTHECARY_PREFIX = "apothecary_";
 	public static final String LIVING_ROCK = "livingrock";
 	public static final String LIVING_ROCK_POLISHED = "polished_livingrock";
+	public static final String LIVING_ROCK_SLATE = "livingrock_slate";
 	public static final String LIVING_ROCK_BRICK = "livingrock_bricks";
 	public static final String LIVING_ROCK_BRICK_MOSSY = "mossy_livingrock_bricks";
 	public static final String LIVING_ROCK_BRICK_CRACKED = "cracked_livingrock_bricks";

Xplat/src/main/java/vazkii/botania/data/BlockstateProvider.java

@@ -350,6 +350,10 @@ protected void registerStatesAndModels() {
 		);
 		slabBlock(remainingBlocks, livingrockPolishedSlab, polishedLivingrockSlabDoubleModel, polishedLivingrockSlabSideTexture, polishedLivingrockTexture, polishedLivingrockTexture);
 
+		var conjurationTexture = getBlockTexture(conjurationCatalyst);
+		var conjurationMirrored = getBlockTexture(conjurationCatalyst, "_mirrored");
+		checkeredBlockWithBlockstate(remainingBlocks, conjurationCatalyst, conjurationTexture, conjurationMirrored);
+
 		// block entities with only particles
 		particleOnly(remainingBlocks, animatedTorch, getBlockTexture(Blocks.REDSTONE_TORCH));
 		particleOnly(remainingBlocks, avatar, getBlockTexture(livingwoodLog));
@@ -1090,7 +1094,7 @@ protected ResourceLocation checkeredBlockWithBlockstate(Set<Block> blocks, Block
 		BiFunction<String, Optional<String>, ModelTemplate> checkeredTemplate = (model, suffix) -> new ModelTemplate(Optional.of(prefix("block/shapes/" + model)), suffix, TextureSlot.SIDE, TextureSlot.NORTH);
 		TextureMapping checkeredMapping = new TextureMapping().put(TextureSlot.SIDE, texture).put(TextureSlot.NORTH, mirroredTexture);
 
-		var blockModel = checkeredTemplate.apply("cube_checkered", Optional.empty()).create(biomeBrickMesa, checkeredMapping, this.modelOutput);
+		var blockModel = checkeredTemplate.apply("cube_checkered", Optional.empty()).create(block, checkeredMapping, this.modelOutput);
 		cubeAllWithModels(blocks, block, new ResourceLocation[] { blockModel }, new Integer[] { 1 });
 		return blockModel;
 	}

Xplat/src/main/resources/assets/botania/lang/en_us.json

@@ -586,6 +586,7 @@
   "block.botania.apothecary_deepslate": "Deepslate Petal Apothecary",
   "block.botania.livingrock": "Livingrock",
   "block.botania.polished_livingrock": "Polished Livingrock",
+  "block.botania.livingrock_slate": "Livingrock Slate",
   "block.botania.polished_livingrock_slab": "Polished Livingrock Slab",
   "block.botania.polished_livingrock_stairs": "Polished Livingrock Stairs",
   "block.botania.polished_livingrock_wall": "Polished Livingrock Wall",

Xplat/src/main/resources/assets/botania/textures/block/alchemy_catalyst.png.mcmeta

@@ -0,0 +1,7 @@
+{
+	"animation": {
+		"frametime": 120,
+		"interpolate": true,
+		"frames": [ 0, 1, 2, 3, 4, 5, 6 ]
+	}
+}

Xplat/src/main/resources/assets/botania/textures/block/alchemy_catalyst_overlay.png.mcmeta

@@ -0,0 +1,7 @@
+{
+	"animation": {
+		"frametime": 120,
+		"interpolate": true,
+		"frames": [ 0, 1, 2, 3, 4, 5, 6 ]
+	}
+}

Xplat/src/main/resources/assets/botania/textures/block/conjuration_catalyst.png.mcmeta

@@ -0,0 +1,7 @@
+{
+	"animation": {
+		"frametime": 120,
+		"interpolate": true,
+		"frames": [ 1, 3, 0, 2, 3, 0 ]
+	}
+}

Xplat/src/main/resources/assets/botania/textures/block/conjuration_catalyst_mirrored.png.mcmeta

@@ -0,0 +1,7 @@
+{
+	"animation": {
+		"frametime": 120,
+		"interpolate": true,
+		"frames": [ 1, 3, 0, 2, 3, 0 ]
+	}
+}

Xplat/src/main/resources/assets/botania/textures/block/conjuration_catalyst_overlay.png.mcmeta

@@ -0,0 +1,7 @@
+{
+	"animation": {
+		"frametime": 120,
+		"interpolate": true,
+		"frames": [ 1, 3, 0, 2, 3, 0 ]
+	}
+}