tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Patch D

Browse source 
- Safety check for schematicannon entities
- Some tagging
This commit is contained in:
simibubi 2022-01-25 18:58:37 +01:00
parent 746d9867db
commit 30a026ab0c
16 changed files with 80 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5219,8 +5219,11 @@ d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/items/toolboxes.json
81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/blocks/glass_panes.json 81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/blocks/glass_panes.json
6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/blocks/ores.json 6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/blocks/ores.json
6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/blocks/ores/zinc.json 6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/blocks/ores/zinc.json
9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/forge/tags/blocks/storage_blocks.json 9fc688d8fac1033c7b8f4b8de1138e56d2faf527 data/forge/tags/blocks/ores_in_ground/deepslate.json
d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores_in_ground/stone.json
66065a698fca917446a0fb766593dbcc77fabeac data/forge/tags/blocks/storage_blocks.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json
823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/blocks/storage_blocks/raw_zinc.json
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json
6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json 6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json
391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json 391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json
@ -5238,13 +5241,18 @@ cc82188fe8d986f4457301ed4f75ae833d263601 data/forge/tags/items/nuggets/brass.jso
0d8cb5092ee6ec01ea09324c80d649ba05549799 data/forge/tags/items/nuggets/zinc.json 0d8cb5092ee6ec01ea09324c80d649ba05549799 data/forge/tags/items/nuggets/zinc.json
6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/items/ores.json 6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/items/ores.json
6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/items/ores/zinc.json 6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/items/ores/zinc.json
9fc688d8fac1033c7b8f4b8de1138e56d2faf527 data/forge/tags/items/ores_in_ground/deepslate.json
d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/items/ores_in_ground/stone.json
5d5ec04a61ff2b1ad19210e2859a9c96cc246ef8 data/forge/tags/items/plates.json 5d5ec04a61ff2b1ad19210e2859a9c96cc246ef8 data/forge/tags/items/plates.json
39f0d70ec10597e85df7c4783bbc5e0e4a5ffb80 data/forge/tags/items/plates/brass.json 39f0d70ec10597e85df7c4783bbc5e0e4a5ffb80 data/forge/tags/items/plates/brass.json
c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data/forge/tags/items/plates/copper.json c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data/forge/tags/items/plates/copper.json
fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json
04d947ed7a5066f3cfe75a8dc564fe2dca8a9c93 data/forge/tags/items/plates/iron.json 04d947ed7a5066f3cfe75a8dc564fe2dca8a9c93 data/forge/tags/items/plates/iron.json
9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/forge/tags/items/storage_blocks.json dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials.json
dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials/zinc.json
66065a698fca917446a0fb766593dbcc77fabeac data/forge/tags/items/storage_blocks.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json
823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/items/storage_blocks/raw_zinc.json
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/azalea_root_replaceable.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/azalea_root_replaceable.json
9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json 9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json

6
src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:deepslate_zinc_ore"
]
}

6
src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:zinc_ore"
]
}

1
src/generated/resources/data/forge/tags/blocks/storage_blocks.json
View file

@ -1,6 +1,7 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"create:raw_zinc_block",
"create:zinc_block", "create:zinc_block",
"create:brass_block" "create:brass_block"
] ]

6
src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_zinc.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:raw_zinc_block"
]
}

6
src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:deepslate_zinc_ore"
]
}

6
src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:zinc_ore"
]
}

6
src/generated/resources/data/forge/tags/items/raw_materials.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:raw_zinc"
]
}

6
src/generated/resources/data/forge/tags/items/raw_materials/zinc.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:raw_zinc"
]
}

1
src/generated/resources/data/forge/tags/items/storage_blocks.json
View file

@ -1,6 +1,7 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"create:raw_zinc_block",
"create:zinc_block", "create:zinc_block",
"create:brass_block" "create:brass_block"
] ]

6
src/generated/resources/data/forge/tags/items/storage_blocks/raw_zinc.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:raw_zinc_block"
]
}

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

@ -1525,7 +1525,7 @@ public class AllBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_IRON_TOOL) .tag(BlockTags.NEEDS_IRON_TOOL)
.tag(Tags.Blocks.ORES) .tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/zinc")) .transform(tagBlockAndItem("ores/zinc", "ores_in_ground/stone"))
.tag(Tags.Items.ORES) .tag(Tags.Items.ORES)
.build() .build()
.register(); .register();
@ -1541,7 +1541,7 @@ public class AllBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_IRON_TOOL) .tag(BlockTags.NEEDS_IRON_TOOL)
.tag(Tags.Blocks.ORES) .tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/zinc")) .transform(tagBlockAndItem("ores/zinc", "ores_in_ground/deepslate"))
.tag(Tags.Items.ORES) .tag(Tags.Items.ORES)
.build() .build()
.register(); .register();
@ -1550,9 +1550,12 @@ public class AllBlocks {
.initialProperties(() -> Blocks.RAW_GOLD_BLOCK) .initialProperties(() -> Blocks.RAW_GOLD_BLOCK)
.properties(p -> p.requiresCorrectToolForDrops()) .properties(p -> p.requiresCorrectToolForDrops())
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.NEEDS_IRON_TOOL) .tag(BlockTags.NEEDS_IRON_TOOL)
.lang("Block of Raw Zinc") .lang("Block of Raw Zinc")
.simpleItem() .transform(tagBlockAndItem("storage_blocks/raw_zinc"))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.register(); .register();
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))

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

@ -142,7 +142,8 @@ public class AllItems {
.lang("Builder's Tea") .lang("Builder's Tea")
.register(); .register();
public static final ItemEntry<Item> RAW_ZINC = ingredient("raw_zinc"); public static final ItemEntry<Item> RAW_ZINC =
taggedIngredient("raw_zinc", forgeItemTag("raw_materials/zinc"), forgeItemTag("raw_materials"));
public static final ItemEntry<Item> ANDESITE_ALLOY = ingredient("andesite_alloy"), public static final ItemEntry<Item> ANDESITE_ALLOY = ingredient("andesite_alloy"),
ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc"), CREATE_INGOTS.tag), ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc"), CREATE_INGOTS.tag),

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

@ -68,10 +68,15 @@ public class AllTags {
} }
public static <T extends Block, P> NonNullFunction<BlockBuilder<T, P>, ItemBuilder<BlockItem, BlockBuilder<T, P>>> tagBlockAndItem( public static <T extends Block, P> NonNullFunction<BlockBuilder<T, P>, ItemBuilder<BlockItem, BlockBuilder<T, P>>> tagBlockAndItem(
String path) { String... path) {
return b -> b.tag(forgeBlockTag(path)) return b -> {
.item() for (String p : path)
.tag(forgeItemTag(path)); b.tag(forgeBlockTag(p));
ItemBuilder<BlockItem,BlockBuilder<T,P>> item = b.item();
for (String p : path)
item.tag(forgeItemTag(p));
return item;
};
} }
public enum NameSpace { public enum NameSpace {

2
src/main/java/com/simibubi/create/Create.java
View file

@ -57,7 +57,7 @@ public class Create {
public static final String ID = "create"; public static final String ID = "create";
public static final String NAME = "Create"; public static final String NAME = "Create";
public static final String VERSION = "0.4c"; public static final String VERSION = "0.4d";
public static final Logger LOGGER = LogManager.getLogger(); public static final Logger LOGGER = LogManager.getLogger();

1
src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java
View file

@ -204,6 +204,7 @@ public abstract class LaunchedItem {
@Override @Override
void place(Level world) { void place(Level world) {
if (entity != null)
world.addFreshEntity(entity); world.addFreshEntity(entity);
} }