From 60bc6102e246ceecb948fd5033605cbb783696e6 Mon Sep 17 00:00:00 2001 From: grimmauld Date: Fri, 26 Mar 2021 23:21:44 +0100 Subject: [PATCH] Add Create stone to base_stone_overworld block tag (terraforged was complaining) --- src/generated/resources/.cache/cache | 1 + .../minecraft/tags/blocks/base_stone_overworld.json | 10 ++++++++++ src/main/java/com/simibubi/create/AllBlocks.java | 6 +++--- src/main/java/com/simibubi/create/AllTags.java | 3 +-- .../create/content/palettes/AllPaletteBlocks.java | 5 +++++ 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/base_stone_overworld.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index d0c689770..76c10722a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -3696,6 +3696,7 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/br f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/copper.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json 1376cd1f92903a1c4e1422719b1aa102438a216e data/minecraft/advancements/createchromatic_age.json +2072c51afc5bbc6c9d64fd086803193d8a3c40de data/minecraft/tags/blocks/base_stone_overworld.json 508730d3822c54d355329bf6a33d58071653afad data/minecraft/tags/blocks/beacon_base_blocks.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 378b01e288301e0835d3d25167889077a2070780 data/minecraft/tags/blocks/rails.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/base_stone_overworld.json b/src/generated/resources/data/minecraft/tags/blocks/base_stone_overworld.json new file mode 100644 index 000000000..39e5fd569 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/base_stone_overworld.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "create:limestone", + "create:weathered_limestone", + "create:dolomite", + "create:gabbro", + "create:natural_scoria" + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 840de5a1f..a646636b0 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1294,7 +1294,7 @@ public class AllBlocks { REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f)) .initialProperties(() -> Blocks.IRON_BLOCK) .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(AllBlockTags.BEACON_BASE_BLOCKS.tag) + .tag(BlockTags.BEACON_BASE_BLOCKS) .transform(tagBlockAndItem("storage_blocks/copper")) .tag(Tags.Items.STORAGE_BLOCKS) .transform(oxidizedItemModel()) @@ -1320,7 +1320,7 @@ public class AllBlocks { public static final BlockEntry ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new Block(p)) .initialProperties(() -> Blocks.IRON_BLOCK) .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(AllBlockTags.BEACON_BASE_BLOCKS.tag) + .tag(BlockTags.BEACON_BASE_BLOCKS) .transform(tagBlockAndItem("storage_blocks/zinc")) .tag(Tags.Items.STORAGE_BLOCKS) .build() @@ -1331,7 +1331,7 @@ public class AllBlocks { .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() .cubeAll(c.getName(), p.modLoc("block/brass_storage_block")))) .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(AllBlockTags.BEACON_BASE_BLOCKS.tag) + .tag(BlockTags.BEACON_BASE_BLOCKS) .transform(tagBlockAndItem("storage_blocks/brass")) .tag(Tags.Items.STORAGE_BLOCKS) .build() diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index a017cc657..1a7768a7c 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -1,7 +1,6 @@ package com.simibubi.create; import static com.simibubi.create.AllTags.NameSpace.FORGE; -import static com.simibubi.create.AllTags.NameSpace.MC; import static com.simibubi.create.AllTags.NameSpace.MOD; import static com.simibubi.create.AllTags.NameSpace.TIC; @@ -142,7 +141,7 @@ public class AllTags { } public static enum AllBlockTags { - WINDMILL_SAILS, FAN_HEATERS, WINDOWABLE, NON_MOVABLE, BRITTLE, SEATS, SAILS, VALVE_HANDLES, FAN_TRANSPARENT, SAFE_NBT, SLIMY_LOGS(TIC), BEACON_BASE_BLOCKS(MC) + WINDMILL_SAILS, FAN_HEATERS, WINDOWABLE, NON_MOVABLE, BRITTLE, SEATS, SAILS, VALVE_HANDLES, FAN_TRANSPARENT, SAFE_NBT, SLIMY_LOGS(TIC) ; diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java index f6f75708d..dfb730b13 100644 --- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java @@ -114,6 +114,7 @@ public class AllPaletteBlocks { public static final BlockEntry LIMESTONE = REGISTRATE.baseBlock("limestone", Block::new, () -> Blocks.SANDSTONE, true) + .tag(BlockTags.BASE_STONE_OVERWORLD) .register(); public static final PalettesVariantEntry LIMESTONE_VARIANTS = @@ -121,6 +122,7 @@ public class AllPaletteBlocks { public static final BlockEntry WEATHERED_LIMESTONE = REGISTRATE.baseBlock("weathered_limestone", Block::new, () -> Blocks.SANDSTONE, true) + .tag(BlockTags.BASE_STONE_OVERWORLD) .register(); public static final PalettesVariantEntry WEATHERED_LIMESTONE_VARIANTS = new PalettesVariantEntry( @@ -128,6 +130,7 @@ public class AllPaletteBlocks { public static final BlockEntry DOLOMITE = REGISTRATE.baseBlock("dolomite", Block::new, () -> Blocks.QUARTZ_BLOCK, true) + .tag(BlockTags.BASE_STONE_OVERWORLD) .register(); public static final PalettesVariantEntry DOLOMITE_VARIANTS = @@ -135,6 +138,7 @@ public class AllPaletteBlocks { public static final BlockEntry GABBRO = REGISTRATE.baseBlock("gabbro", Block::new, () -> Blocks.ANDESITE, true) + .tag(BlockTags.BASE_STONE_OVERWORLD) .register(); public static final PalettesVariantEntry GABBRO_VARIANTS = @@ -146,6 +150,7 @@ public class AllPaletteBlocks { public static final BlockEntry NATURAL_SCORIA = REGISTRATE.block("natural_scoria", Block::new) .initialProperties(() -> Blocks.ANDESITE) + .tag(BlockTags.BASE_STONE_OVERWORLD) .onRegister(CreateRegistrate.blockVertexColors(new ScoriaVertexColor())) .loot((p, g) -> p.registerLootTable(g, RegistrateBlockLootTables.droppingWithSilkTouch(g, SCORIA.get()))) .blockstate(palettesCubeAll())