mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add Create stone to base_stone_overworld block tag (terraforged was complaining)

Browse source
This commit is contained in:
grimmauld 2021-03-26 23:21:44 +01:00
parent fe10c258c4
commit 60bc6102e2
5 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/generated/resources/.cache/cache
View file

@ -3696,6 +3696,7 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/br
f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/copper.json f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/copper.json
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json
1376cd1f92903a1c4e1422719b1aa102438a216e data/minecraft/advancements/createchromatic_age.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 508730d3822c54d355329bf6a33d58071653afad data/minecraft/tags/blocks/beacon_base_blocks.json
69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json
378b01e288301e0835d3d25167889077a2070780 data/minecraft/tags/blocks/rails.json 378b01e288301e0835d3d25167889077a2070780 data/minecraft/tags/blocks/rails.json

10
src/generated/resources/data/minecraft/tags/blocks/base_stone_overworld.json Normal file
View file

@ -0,0 +1,10 @@
{
"replace": false,
"values": [
"create:limestone",
"create:weathered_limestone",
"create:dolomite",
"create:gabbro",
"create:natural_scoria"
]
}

6
src/main/java/com/simibubi/create/AllBlocks.java
View file

@ -1294,7 +1294,7 @@ public class AllBlocks {
REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f)) REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f))
.initialProperties(() -> Blocks.IRON_BLOCK) .initialProperties(() -> Blocks.IRON_BLOCK)
.tag(Tags.Blocks.STORAGE_BLOCKS) .tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(AllBlockTags.BEACON_BASE_BLOCKS.tag) .tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/copper")) .transform(tagBlockAndItem("storage_blocks/copper"))
.tag(Tags.Items.STORAGE_BLOCKS) .tag(Tags.Items.STORAGE_BLOCKS)
.transform(oxidizedItemModel()) .transform(oxidizedItemModel())
@ -1320,7 +1320,7 @@ public class AllBlocks {
public static final BlockEntry<Block> ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new Block(p)) public static final BlockEntry<Block> ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new Block(p))
.initialProperties(() -> Blocks.IRON_BLOCK) .initialProperties(() -> Blocks.IRON_BLOCK)
.tag(Tags.Blocks.STORAGE_BLOCKS) .tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(AllBlockTags.BEACON_BASE_BLOCKS.tag) .tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/zinc")) .transform(tagBlockAndItem("storage_blocks/zinc"))
.tag(Tags.Items.STORAGE_BLOCKS) .tag(Tags.Items.STORAGE_BLOCKS)
.build() .build()
@ -1331,7 +1331,7 @@ public class AllBlocks {
.blockstate((c, p) -> p.simpleBlock(c.get(), p.models() .blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
.cubeAll(c.getName(), p.modLoc("block/brass_storage_block")))) .cubeAll(c.getName(), p.modLoc("block/brass_storage_block"))))
.tag(Tags.Blocks.STORAGE_BLOCKS) .tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(AllBlockTags.BEACON_BASE_BLOCKS.tag) .tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/brass")) .transform(tagBlockAndItem("storage_blocks/brass"))
.tag(Tags.Items.STORAGE_BLOCKS) .tag(Tags.Items.STORAGE_BLOCKS)
.build() .build()

3
src/main/java/com/simibubi/create/AllTags.java
View file

@ -1,7 +1,6 @@
package com.simibubi.create; package com.simibubi.create;
import static com.simibubi.create.AllTags.NameSpace.FORGE; 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.MOD;
import static com.simibubi.create.AllTags.NameSpace.TIC; import static com.simibubi.create.AllTags.NameSpace.TIC;
@ -142,7 +141,7 @@ public class AllTags {
} }
public static enum AllBlockTags { 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)
; ;

5
src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java
View file

@ -114,6 +114,7 @@ public class AllPaletteBlocks {
public static final BlockEntry<Block> LIMESTONE = public static final BlockEntry<Block> LIMESTONE =
REGISTRATE.baseBlock("limestone", Block::new, () -> Blocks.SANDSTONE, true) REGISTRATE.baseBlock("limestone", Block::new, () -> Blocks.SANDSTONE, true)
.tag(BlockTags.BASE_STONE_OVERWORLD)
.register(); .register();
public static final PalettesVariantEntry LIMESTONE_VARIANTS = public static final PalettesVariantEntry LIMESTONE_VARIANTS =
@ -121,6 +122,7 @@ public class AllPaletteBlocks {
public static final BlockEntry<Block> WEATHERED_LIMESTONE = public static final BlockEntry<Block> WEATHERED_LIMESTONE =
REGISTRATE.baseBlock("weathered_limestone", Block::new, () -> Blocks.SANDSTONE, true) REGISTRATE.baseBlock("weathered_limestone", Block::new, () -> Blocks.SANDSTONE, true)
.tag(BlockTags.BASE_STONE_OVERWORLD)
.register(); .register();
public static final PalettesVariantEntry WEATHERED_LIMESTONE_VARIANTS = new PalettesVariantEntry( public static final PalettesVariantEntry WEATHERED_LIMESTONE_VARIANTS = new PalettesVariantEntry(
@ -128,6 +130,7 @@ public class AllPaletteBlocks {
public static final BlockEntry<Block> DOLOMITE = public static final BlockEntry<Block> DOLOMITE =
REGISTRATE.baseBlock("dolomite", Block::new, () -> Blocks.QUARTZ_BLOCK, true) REGISTRATE.baseBlock("dolomite", Block::new, () -> Blocks.QUARTZ_BLOCK, true)
.tag(BlockTags.BASE_STONE_OVERWORLD)
.register(); .register();
public static final PalettesVariantEntry DOLOMITE_VARIANTS = public static final PalettesVariantEntry DOLOMITE_VARIANTS =
@ -135,6 +138,7 @@ public class AllPaletteBlocks {
public static final BlockEntry<Block> GABBRO = public static final BlockEntry<Block> GABBRO =
REGISTRATE.baseBlock("gabbro", Block::new, () -> Blocks.ANDESITE, true) REGISTRATE.baseBlock("gabbro", Block::new, () -> Blocks.ANDESITE, true)
.tag(BlockTags.BASE_STONE_OVERWORLD)
.register(); .register();
public static final PalettesVariantEntry GABBRO_VARIANTS = public static final PalettesVariantEntry GABBRO_VARIANTS =
@ -146,6 +150,7 @@ public class AllPaletteBlocks {
public static final BlockEntry<Block> NATURAL_SCORIA = REGISTRATE.block("natural_scoria", Block::new) public static final BlockEntry<Block> NATURAL_SCORIA = REGISTRATE.block("natural_scoria", Block::new)
.initialProperties(() -> Blocks.ANDESITE) .initialProperties(() -> Blocks.ANDESITE)
.tag(BlockTags.BASE_STONE_OVERWORLD)
.onRegister(CreateRegistrate.blockVertexColors(new ScoriaVertexColor())) .onRegister(CreateRegistrate.blockVertexColors(new ScoriaVertexColor()))
.loot((p, g) -> p.registerLootTable(g, RegistrateBlockLootTables.droppingWithSilkTouch(g, SCORIA.get()))) .loot((p, g) -> p.registerLootTable(g, RegistrateBlockLootTables.droppingWithSilkTouch(g, SCORIA.get())))
.blockstate(palettesCubeAll()) .blockstate(palettesCubeAll())