From 0a11c626611be1e62f4acd140b7059964dfe499c Mon Sep 17 00:00:00 2001 From: tterrag Date: Sun, 26 Apr 2020 12:11:44 -0400 Subject: [PATCH] Stub out more invalid datagen, fix creative crate model reference --- src/generated/resources/.cache/cache | 22 +++++++++++ .../create/blockstates/creative_crate.json | 2 +- .../resources/assets/create/lang/en_ud.json | 38 +++++++++++++++++++ .../resources/assets/create/lang/en_us.json | 38 +++++++++++++++++++ .../create/models/item/creative_crate.json | 3 ++ .../create/models/item/schematic_table.json | 3 ++ .../create/models/item/schematicannon.json | 3 ++ .../java/com/simibubi/create/AllBlocks.java | 6 ++- .../com/simibubi/create/AllBlocksNew.java | 2 +- 9 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/.cache/cache create mode 100644 src/generated/resources/assets/create/lang/en_ud.json create mode 100644 src/generated/resources/assets/create/lang/en_us.json create mode 100644 src/generated/resources/assets/create/models/item/creative_crate.json create mode 100644 src/generated/resources/assets/create/models/item/schematic_table.json create mode 100644 src/generated/resources/assets/create/models/item/schematicannon.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache new file mode 100644 index 000000000..353194dd7 --- /dev/null +++ b/src/generated/resources/.cache/cache @@ -0,0 +1,22 @@ +a0150c02b037a60d217bc632a0eee60b8e162a51 assets\create\blockstates\creative_crate.json +7d7b2c7157a64f6975c985598535ec97ae4b1761 assets\create\blockstates\schematicannon.json +7120f29e4b88a1c40125a8cdbe8af3570f4ee352 assets\create\blockstates\schematic_table.json +5269bab362bf6d70a8f2425e1e237335c0b77f52 assets\create\lang\en_ud.json +b6e7008604a55f57fa2f27886e3124d1270c40f8 assets\create\lang\en_us.json +09eef3b7389ea2030813292f063e116cc71ddd05 assets\create\models\item\creative_crate.json +42b2dbcefd777c89b50884f8b1f41ed44a9f4395 assets\create\models\item\schematicannon.json +8dd5caa4d7a0ee45bd9b39e09c4503159933d089 assets\create\models\item\schematic_table.json +76982ba58ac3aed8b1a072a07ce390a8fb82f8d3 data\forge\tags\items\ingots.json +cb4dce916166df989377388f09bc75288288ec33 data\forge\tags\items\ingots\brass.json +6ebd530ef815b54f4fe0582f19028d9aa2a404f9 data\forge\tags\items\ingots\copper.json +49944029d75cc84802753c8ebb7119d20e2a9034 data\forge\tags\items\ingots\zinc.json +f9b4bfa9a10addd1e7ad03e05439cb9035913fb1 data\forge\tags\items\nuggets.json +753baf7f28874ae42fbb8509f3b29ae3245f5fb5 data\forge\tags\items\nuggets\brass.json +3ba27781962c597c5f7df50a240dabce20452d88 data\forge\tags\items\nuggets\copper.json +9e1208ce7a9a4805664d97955ee755273a2d4a25 data\forge\tags\items\nuggets\zinc.json +bb1d34063c9d2e196fb9efcb8dd691e3bd123b9e data\forge\tags\items\plates.json +99b23d251591b3c8c17ffd947af6b2b6e78d5652 data\forge\tags\items\plates\brass.json +708af49da48f0bf0bef7ec942c3adc40f0ca3cd7 data\forge\tags\items\plates\copper.json +f8ab90a5522f4e80e030cfc832edf9af8d3009d1 data\forge\tags\items\plates\gold.json +9a48608de59bd52e8b14385bd3d13dba06ab306d data\forge\tags\items\plates\iron.json +9bb964b32bdf567f4ad388599e4faf08affd64e7 data\forge\tags\items\plates\lapis.json diff --git a/src/generated/resources/assets/create/blockstates/creative_crate.json b/src/generated/resources/assets/create/blockstates/creative_crate.json index fb0cf93c9..88094affc 100644 --- a/src/generated/resources/assets/create/blockstates/creative_crate.json +++ b/src/generated/resources/assets/create/blockstates/creative_crate.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "create:creative_crate" + "model": "create:block/creative_crate" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json new file mode 100644 index 000000000..cd2c76fa9 --- /dev/null +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -0,0 +1,38 @@ +{ + "block.create.creative_crate": "\u01DD\u0287\u0250\u0279\u0186 \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", + "block.create.dark_scoria_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", + "block.create.dark_scoria_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", + "block.create.dark_scoria_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", + "block.create.dark_scoria_tiles_slab": "q\u0250\u05DFS s\u01DD\u05DF\u0131\u27D8 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", + "block.create.dark_scoria_tiles_stairs": "s\u0279\u0131\u0250\u0287S s\u01DD\u05DF\u0131\u27D8 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", + "block.create.dolomite_slab": "q\u0250\u05DFS \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", + "block.create.dolomite_stairs": "s\u0279\u0131\u0250\u0287S \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", + "block.create.dolomite_wall": "\u05DF\u05DF\u0250M \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", + "block.create.gabbro_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141", + "block.create.gabbro_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141", + "block.create.gabbro_slab": "q\u0250\u05DFS o\u0279qq\u0250\u2141", + "block.create.gabbro_stairs": "s\u0279\u0131\u0250\u0287S o\u0279qq\u0250\u2141", + "block.create.gabbro_wall": "\u05DF\u05DF\u0250M o\u0279qq\u0250\u2141", + "block.create.indented_gabbro_slab": "q\u0250\u05DFS o\u0279qq\u0250\u2141 p\u01DD\u0287u\u01DDpuI", + "block.create.limestone_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", + "block.create.limestone_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", + "block.create.limestone_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", + "block.create.limestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", + "block.create.limestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", + "block.create.limestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", + "block.create.paved_gabbro_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141 p\u01DD\u028C\u0250\u0500", + "block.create.polished_limestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0265s\u0131\u05DFo\u0500", + "block.create.polished_scoria_slab": "q\u0250\u05DFS \u0250\u0131\u0279o\u0254S p\u01DD\u0265s\u0131\u05DFo\u0500", + "block.create.polished_weathered_limestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u0265s\u0131\u05DFo\u0500", + "block.create.schematic_table": "\u01DD\u05DFq\u0250\u27D8 \u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S", + "block.create.schematicannon": "uouu\u0250\u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S", + "block.create.scoria_slab": "q\u0250\u05DFS \u0250\u0131\u0279o\u0254S", + "block.create.scoria_stairs": "s\u0279\u0131\u0250\u0287S \u0250\u0131\u0279o\u0254S", + "block.create.scoria_wall": "\u05DF\u05DF\u0250M \u0250\u0131\u0279o\u0254S", + "block.create.weathered_limestone_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", + "block.create.weathered_limestone_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", + "block.create.weathered_limestone_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", + "block.create.weathered_limestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", + "block.create.weathered_limestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", + "block.create.weathered_limestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json new file mode 100644 index 000000000..69c7e745c --- /dev/null +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -0,0 +1,38 @@ +{ + "block.create.creative_crate": "Creative Crate", + "block.create.dark_scoria_bricks_slab": "Dark Scoria Bricks Slab", + "block.create.dark_scoria_bricks_stairs": "Dark Scoria Bricks Stairs", + "block.create.dark_scoria_bricks_wall": "Dark Scoria Bricks Wall", + "block.create.dark_scoria_tiles_slab": "Dark Scoria Tiles Slab", + "block.create.dark_scoria_tiles_stairs": "Dark Scoria Tiles Stairs", + "block.create.dolomite_slab": "Dolomite Slab", + "block.create.dolomite_stairs": "Dolomite Stairs", + "block.create.dolomite_wall": "Dolomite Wall", + "block.create.gabbro_bricks_stairs": "Gabbro Bricks Stairs", + "block.create.gabbro_bricks_wall": "Gabbro Bricks Wall", + "block.create.gabbro_slab": "Gabbro Slab", + "block.create.gabbro_stairs": "Gabbro Stairs", + "block.create.gabbro_wall": "Gabbro Wall", + "block.create.indented_gabbro_slab": "Indented Gabbro Slab", + "block.create.limestone_bricks_slab": "Limestone Bricks Slab", + "block.create.limestone_bricks_stairs": "Limestone Bricks Stairs", + "block.create.limestone_bricks_wall": "Limestone Bricks Wall", + "block.create.limestone_slab": "Limestone Slab", + "block.create.limestone_stairs": "Limestone Stairs", + "block.create.limestone_wall": "Limestone Wall", + "block.create.paved_gabbro_bricks_slab": "Paved Gabbro Bricks Slab", + "block.create.polished_limestone_slab": "Polished Limestone Slab", + "block.create.polished_scoria_slab": "Polished Scoria Slab", + "block.create.polished_weathered_limestone_slab": "Polished Weathered Limestone Slab", + "block.create.schematic_table": "Schematic Table", + "block.create.schematicannon": "Schematicannon", + "block.create.scoria_slab": "Scoria Slab", + "block.create.scoria_stairs": "Scoria Stairs", + "block.create.scoria_wall": "Scoria Wall", + "block.create.weathered_limestone_bricks_slab": "Weathered Limestone Bricks Slab", + "block.create.weathered_limestone_bricks_stairs": "Weathered Limestone Bricks Stairs", + "block.create.weathered_limestone_bricks_wall": "Weathered Limestone Bricks Wall", + "block.create.weathered_limestone_slab": "Weathered Limestone Slab", + "block.create.weathered_limestone_stairs": "Weathered Limestone Stairs", + "block.create.weathered_limestone_wall": "Weathered Limestone Wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/creative_crate.json b/src/generated/resources/assets/create/models/item/creative_crate.json new file mode 100644 index 000000000..987b4a166 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/creative_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/creative_crate" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/schematic_table.json b/src/generated/resources/assets/create/models/item/schematic_table.json new file mode 100644 index 000000000..c447b868d --- /dev/null +++ b/src/generated/resources/assets/create/models/item/schematic_table.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/schematic_table" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/schematicannon.json b/src/generated/resources/assets/create/models/item/schematicannon.json new file mode 100644 index 000000000..8c3c48b30 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/schematicannon.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/schematicannon/base" +} \ 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 8344d7924..6c0c2900a 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -91,6 +91,7 @@ import com.simibubi.create.modules.schematics.block.SchematicTableBlock; import com.simibubi.create.modules.schematics.block.SchematicannonBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; +import com.tterrag.registrate.providers.ProviderType; import com.tterrag.registrate.util.RegistryEntry; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullBiFunction; @@ -336,6 +337,7 @@ public enum AllBlocks implements NonNullSupplier { this.block = Create.registrate().block(Lang.asId(name()), $ -> block.get()) // TODO take properties as input .blockstate(NonNullBiConsumer.noop()) // TODO .loot(NonNullBiConsumer.noop()) // TODO + .setData(ProviderType.LANG, NonNullBiConsumer.noop()) // TODO .transform(applyTags(tags)) .transform(b -> registerItemBlock(b, customItemCreator, comesWith)) .register(); @@ -412,7 +414,9 @@ public enum AllBlocks implements NonNullSupplier { return Create.registrate().block(block.getId().getPath() + "_" + Lang.asId(feature.name()), creator) .blockstate(NonNullBiConsumer.noop()) // TODO .loot(NonNullBiConsumer.noop()) // TODO - .simpleItem() + .item() + .model(NonNullBiConsumer.noop()) // TODO + .build() .transform(b -> tag != null ? b.tag(tag) : b) .register(); } diff --git a/src/main/java/com/simibubi/create/AllBlocksNew.java b/src/main/java/com/simibubi/create/AllBlocksNew.java index 7c9eca490..f08bbe800 100644 --- a/src/main/java/com/simibubi/create/AllBlocksNew.java +++ b/src/main/java/com/simibubi/create/AllBlocksNew.java @@ -21,7 +21,7 @@ public class AllBlocksNew { .register(); public static final RegistryEntry CREATIVE_CRATE = REGISTRATE.block("creative_crate", CreativeCrateBlock::new) - .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), new UncheckedModelFile(ctx.getId()))) + .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), prov.models().getExistingFile(ctx.getId()))) .simpleItem() .register();