From e653d28a7d261397a97ea2c3a934ebb7d6613b2c Mon Sep 17 00:00:00 2001 From: xanthian Date: Tue, 1 Mar 2022 12:11:34 +0000 Subject: [PATCH 1/4] add c:wooden_barrels to recipe tested in dev working fine, betterx, blockus, eden ring, vanilla and other mods barrels all accepted as viable recipe --- .../crafting_table/unit/storage/crude_storage_unit.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json b/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json index 2ea726331..34fce6264 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json @@ -6,9 +6,13 @@ "WPW" ], "key": { - "B": { + "B":[ + { "tag": "blockus:barrels" }, + { + "tag": "c:wooden_barrels" + }], "P": { "item": "minecraft:paper" }, From bf0b9fc19697ca91ee8732bdbeeed9da589946db Mon Sep 17 00:00:00 2001 From: xanthian Date: Wed, 23 Mar 2022 17:54:30 +0000 Subject: [PATCH 2/4] Update crude_storage_unit.json removed blockus c: tag --- .../unit/storage/crude_storage_unit.json | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json b/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json index 34fce6264..253d8cfbf 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/unit/storage/crude_storage_unit.json @@ -6,21 +6,17 @@ "WPW" ], "key": { - "B":[ - { - "tag": "blockus:barrels" + "B": { + "tag": "c:wooden_barrels" }, - { - "tag": "c:wooden_barrels" - }], - "P": { + "P": { "item": "minecraft:paper" }, - "W": { + "W": { "tag": "minecraft:planks" } }, "result": { "item": "techreborn:crude_storage_unit" } -} \ No newline at end of file +} From 87eb6edf21e9029090d3b965822d825718ac2f62 Mon Sep 17 00:00:00 2001 From: xanthian Date: Wed, 23 Mar 2022 18:18:38 +0000 Subject: [PATCH 3/4] Create wooden_barrels --- src/main/resources/data/c/tags/items/wooden_barrels | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/resources/data/c/tags/items/wooden_barrels diff --git a/src/main/resources/data/c/tags/items/wooden_barrels b/src/main/resources/data/c/tags/items/wooden_barrels new file mode 100644 index 000000000..5753fc41d --- /dev/null +++ b/src/main/resources/data/c/tags/items/wooden_barrels @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": ["minecraft:barrel"] +} From 3ad1e4237f340d8667bf4a7db6aa529871f85459 Mon Sep 17 00:00:00 2001 From: xanthian Date: Thu, 24 Mar 2022 09:14:17 +0000 Subject: [PATCH 4/4] Delete src/main/resources/data/blockus/tags/items directory --- src/main/resources/data/blockus/tags/items/barrels.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 src/main/resources/data/blockus/tags/items/barrels.json diff --git a/src/main/resources/data/blockus/tags/items/barrels.json b/src/main/resources/data/blockus/tags/items/barrels.json deleted file mode 100644 index 167939930..000000000 --- a/src/main/resources/data/blockus/tags/items/barrels.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:barrel" - ] -} \ No newline at end of file