From 1856271617c69cba791d9dedd9ef3a340c53f1c5 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Fri, 26 Dec 2025 17:46:22 +0100 Subject: [PATCH] added canola flasks --- .../de/jottyfan/minecraft/item/QuicklyItems.java | 10 ++++++++-- .../assets/quickly/items/canolabottle.json | 6 ++++++ .../assets/quickly/items/canolabottlestack.json | 6 ++++++ .../resources/assets/quickly/lang/de_de.json | 2 ++ .../resources/assets/quickly/lang/en_us.json | 2 ++ .../assets/quickly/models/item/canolabottle.json | 6 ++++++ .../quickly/models/item/canolabottlestack.json | 6 ++++++ .../quickly/textures/item/canolabottle.png | Bin 0 -> 4491 bytes .../quickly/textures/item/canolabottlestack.png | Bin 0 -> 4845 bytes .../quickly/recipe/shaped_canolabottlestack.json | 15 +++++++++++++++ .../quickly/recipe/shapeless_canolabottle.json | 11 +++++++++++ .../shapeless_canolabottle_from_stack.json | 10 ++++++++++ 12 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/quickly/items/canolabottle.json create mode 100644 src/main/resources/assets/quickly/items/canolabottlestack.json create mode 100644 src/main/resources/assets/quickly/models/item/canolabottle.json create mode 100644 src/main/resources/assets/quickly/models/item/canolabottlestack.json create mode 100644 src/main/resources/assets/quickly/textures/item/canolabottle.png create mode 100644 src/main/resources/assets/quickly/textures/item/canolabottlestack.png create mode 100644 src/main/resources/data/quickly/recipe/shaped_canolabottlestack.json create mode 100644 src/main/resources/data/quickly/recipe/shapeless_canolabottle.json create mode 100644 src/main/resources/data/quickly/recipe/shapeless_canolabottle_from_stack.json diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index 582864c..54ca743 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -29,6 +29,8 @@ public class QuicklyItems { public static final Item CANOLA = registerItem("canola"); public static final Item CANOLAPLANT = registerItem("canolaplant"); public static final Item CANOLASEED = registerItem("canolaseed", properties -> new Plant(properties, "blockcanolaplant")); + public static final Item CANOLABOTTLE = registerItem("canolabottle"); + public static final Item CANOLABOTTLESTACK = registerItem("canolabottlestack"); public static final Item ROTTENFLESHSTRIPES = registerItem("rotten_flesh_stripes"); @@ -64,11 +66,15 @@ public class QuicklyItems { public static void registerModItems() { ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(item -> { item.accept(STUB); - item.accept(RAWTURQUOISE); - item.accept(TURQUOISEINGOT); item.accept(COTTON); item.accept(COTTONSEED); item.accept(ROTTENFLESHSTRIPES); + item.accept(CANOLA); + item.accept(CANOLASEED); + item.accept(CANOLABOTTLE); + item.accept(CANOLABOTTLESTACK); + item.accept(RAWTURQUOISE); + item.accept(TURQUOISEINGOT); item.accept(ARMOR_TURQUOISE_HELMET); item.accept(ARMOR_TURQUOISE_CHESTPLATE); diff --git a/src/main/resources/assets/quickly/items/canolabottle.json b/src/main/resources/assets/quickly/items/canolabottle.json new file mode 100644 index 0000000..aabd8b5 --- /dev/null +++ b/src/main/resources/assets/quickly/items/canolabottle.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/canolabottle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/canolabottlestack.json b/src/main/resources/assets/quickly/items/canolabottlestack.json new file mode 100644 index 0000000..e0d68f7 --- /dev/null +++ b/src/main/resources/assets/quickly/items/canolabottlestack.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/canolabottlestack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/lang/de_de.json b/src/main/resources/assets/quickly/lang/de_de.json index 8a9d53a..67c47a4 100644 --- a/src/main/resources/assets/quickly/lang/de_de.json +++ b/src/main/resources/assets/quickly/lang/de_de.json @@ -3,6 +3,8 @@ "item.quickly.blockcottonplant": "Baumwollpflanze", "item.quickly.blockturquoise": "Türkisblock", "item.quickly.canola": "Raps", + "item.quickly.canolabottle": "Rapsöl", + "item.quickly.canolabottlestack": "Rapsölsammlung", "item.quickly.canolaseed": "Rapssaat", "item.quickly.cotton": "Baumwolle", "item.quickly.cottonseed": "Baumwollsaat", diff --git a/src/main/resources/assets/quickly/lang/en_us.json b/src/main/resources/assets/quickly/lang/en_us.json index f0de2c7..1aa92d0 100644 --- a/src/main/resources/assets/quickly/lang/en_us.json +++ b/src/main/resources/assets/quickly/lang/en_us.json @@ -3,6 +3,8 @@ "item.quickly.blockcottonplant": "cotton plant", "item.quickly.blockturquoise": "block of turquoise", "item.quickly.canola": "canola", + "item.quickly.canolabottle": "canola oil", + "item.quickly.canolabottlestack": "canola oil collection", "item.quickly.canolaseed": "canola seed", "item.quickly.cotton": "cotton", "item.quickly.cottonseed": "cotton seed", diff --git a/src/main/resources/assets/quickly/models/item/canolabottle.json b/src/main/resources/assets/quickly/models/item/canolabottle.json new file mode 100644 index 0000000..8ee1993 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/canolabottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/canolabottle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/canolabottlestack.json b/src/main/resources/assets/quickly/models/item/canolabottlestack.json new file mode 100644 index 0000000..7faf852 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/canolabottlestack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/canolabottlestack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/textures/item/canolabottle.png b/src/main/resources/assets/quickly/textures/item/canolabottle.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd7a3adca33c461d5317c83c508af1b9f476b12 GIT binary patch literal 4491 zcmeHKeN+=y79WHHA|Tsh5p;Dn^z7o&NhaUPEP+A-Bx)oD7O+suWM&ekCYhKFB*9%j z7Z)sc70$B7Qo7=Ci?yqCD{93xQr!B{t#sGc#VRd@7NnrK?ON2T**D=sIPE!mIA{AG zIcG96_x9FrMbmw$Uqydi_d)1SuRi-o@Ds=Oy;dKQvMK(XI&)!f zrf(r@{dr|wn_>HBL)C|5J1>sH1bmYDQ+IMp>O1dh*Po2tyECVu@dzU+JpQ}opSJ`p zU9hI!7#_RM_|H()=<-}+;rtzzi%>@LGqDY~qXa>MrdRfTxHsFr-Yxj@`S`f7$ksXX z&*pj`jYbut?dClz{+?yE?by(j(&=Cp#g|%^ENZWVpnwWmtv2Y?>WRETwhh1DrP6j7 zqARir_wjxi@UikJjo>vpy>+Ee# zjd^0j=f{V?S~Sqqv7s?mCK~kgqHh|8i{IY5`kbNawW|2-uRnbq{;{h8+g@eQ?OeRcGH)$^q zEg88n*l@+G`tzOpP)nA>+as$0of+Y#K_eFES7HQX<>Mq{r1);D9dsxJC8fCSII)&u zVIyUxZ7SYKo0kXEq>7g>)uVd5nku2Su%^&uZ7}C+Tg@aTS0b0yl0K2>GbMY86cNaI)!TfMh(N@AYuzg7qxOrkqTv zgP_vOC>t9;m4YND{q3a=i$5Kb5KtD%3ZPCft8m(snL52;(u0%0Ok3@KFCg|bBukqf ziZv}ZZp5F?)IfmyB=0ozMDBhtKZfr~o;i20SL*BoYcuI6|UAB_fe4C5TcY z#t~FZ35`mlL@XBLQz)_=H0Vm)GBqlWiUd?rTq>4}L^4E9iWP`NDMt}pAu}OzLMoFh zl?oY!qJAopz%m$z6$j;{t+<&I*llM204F$>YS5{8BK{cEZ!uVK)&v|>yp^=A)cp{e zOIxWN7U$Fy%2BCEE|j1mpeDie6hqo!j%OB$pB$-u1^7h-wtxY z)D8+~8AmR|SX4YN0GRWf9M*&7MB*&2!C4BBq9O@~3NfK1S0u*7D29p>!RvUY9G#va zX_M!Fp}EBaCjmStxt4Z<`8|Hq*ow-b){VW5y;^AhQi5UsqQG!sECnZCMv?wF0oT|N zQG(md6xcn++jYWDe@`n&<#Hn>Rf5uqQ6VA`fg<8E8H%6^p;9E2;G~j}PG@&ACf0>J zs8lo15oiV4)2|hr;4jp&>1bC8#Z>_ah5-KW3MLp&SitQW6B#E7zN1N!A24N;0e)jP zuz7*KP%ya}j%&tkJ3ruWycR#;41juek{RhcE7z=CGg4qi;Mwk)m1{-{%m_T&UH><^ z!XAE3Q8sW2a)FPfg9TMx;6p3exFS;n`JjJ5iw{^gwgJmryLPn`g62KOT>;SUhK0Zw z!s_(tA=d&TA73)(+)Kmvfhm?vFJRS-l{=L~{=*_g!Y-OEfw{wC{^rOS0P5FiQgapW z5ycBjPF1exU4C$2V{mZrwgX3RpuZV8@xHbuAir^g&)4@MrtrPJ0IV_v>hzzciLK6~%WmFL!$H_-^gF;_G^#_WgT5(WE=O#&h?+?_a;Q*;k%j zP$2C%ag!TnMqjBE2ff_?oc#Rc}bS=+(<<4FLxti-?}v>>oCNF_8Eb0Uz;w;Pb^$J;&Bxukdw# qvavn3viewfYD{5K$r){}BoJCe)Jo1*7w!fbL%Q@;nuBS@TmB25iFcO( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/quickly/textures/item/canolabottlestack.png b/src/main/resources/assets/quickly/textures/item/canolabottlestack.png new file mode 100644 index 0000000000000000000000000000000000000000..98056527294857387e33a91d40544306b9ea0a61 GIT binary patch literal 4845 zcmeHLdsGuw8Xq4AFer*bMeAb>rJ{C{nY<<$6Okqnf(8&cXi(NpW+q_{S z+N$-{RSGH=wJNf^wf5A4EBL^5b+w$;)>?e))(1*gsp9%z?*v3R?KyiqyWPLYImyg? z_xJto_x--_-ZMAF$%%0T1j7Xo1Pw66>r%jV5dRGd0KcOjwvpg+uOMwEmqL1Br^{hs za~PP*cQP>JV=WNmyRdS)E#wFs^t^eTr*Gf!1tXqrXbPD4VsrQpc_-F36#Z1OdhGIh zKQ|uvbeJ`SFeOGsEnyoDhsW-)KfD@w`>LiqwDBkBC={*}X^^JYfDySZHNJJqJAn<~ z?-G_&6=saw(%jm#wDeH%?8QefZAx#eD_)wp=Fz-d{VuvX)0TP5{v>03J)6)F_Pb4| zQesOtokh>=?-xGt0yX6l3q_9J-rrbb2wO6=p(^D<%C7T~^TLAn4w|E%Uby4au=T!# zcqsSw(Yf2*8@KE`U}-t>;y}8u&*%qvp7IsNnGn=#Ijhws8?@S&iGy@Y=daPkA4v{d zmNaX-Fg$cZ5kY^J=$Rf`w>`Z)DE!^M-|Q|tF|}>0LA&5#6+%=+wT>d{dBx#-JVa!prjj+u}driYuK zEh{hm^7B)98Iketg-#tbX7ZHqsP*KSgz72p7l)M{*F4j%n)BB0r&SG(P`#17Sa9N> zg>7}s-&Bqz zTbuG$d%gS5+`GK_AI}y*=PF&NOV8X)gP@REENI1<#%ToQu!%_8VP-@=n-laX1gT?u zPLj%IIM~csS-VEqTzyCgv$RGyLvBQkPA!wg#uvDl)Plq`svw(E(ZZNX0=16-1U7~v zVV^C>?k0R1p`Vuk_qC1QyL0SLsMZ|6uKVs}UK6zv>3#!b0cC&xPM zFwaSv9eJEaCqYP6I1i zoWi&rc`l04dl)+x*_DE(I{lq_t{i_lG$m$o7#o1P!K_%fDdP;r0xN5C`n`bI z-H;q>c_mi2*!U5DI$Z++?w!2d&@XfMg8|BDByD5aN{--Wr5U3s8a1QRE>s4)n2Xp$p!B*y?!R3al#jKJ_TiG+}1gj_ZOJa%Nt z(-|E!YsvplXnyg)YJdkNk7wOr{(QfweMO}*x$RHwk2$P=DZ#LRQ4l26o`Re7Ftk5T zz|}rPWs!C(19p#&c717Qf29@VIBsU-Do{EpiXk!yC?cs)pa`nOR1!=^(ke>co!#xQ za9+~I#9D!lKr7Imey!kWf1$>8M|-mvz6wAv1n^_BG>Mduq68}G5KR1kND)=hQU#+z z6bhLFw5UvlC~465xS5jUDokOvpsMac|5qt?_Jq89ifS>xExs(OTKtQ$w*$KDqd=N= z8`z)0b}#PS?>jW(ch=wV)6s6f;S7MfXOh>_w@0oXxn4_w*8=x+SC3q;rNC=}d%Ej? zCYRvViIK5`7dX~Tz%-20&*ZcY8-MVC{O`jI4SQKG3+CU4XDkjG3jSB147%7f z<;lHku=w6&#PZ7%WtEB*J0jO_D}PkK{LRxPy>|{ey?@s53nND~3hW0D)W#+VJ{fqR zy!=>5({fbzm%*X?9wY|;oUIgTzFxQX(#?gfF_#{<9crdf{msIWy%$wK6)3(>M#TVZB( zS#4BJ1XM9kkf82kk=4G?7vw0idxs|=52zncrf(QK{oA4zMpzbEpKr2RLo+j$4t;pF zF9e@&hR-{oh%vh?xrfKr&)WF5r?ptMrixLJ1a`|*NqayRk&{)uW)nRf~iU3%)!h`ohkCW;bk9OzSZLVpl;#q;ON;C VJ}+^t&IL7r4EjV})w}O4`8Pb)-LU`w literal 0 HcmV?d00001 diff --git a/src/main/resources/data/quickly/recipe/shaped_canolabottlestack.json b/src/main/resources/data/quickly/recipe/shaped_canolabottlestack.json new file mode 100644 index 0000000..97717bc --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shaped_canolabottlestack.json @@ -0,0 +1,15 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "ccc", + "ccc", + "ccc" + ], + "key": { + "c":"quickly:canolabottle" + }, + "result": { + "id": "quickly:canolabottlestack", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_canolabottle.json b/src/main/resources/data/quickly/recipe/shapeless_canolabottle.json new file mode 100644 index 0000000..19baec3 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_canolabottle.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "minecraft:glass_bottle", + "quickly:canola" + ], + "result": { + "id": "quickly:canolabottle", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_canolabottle_from_stack.json b/src/main/resources/data/quickly/recipe/shapeless_canolabottle_from_stack.json new file mode 100644 index 0000000..19060af --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_canolabottle_from_stack.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickly:canolabottlestack" + ], + "result": { + "id": "quickly:canolabottle", + "count": 9 + } +} \ No newline at end of file