mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-15 11:53:43 +01:00
Add copper zinc and brass as beacon base back in
this was removed in 1.16.3 as it is now a block tag.
This commit is contained in:
parent
a00f619017
commit
1a7bf39fc1
4 changed files with 14 additions and 1 deletions
|
@ -3351,6 +3351,7 @@ fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json
|
||||||
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json
|
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json
|
||||||
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
|
||||||
|
508730d3822c54d355329bf6a33d58071653afad data/minecraft/tags/blocks/beacon_base_blocks.json
|
||||||
31424fe956db0354a9f24c61baf977a2961c8db6 data/minecraft/tags/blocks/impermeable.json
|
31424fe956db0354a9f24c61baf977a2961c8db6 data/minecraft/tags/blocks/impermeable.json
|
||||||
9dadc647e17b6262c13b6d8eda9139e30ce7e7d0 data/minecraft/tags/blocks/rails.json
|
9dadc647e17b6262c13b6d8eda9139e30ce7e7d0 data/minecraft/tags/blocks/rails.json
|
||||||
29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data/minecraft/tags/blocks/slabs.json
|
29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data/minecraft/tags/blocks/slabs.json
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"replace": false,
|
||||||
|
"values": [
|
||||||
|
"create:copper_block",
|
||||||
|
"create:zinc_block",
|
||||||
|
"create:brass_block"
|
||||||
|
]
|
||||||
|
}
|
|
@ -1168,6 +1168,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)
|
||||||
.transform(tagBlockAndItem("storage_blocks/copper"))
|
.transform(tagBlockAndItem("storage_blocks/copper"))
|
||||||
.tag(Tags.Items.STORAGE_BLOCKS)
|
.tag(Tags.Items.STORAGE_BLOCKS)
|
||||||
.transform(oxidizedItemModel())
|
.transform(oxidizedItemModel())
|
||||||
|
@ -1193,6 +1194,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)
|
||||||
.transform(tagBlockAndItem("storage_blocks/zinc"))
|
.transform(tagBlockAndItem("storage_blocks/zinc"))
|
||||||
.tag(Tags.Items.STORAGE_BLOCKS)
|
.tag(Tags.Items.STORAGE_BLOCKS)
|
||||||
.build()
|
.build()
|
||||||
|
@ -1201,6 +1203,7 @@ public class AllBlocks {
|
||||||
public static final BlockEntry<Block> BRASS_BLOCK = REGISTRATE.block("brass_block", p -> new Block(p))
|
public static final BlockEntry<Block> BRASS_BLOCK = REGISTRATE.block("brass_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)
|
||||||
.transform(tagBlockAndItem("storage_blocks/brass"))
|
.transform(tagBlockAndItem("storage_blocks/brass"))
|
||||||
.tag(Tags.Items.STORAGE_BLOCKS)
|
.tag(Tags.Items.STORAGE_BLOCKS)
|
||||||
.build()
|
.build()
|
||||||
|
|
|
@ -3,6 +3,7 @@ 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.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;
|
||||||
|
import static com.simibubi.create.AllTags.NameSpace.MC;
|
||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@ -108,7 +109,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, SLIMY_LOGS(TIC)
|
WINDMILL_SAILS, FAN_HEATERS, WINDOWABLE, NON_MOVABLE, BRITTLE, SEATS, SAILS, VALVE_HANDLES, FAN_TRANSPARENT, SLIMY_LOGS(TIC), BEACON_BASE_BLOCKS(MC)
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue