diff --git a/config/jei/blacklist.cfg b/config/jei/blacklist.cfg index 42ccaf56..eb3ef098 100644 --- a/config/jei/blacklist.cfg +++ b/config/jei/blacklist.cfg @@ -1081,13 +1081,8 @@ occultism:silver_dust metalbarrels:wood_to_diamond metalbarrels:wood_to_obsidian metalbarrels:wood_to_netherite -metalbarrels:copper_to_iron -metalbarrels:copper_to_silver -metalbarrels:copper_to_gold metalbarrels:copper_to_diamond metalbarrels:copper_to_obsidian -metalbarrels:iron_to_silver -metalbarrels:iron_to_gold metalbarrels:iron_to_diamond metalbarrels:iron_to_obsidian metalbarrels:wood_to_crystal @@ -1096,7 +1091,6 @@ metalbarrels:gold_to_obsidian metalbarrels:gold_to_diamond metalbarrels:silver_to_obsidian metalbarrels:silver_to_diamond -metalbarrels:silver_to_gold metalbarrels:copper_to_crystal metalbarrels:iron_to_crystal metalbarrels:silver_to_crystal diff --git a/kubejs/server_scripts/recipes.js b/kubejs/server_scripts/recipes.js index 20279d48..bbac35e6 100644 --- a/kubejs/server_scripts/recipes.js +++ b/kubejs/server_scripts/recipes.js @@ -967,6 +967,18 @@ function barrels(event) { event.shapeless("metalbarrels:wood_to_iron", ["metalbarrels:iron_barrel"]) event.shapeless("metalbarrels:wood_to_silver", ["metalbarrels:silver_barrel"]) event.shapeless("metalbarrels:wood_to_gold", ["metalbarrels:gold_barrel"]) + + event.shapeless("metalbarrels:copper_to_iron", ["metalbarrels:wood_to_iron"]) + event.shapeless("metalbarrels:copper_to_silver", ["metalbarrels:wood_to_silver"]) + event.shapeless("metalbarrels:copper_to_gold", ["metalbarrels:wood_to_gold"]) + event.shapeless("metalbarrels:iron_to_silver", ["metalbarrels:copper_to_silver"]) + event.shapeless("metalbarrels:iron_to_gold", ["metalbarrels:copper_to_gold"]) + event.shapeless("metalbarrels:silver_to_gold", ["metalbarrels:iron_to_gold"]) + + event.shapeless("metalbarrels:copper_barrel", ["metalbarrels:wood_to_copper"]) + event.shapeless("metalbarrels:iron_barrel", ["metalbarrels:copper_to_iron"]) + event.shapeless("metalbarrels:silver_barrel", ["metalbarrels:iron_to_silver"]) + event.shapeless("metalbarrels:gold_barrel", ["metalbarrels:silver_to_gold"]) } function rocketScience(event) { diff --git a/openloader/resources/simis_edits/assets/metalbarrels/lang/en_us.json b/openloader/resources/simis_edits/assets/metalbarrels/lang/en_us.json index 7fa14999..40407939 100644 --- a/openloader/resources/simis_edits/assets/metalbarrels/lang/en_us.json +++ b/openloader/resources/simis_edits/assets/metalbarrels/lang/en_us.json @@ -7,8 +7,14 @@ "item.metalbarrels.gold_barrel": "Cobalt Barrel", "block.metalbarrels.iron_barrel": "Silica Steel Barrel", "item.metalbarrels.iron_barrel": "Silica Steel Barrel", - "item.metalbarrels.wood_to_copper": "Tinker's Bronze Barrel Upgrade", - "item.metalbarrels.wood_to_iron": "Silica Steel Barrel Upgrade", - "item.metalbarrels.wood_to_silver": "Arcane Barrel Upgrade", - "item.metalbarrels.wood_to_gold": "Cobalt Barrel Upgrade" + "item.metalbarrels.wood_to_copper": "Wood to Tinker's Bronze Barrel Upgrade", + "item.metalbarrels.wood_to_iron": "Wood to Silica Steel Barrel Upgrade", + "item.metalbarrels.wood_to_silver": "Wood to Arcane Barrel Upgrade", + "item.metalbarrels.wood_to_gold": "Wood to Cobalt Barrel Upgrade", + "item.metalbarrels.copper_to_iron": "Tinker's Bronze to Silica Steel Barrel Upgrade", + "item.metalbarrels.copper_to_silver": "Tinker's Bronze to Arcane Barrel Upgrade", + "item.metalbarrels.copper_to_gold": "Tinker's Bronze to Cobalt Barrel Upgrade", + "item.metalbarrels.iron_to_silver": "Silica Steel to Arcane Barrel Upgrade", + "item.metalbarrels.iron_to_gold": "Silica Steel to Cobalt Barrel Upgrade", + "item.metalbarrels.silver_to_gold": "Arcane to Cobalt Barrel Upgrade" } \ No newline at end of file diff --git a/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_gold.png b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_gold.png new file mode 100644 index 00000000..4962cd02 Binary files /dev/null and b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_gold.png differ diff --git a/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_iron.png b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_iron.png new file mode 100644 index 00000000..9095a9b3 Binary files /dev/null and b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_iron.png differ diff --git a/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_silver.png b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_silver.png new file mode 100644 index 00000000..565f7f0d Binary files /dev/null and b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_silver.png differ diff --git a/openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_gold.png b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_gold.png new file mode 100644 index 00000000..269b8ebb Binary files /dev/null and b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_gold.png differ diff --git a/openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_silver.png b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_silver.png new file mode 100644 index 00000000..9a0c009f Binary files /dev/null and b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_silver.png differ diff --git a/openloader/resources/simis_edits/assets/metalbarrels/textures/item/silver_to_gold.png b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/silver_to_gold.png new file mode 100644 index 00000000..ba6ce3bb Binary files /dev/null and b/openloader/resources/simis_edits/assets/metalbarrels/textures/item/silver_to_gold.png differ