From cd573a2babb1037a7cfcb0474785dbcd6ac5256d Mon Sep 17 00:00:00 2001 From: raptor494 Date: Tue, 12 Apr 2022 09:13:54 -0700 Subject: [PATCH] Add other metal barrel upgrade items Now you can upgrade an already upgraded barrel instead of having to break the old barrel and place a new one. It just makes sense. --- config/jei/blacklist.cfg | 6 ------ kubejs/server_scripts/recipes.js | 12 ++++++++++++ .../assets/metalbarrels/lang/en_us.json | 14 ++++++++++---- .../metalbarrels/textures/item/copper_to_gold.png | Bin 0 -> 580 bytes .../metalbarrels/textures/item/copper_to_iron.png | Bin 0 -> 580 bytes .../textures/item/copper_to_silver.png | Bin 0 -> 574 bytes .../metalbarrels/textures/item/iron_to_gold.png | Bin 0 -> 521 bytes .../metalbarrels/textures/item/iron_to_silver.png | Bin 0 -> 515 bytes .../metalbarrels/textures/item/silver_to_gold.png | Bin 0 -> 546 bytes 9 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_gold.png create mode 100644 openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_iron.png create mode 100644 openloader/resources/simis_edits/assets/metalbarrels/textures/item/copper_to_silver.png create mode 100644 openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_gold.png create mode 100644 openloader/resources/simis_edits/assets/metalbarrels/textures/item/iron_to_silver.png create mode 100644 openloader/resources/simis_edits/assets/metalbarrels/textures/item/silver_to_gold.png 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 0000000000000000000000000000000000000000..4962cd021c066cecf9cfe7ddf44fcfd2a08039ad GIT binary patch literal 580 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lhk0X`wF3>rBROWrU@IxCmnVh`HJU^bD#X|cCHPk<4hzY(9a7U%3d^F3{L zv-2!w=9+J5v|Uq03_+!|0{Y>!HWvro-c)!Rcqn>#D_Vs>I=~&ugp7;b+Kar^@N5&gr1Wr76nj zsmJSUz`M8G{nm=;Gs|;tZY;R8I`970!n>t_!NiNwz z)>@g}NrTf_lgn71(N&vUTbvQ-v*+>w*MXFKNswRgf2sh6<8#9Dfktu`ctjR6F!1dM zVMYtqU=^U?QcoAh5RG8hv+hhy1_BNjJ(=IgZv5U9yRj+B`CYw=ut$lQ=f7wlg+IQ3 z{xB=Z#0Gv~Z0QhSU8MO`iBUkY#fVq?fJ8;Ij)S?7r?YuOhR(f-Ug?{5)-bMUN?I9X z=qs!-IbdtnSGUVdzH3A-WR>sQ`;TEp)58p#nYWA+X0`lG+8K3Q`a%7%4Ryqet2LE*#T>FVdQ&MBb@0No?%fB*mh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9095a9b3f63cc2f320b3f1c8e7f6da00a797ed36 GIT binary patch literal 580 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lhk0X`wFnl|RQ-#iwR6x(s@#N@@Z?A%;|1{EhgWwK!+zneS<{ zo1JGdGuM1eqwUf%tNoq!^NTFkG<$8EnzDCR`nvuEDeO_Bt4nIRaJ5^3cbxsF0E=^HJ zPd#2=1Kz#e?zdJ%pIM%Jb7R4!)p_@~7T#SIb8=49jg^ThjYKXb)nj+PIAc( zvewG%P8yufnq0>6jIP?;+Tx5rpRpcU%mJj_OM?7@|5F7p9G?@G4>Xdqz$3Dlfr0M; z2s36~>*NFqF7dH##`QTXHg z=MS@jOl;r>#+D8N)o}MTc{-anWa!+R=#{={XAR?urlgfI zhQ7iYlLNM9eRaFcr61HE+i=(N+`j^w wx%xJ&JMMjbwtHUrcU7Bt>&p-H`yVjo+5eM8%d5%V927nbp00i_>zopr0Pzg%eENS%LgZ0X`wFiM(;IckMCfbbOjHYn@?jw_<^}K2LxVpT7~Gvli#n3f z>!HhIAj9aT&+DPb9$m^=bZK}lKt$fv;OXk;vd$@?2>_Gd?qvV~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..269b8ebbfd1ec991c20d396ed3566e740b19ee0a GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lg@0X`wF3>rBROWrU@IxCmnVh`HJU^bD#X|cDvlfSo{pO>qvqfK~1OhjUA zL}E->d~{}2aZyiWczQxrcS}}tMS4YHPD`b&rKyvhrGt&7u9mu!ot3q@iHoC+kB76T ztAnYLo~N6mhl{& zH@UjIS=+{3L03~wTV37UNYm2P#Q|uffq||T(8*KQMNI`#RwY4x!T-qx4CV*^gF=n7 zz$3Dlfq`!?2s66>p0E}uIM36?F+?NS_3U+~CIcSU3nk4D!U9CtcbJ!c`fs1cwf33f zNn3u-Df?Glw`W**bp?}{z@Z)sgPFx5+zt}SF&?iPf)4nsWPJLQ*T3?>k`?(ZiJL{) z6bsnj`fa~1&(p}w9cUw^K3QUkWoE*xbI-CivOHAy{5f>jH%AZd*(x{RePcf`-&Dr` z`RS`$q}`ZZ7ry_suzUG7fzzvl-WLI)fk-vHt=u!qxS3j3^P6NS%Li30X`wFiM(;IckMCfbbOjHYn@?jw_<^}yOY1So1d4ftD{YLLQF(rY(!#A zSbTJ5RdG>IV|aQ(Rd-8Pb47YZVNOe>t);1xouz|~rLLB`lbw~dxrvLTjgN=3r>ldh zk)EfUqlb&Vv%Qs@ldX-VslAQ4gROe!}R>ZS;O0p(ubP0l+XkKcB9qb literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ba6ce3bb3e3de52bb21f9a05cfc36bc62cad89f5 GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lfm0X`wF3>rBROWrU@IxCmnVh`HJU^bD#X>pF9f1Yn(zJFk%t7pD{P?on} zs9;FFVn&H{iUXfZyGl-oK=3@{iv7-QlT?bbC1dwGx7Wy|-)dZJ#ph_n>uAnxZ^h@7 ztkx331oPBr?~qhxVaYu1f+U-hdVgr`Uk`~ITr>77RbdnC}%hdxOAxI z9LkwCRlD@0M|Zb!?kb}iYkntden(4Q2OEB;2nUBmH}_-@&j2fnR8KEABO{4nJ@a+L%#;JRXJb{AqJzX3_G=g2vUT11D;9