diff --git a/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java b/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java index b1f832c8..04a38bdb 100644 --- a/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java +++ b/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java @@ -159,7 +159,7 @@ private static void registerCageLamps (String metal, Function gett "block/palettes/cage_lamp/" + metal.toLowerCase(Locale.ROOT).replaceAll(" ", "_") + "_lamp" ); - Supplier material = (metal == "Andesite" ? AllItems.ANDESITE_ALLOY : null); + Supplier material = (metal.equals("Andesite") ? AllItems.ANDESITE_ALLOY : null); YELLOW_CAGE_LAMPS.put(metal, CageLamps.build( CreateDecoMod.REGISTRATE, metal, DyeColor.YELLOW, cage, YELLOW_ON, YELLOW_OFF diff --git a/common/src/main/java/com/github/talrey/createdeco/api/ShippingContainers.java b/common/src/main/java/com/github/talrey/createdeco/api/ShippingContainers.java index 55c77bdf..ffde63f6 100644 --- a/common/src/main/java/com/github/talrey/createdeco/api/ShippingContainers.java +++ b/common/src/main/java/com/github/talrey/createdeco/api/ShippingContainers.java @@ -55,7 +55,9 @@ public static BlockBuilder build ( .lang(visName + " Shipping Container") .blockstate((ctx, prov) -> BlockStateGenerator.shippingContainer(CreateDecoMod.REGISTRATE, color, ctx, prov)) - .transform(MountedItemStorageType.mountedItemStorage(AllMountedStorageTypes.VAULT)) + // NOTE: Vault mounting disabled for datagen - causes NPE due to Create initialization order + // TODO: Re-enable after datagen completes or find way to defer this registration + // .transform(MountedItemStorageType.mountedItemStorage(AllMountedStorageTypes.VAULT)) .onRegister(connectedTextures(ShippingContainerCTBehavior::new)); } diff --git a/common/src/main/java/com/github/talrey/createdeco/api/Windows.java b/common/src/main/java/com/github/talrey/createdeco/api/Windows.java index 016f0628..ea558d6a 100644 --- a/common/src/main/java/com/github/talrey/createdeco/api/Windows.java +++ b/common/src/main/java/com/github/talrey/createdeco/api/Windows.java @@ -87,7 +87,7 @@ public static BlockEntry windowBlock(String name, .define('#', Ingredient.of(CreateDecoTags.ingot(name.replace("_window", "")))) .define('X', CreateDecoTags.GLASS) .unlockedBy("has_item", InventoryChangeTrigger.TriggerInstance.hasItems( - (ItemLike) ItemPredicate.Builder.item().of(CreateDecoTags.ingot(name.replace("_window", ""))) + ItemPredicate.Builder.item().of(CreateDecoTags.ingot(name.replace("_window", ""))).build() )) .save(p::accept)) .initialProperties(() -> Blocks.GLASS) diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/andesite.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/andesite.json new file mode 100644 index 00000000..1e68fcfe --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/andesite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:andesite_alloy_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/brass.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/brass.json new file mode 100644 index 00000000..2b2a2404 --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:brass_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/copper.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/copper.json new file mode 100644 index 00000000..3d511ec7 --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/gold.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/gold.json new file mode 100644 index 00000000..5cde185e --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/industrial_iron.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/industrial_iron.json new file mode 100644 index 00000000..f63e4f30 --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/industrial_iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:industrial_iron_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/iron.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/iron.json new file mode 100644 index 00000000..7b50a707 --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/netherite.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/netherite.json new file mode 100644 index 00000000..2a0ad80a --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/netherite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherite_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/blocks/storage_blocks/zinc.json b/common/src/main/resources/data/c/tags/blocks/storage_blocks/zinc.json new file mode 100644 index 00000000..c87706dd --- /dev/null +++ b/common/src/main/resources/data/c/tags/blocks/storage_blocks/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:zinc_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/ingots/andesite.json b/common/src/main/resources/data/c/tags/items/ingots/andesite.json new file mode 100644 index 00000000..145344eb --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/ingots/andesite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:andesite_alloy" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/ingots/brass.json b/common/src/main/resources/data/c/tags/items/ingots/brass.json new file mode 100644 index 00000000..620b41d0 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/ingots/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:brass_ingot" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/ingots/copper.json b/common/src/main/resources/data/c/tags/items/ingots/copper.json new file mode 100644 index 00000000..94466550 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/ingots/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_ingot" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/ingots/gold.json b/common/src/main/resources/data/c/tags/items/ingots/gold.json new file mode 100644 index 00000000..74a63e9c --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/ingots/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_ingot" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/ingots/iron.json b/common/src/main/resources/data/c/tags/items/ingots/iron.json new file mode 100644 index 00000000..5e89bbc7 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/ingots/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_ingot" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/ingots/netherite.json b/common/src/main/resources/data/c/tags/items/ingots/netherite.json new file mode 100644 index 00000000..abe72e83 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/ingots/netherite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherite_ingot" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/ingots/zinc.json b/common/src/main/resources/data/c/tags/items/ingots/zinc.json new file mode 100644 index 00000000..87736764 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/ingots/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:zinc_ingot" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/nuggets/andesite.json b/common/src/main/resources/data/c/tags/items/nuggets/andesite.json new file mode 100644 index 00000000..145344eb --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/nuggets/andesite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:andesite_alloy" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/nuggets/brass.json b/common/src/main/resources/data/c/tags/items/nuggets/brass.json new file mode 100644 index 00000000..cf60c7a4 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/nuggets/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:brass_nugget" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/nuggets/copper.json b/common/src/main/resources/data/c/tags/items/nuggets/copper.json new file mode 100644 index 00000000..1b0fac92 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/nuggets/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:copper_nugget" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/nuggets/gold.json b/common/src/main/resources/data/c/tags/items/nuggets/gold.json new file mode 100644 index 00000000..3c978eae --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/nuggets/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_nugget" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/nuggets/iron.json b/common/src/main/resources/data/c/tags/items/nuggets/iron.json new file mode 100644 index 00000000..2e6bd5ff --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/nuggets/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_nugget" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/nuggets/zinc.json b/common/src/main/resources/data/c/tags/items/nuggets/zinc.json new file mode 100644 index 00000000..06245cf0 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/nuggets/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:zinc_nugget" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/plates/brass.json b/common/src/main/resources/data/c/tags/items/plates/brass.json new file mode 100644 index 00000000..5af34dad --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/plates/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:brass_sheet" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/plates/copper.json b/common/src/main/resources/data/c/tags/items/plates/copper.json new file mode 100644 index 00000000..fb62bab2 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/plates/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:copper_sheet" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/plates/gold.json b/common/src/main/resources/data/c/tags/items/plates/gold.json new file mode 100644 index 00000000..a47cfcb0 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/plates/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:golden_sheet" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/plates/iron.json b/common/src/main/resources/data/c/tags/items/plates/iron.json new file mode 100644 index 00000000..f0f00d26 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/plates/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:iron_sheet" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/andesite.json b/common/src/main/resources/data/c/tags/items/storage_blocks/andesite.json new file mode 100644 index 00000000..1e68fcfe --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/andesite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:andesite_alloy_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/brass.json b/common/src/main/resources/data/c/tags/items/storage_blocks/brass.json new file mode 100644 index 00000000..2b2a2404 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:brass_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/copper.json b/common/src/main/resources/data/c/tags/items/storage_blocks/copper.json new file mode 100644 index 00000000..3d511ec7 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/gold.json b/common/src/main/resources/data/c/tags/items/storage_blocks/gold.json new file mode 100644 index 00000000..5cde185e --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/industrial_iron.json b/common/src/main/resources/data/c/tags/items/storage_blocks/industrial_iron.json new file mode 100644 index 00000000..f63e4f30 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/industrial_iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:industrial_iron_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/iron.json b/common/src/main/resources/data/c/tags/items/storage_blocks/iron.json new file mode 100644 index 00000000..7b50a707 --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/netherite.json b/common/src/main/resources/data/c/tags/items/storage_blocks/netherite.json new file mode 100644 index 00000000..2a0ad80a --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/netherite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherite_block" + ] +} diff --git a/common/src/main/resources/data/c/tags/items/storage_blocks/zinc.json b/common/src/main/resources/data/c/tags/items/storage_blocks/zinc.json new file mode 100644 index 00000000..c87706dd --- /dev/null +++ b/common/src/main/resources/data/c/tags/items/storage_blocks/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:zinc_block" + ] +} diff --git a/common/src/main/resources/data/createdeco/recipes/cutting/andesite_sheet_metal_cutting.json b/common/src/main/resources/data/createdeco/recipes/cutting/andesite_sheet_metal_cutting.json new file mode 100644 index 00000000..d5b1644f --- /dev/null +++ b/common/src/main/resources/data/createdeco/recipes/cutting/andesite_sheet_metal_cutting.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "createdeco:andesite_sheet_metal" + } + ], + "results": [ + { + "item": "createdeco:andesite_sheet", + "count": 4 + } + ], + "processingTime": 50 +} diff --git a/common/src/main/resources/data/createdeco/recipes/cutting/brass_sheet_metal_cutting.json b/common/src/main/resources/data/createdeco/recipes/cutting/brass_sheet_metal_cutting.json new file mode 100644 index 00000000..0ba55260 --- /dev/null +++ b/common/src/main/resources/data/createdeco/recipes/cutting/brass_sheet_metal_cutting.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "createdeco:brass_sheet_metal" + } + ], + "results": [ + { + "item": "create:brass_sheet", + "count": 4 + } + ], + "processingTime": 50 +} diff --git a/common/src/main/resources/data/createdeco/recipes/cutting/copper_sheet_metal_cutting.json b/common/src/main/resources/data/createdeco/recipes/cutting/copper_sheet_metal_cutting.json new file mode 100644 index 00000000..f3288a3d --- /dev/null +++ b/common/src/main/resources/data/createdeco/recipes/cutting/copper_sheet_metal_cutting.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "createdeco:copper_sheet_metal" + } + ], + "results": [ + { + "item": "create:copper_sheet", + "count": 4 + } + ], + "processingTime": 50 +} diff --git a/common/src/main/resources/data/createdeco/recipes/cutting/industrial_iron_sheet_metal_cutting.json b/common/src/main/resources/data/createdeco/recipes/cutting/industrial_iron_sheet_metal_cutting.json new file mode 100644 index 00000000..44eb87f7 --- /dev/null +++ b/common/src/main/resources/data/createdeco/recipes/cutting/industrial_iron_sheet_metal_cutting.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "createdeco:industrial_iron_sheet_metal" + } + ], + "results": [ + { + "item": "createdeco:industrial_iron_sheet", + "count": 4 + } + ], + "processingTime": 50 +} diff --git a/common/src/main/resources/data/createdeco/recipes/cutting/iron_sheet_metal_cutting.json b/common/src/main/resources/data/createdeco/recipes/cutting/iron_sheet_metal_cutting.json new file mode 100644 index 00000000..0e827581 --- /dev/null +++ b/common/src/main/resources/data/createdeco/recipes/cutting/iron_sheet_metal_cutting.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "createdeco:iron_sheet_metal" + } + ], + "results": [ + { + "item": "create:iron_sheet", + "count": 4 + } + ], + "processingTime": 50 +} diff --git a/common/src/main/resources/data/createdeco/recipes/cutting/zinc_sheet_metal_cutting.json b/common/src/main/resources/data/createdeco/recipes/cutting/zinc_sheet_metal_cutting.json new file mode 100644 index 00000000..796f6397 --- /dev/null +++ b/common/src/main/resources/data/createdeco/recipes/cutting/zinc_sheet_metal_cutting.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "createdeco:zinc_sheet_metal" + } + ], + "results": [ + { + "item": "createdeco:zinc_sheet", + "count": 4 + } + ], + "processingTime": 50 +}