From fb39e3561509f533f764e28e47d57d4b4f3cf4b3 Mon Sep 17 00:00:00 2001 From: Eugene <59817721+SKZGx@users.noreply.github.com> Date: Fri, 14 Jun 2024 10:46:38 +0300 Subject: [PATCH] added apple_slice added homemade_sausage added @hnufelka as author --- .../item/ModFoodComponents.java | 18 ++++++- .../ukrainian_dlight/item/ModItemGroups.java | 5 +- .../ukrainian_dlight/item/ModItems.java | 44 +++++++++++------- .../assets/ukrainian_delight/lang/en_us.json | 3 ++ .../assets/ukrainian_delight/lang/uk_ua.json | 3 ++ .../models/item/apple_slice.json | 6 +++ .../models/item/dried_apple_slice.json | 6 +++ .../models/item/homemade_sausage.json | 6 +++ .../textures/item/apple_slice.png | Bin 0 -> 454 bytes .../textures/item/dried_apple_slice.png | Bin 0 -> 479 bytes .../textures/item/homemade_sausage.png | Bin 0 -> 563 bytes .../textures/item/varenyk.png | Bin 560 -> 440 bytes .../recipes/cutting/apple.json | 17 +++++++ .../dried_apple_slice_from_apple_slice.json | 11 +++++ src/main/resources/fabric.mod.json | 2 +- 15 files changed, 102 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/ukrainian_delight/models/item/apple_slice.json create mode 100644 src/main/resources/assets/ukrainian_delight/models/item/dried_apple_slice.json create mode 100644 src/main/resources/assets/ukrainian_delight/models/item/homemade_sausage.json create mode 100644 src/main/resources/assets/ukrainian_delight/textures/item/apple_slice.png create mode 100644 src/main/resources/assets/ukrainian_delight/textures/item/dried_apple_slice.png create mode 100644 src/main/resources/assets/ukrainian_delight/textures/item/homemade_sausage.png create mode 100644 src/main/resources/data/ukrainian_delight/recipes/cutting/apple.json create mode 100644 src/main/resources/data/ukrainian_delight/recipes/dried_apple_slice_from_apple_slice.json diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java index 10f2364..7937931 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java @@ -16,7 +16,6 @@ public class ModFoodComponents { .hunger(6) .saturationModifier(0.40f) .statusEffect(new StatusEffectInstance(COMFORT, 25*20, 0), 1.0F) - .snack() .build(); public static final FoodComponent BORSCHT = new FoodComponent.Builder() @@ -50,6 +49,23 @@ public class ModFoodComponents { .saturationModifier(0.1f) .build(); + public static final FoodComponent APPLE_SLICE = new FoodComponent.Builder() + .hunger(3) + .snack() + .saturationModifier(0.2f) + .build(); + + public static final FoodComponent DRIED_APPLE_SLICE = new FoodComponent.Builder() + .hunger(4) + .snack() + .saturationModifier(0.23f) + .build(); + + public static final FoodComponent HOMEMADE_SAUSAGE = new FoodComponent.Builder() + .hunger(5) + .saturationModifier(0.25f) + .build(); + // Ensure that the class is initialized public static void init() { // This method is empty, but it ensures that the class is initialized diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java index 890ba9f..3f4d837 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java @@ -18,9 +18,10 @@ public class ModItemGroups { .displayName(Text.translatable("itemgroup.meals_ukrainian_delight")) .icon(() -> new ItemStack(ModItems.BORSCHT)) .entries((displayContext, entries) -> { - entries.add(ModItems.VARENYK); entries.add(ModItems.BORSCHT); entries.add(ModItems.LEAN_BORSCHT); + entries.add(ModItems.HOMEMADE_SAUSAGE); + entries.add(ModItems.VARENYK); }).build()); public static final ItemGroup INGREDIENT_UKRAINIAN_DELIGHT = Registry.register(Registries.ITEM_GROUP, @@ -36,6 +37,8 @@ public class ModItemGroups { entries.add(ModBlock.CUCUMBER_CRATE); entries.add(ModItems.CUCUMBER); entries.add(ModItems.CUTTED_CUCUMBER); + entries.add(ModItems.APPLE_SLICE); + entries.add(ModItems.DRIED_APPLE_SLICE); }).build()); diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItems.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItems.java index 0d251c3..fc44b33 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItems.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItems.java @@ -11,32 +11,44 @@ public class ModItems { // Define items using the ItemBuilder public static final Item VARENYK = registerItem("varenyk", new ItemBuilder() - .food(ModFoodComponents.VARENYK) - .build()); + .food(ModFoodComponents.VARENYK) + .build()); public static final Item BORSCHT = registerItem("borscht", new ItemBuilder() - .food(ModFoodComponents.BORSCHT) - .maxCount(16) - .returnsBowl() - .build()); + .food(ModFoodComponents.BORSCHT) + .maxCount(16) + .returnsBowl() + .build()); public static final Item LEAN_BORSCHT = registerItem("lean_borscht", new ItemBuilder() - .food(ModFoodComponents.LEAN_BORSCHT) - .maxCount(16) - .returnsBowl() - .build()); + .food(ModFoodComponents.LEAN_BORSCHT) + .maxCount(16) + .returnsBowl() + .build()); public static final Item HORSERADISH = registerItem("horseradish", new ItemBuilder() - .food(ModFoodComponents.HORSERADISH) - .build()); + .food(ModFoodComponents.HORSERADISH) + .build()); public static final Item CUCUMBER = registerItem("cucumber", new ItemBuilder() - .food(ModFoodComponents.CUCUMBER) - .build()); + .food(ModFoodComponents.CUCUMBER) + .build()); public static final Item CUTTED_CUCUMBER = registerItem("cutted_cucumber", new ItemBuilder() - .food(ModFoodComponents.CUTTED_CUCUMBER) - .build()); + .food(ModFoodComponents.CUTTED_CUCUMBER) + .build()); + + public static final Item APPLE_SLICE = registerItem("apple_slice", new ItemBuilder() + .food(ModFoodComponents.APPLE_SLICE) + .build()); + + public static final Item DRIED_APPLE_SLICE = registerItem("dried_apple_slice", new ItemBuilder() + .food(ModFoodComponents.DRIED_APPLE_SLICE) + .build()); + + public static final Item HOMEMADE_SAUSAGE = registerItem("homemade_sausage", new ItemBuilder() + .food(ModFoodComponents.HOMEMADE_SAUSAGE) + .build()); // Simple items without specifying maxCount, defaults to 64 public static final Item SALT = registerItem("salt", new ItemBuilder().build()); diff --git a/src/main/resources/assets/ukrainian_delight/lang/en_us.json b/src/main/resources/assets/ukrainian_delight/lang/en_us.json index 26d8213..5d361b7 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/en_us.json +++ b/src/main/resources/assets/ukrainian_delight/lang/en_us.json @@ -10,11 +10,14 @@ "item.ukrainian_delight.cucumber": "Cucumber", "item.ukrainian_delight.cutted_cucumber": "Cut Cucumber", "block.ukrainian_delight.cucumber_crate": "Cucumber Crate", + "item.ukrainian_delight.apple_slice": "Apple Slice", + "item.ukrainian_delight.dried_apple_slice": "Dried Apple Slice", "_comment3": "meals", "item.ukrainian_delight.varenyk": "Varenyk", "item.ukrainian_delight.borscht": "Borscht", "item.ukrainian_delight.lean_borscht": "Lean Borscht", + "item.ukrainian_delight.homemade_sausage": "Homemade Sausage", "_comment4": "blocks", "block.ukrainian_delight.salt_block": "Salt Block", diff --git a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json index 5e9524c..cf7f1e3 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json +++ b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json @@ -10,11 +10,14 @@ "item.ukrainian_delight.cucumber": "Огірок", "item.ukrainian_delight.cutted_cucumber": "Скибка огірка", "block.ukrainian_delight.cucumber_crate": "Ящик огірків", + "item.ukrainian_delight.apple_slice": "Скибка яблука", + "item.ukrainian_delight.dried_apple_slice": "Сушена скибка яблука", "_comment3": "meals", "item.ukrainian_delight.varenyk": "Вареник", "item.ukrainian_delight.borscht": "Борщ", "item.ukrainian_delight.lean_borscht": "Пісний борщ", + "item.ukrainian_delight.homemade_sausage": "Домашня ковбаса", "_comment4": "blocks", "block.ukrainian_delight.salt_block": "Солевий блок", diff --git a/src/main/resources/assets/ukrainian_delight/models/item/apple_slice.json b/src/main/resources/assets/ukrainian_delight/models/item/apple_slice.json new file mode 100644 index 0000000..9355906 --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/item/apple_slice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ukrainian_delight:item/apple_slice" + } +} diff --git a/src/main/resources/assets/ukrainian_delight/models/item/dried_apple_slice.json b/src/main/resources/assets/ukrainian_delight/models/item/dried_apple_slice.json new file mode 100644 index 0000000..1e55d7d --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/item/dried_apple_slice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ukrainian_delight:item/dried_apple_slice" + } +} diff --git a/src/main/resources/assets/ukrainian_delight/models/item/homemade_sausage.json b/src/main/resources/assets/ukrainian_delight/models/item/homemade_sausage.json new file mode 100644 index 0000000..5932642 --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/item/homemade_sausage.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ukrainian_delight:item/homemade_sausage" + } +} diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/apple_slice.png b/src/main/resources/assets/ukrainian_delight/textures/item/apple_slice.png new file mode 100644 index 0000000000000000000000000000000000000000..466a02d9274ee0f8bae16de5d5471344899ab943 GIT binary patch literal 454 zcmV;%0XhDOP)Px$fJsC_R5*>zl0QpZQ5eR5=X&q;CSEkehC)laiRL@x12_ns`~-z=1q-Eh=$%q% zEJZ=G#m&LN#lgiPQ0P>I(y4T@0Ug8?(i-mV{ga#Xb_j+hSHwwtro%b!^LwAe`@+3d zz3fW8?8@Z%R%(>y<>%3kv|CN_9?wd<)s%Ltc`Zau8s`j?>h3!LM262w33{N|f4&C5 z`kAjXfJSLvs*Ts!P7Y@}k6iUiLa=kACX*23{{)tuL#L1?DXRaM==3W9oo}CpAYire ze(Vcl007&z8E8#-{sZg50w>3xnJF*P`ThlfFzpirW)|Q(F=5ani9?hcUPoboo3{vh z;mDAt$;}C-3=0sZA1>1Wb%Oh(f|Fd3e^lY}_r+xS_!R18S5~%a0GO78XpL!E0K~CR z9Qho)*re9|GxB8;L{Tt|+K*6%fz}$WHE|R&W!g6<0PuPx$nMp)JR5*>zlCeu$VHCxGFVE+T@!=y9NGxchAbs{PsDoRl1{J{$3a&yyL_~** zMLHE)p(3~xN3k6`^e<4_OyVL4(ZNWIVARxxr^ci{I-ceP4xRWZ{Rl(=Kz^bQegi6f=! zwx$bL7XiL~en%u~&^?>hdl%@(DsP2Uat=V51S*?W*hV}Z1T;-3 z9&7<{lv-1q$6aHbpO@EBWdLB=HlF8E$ZTUo+DWe`sc&|aiJQyd=1P78PcL!2zlVE# zgsvL^6bpH*kU{>Wpaj2*dCXwIZ}1mp&;kTA`Uo$Z#%k#xcyUPRK?j+=)D5RBtJ>70 z6Oh4|Q`cWukWk$z28wf-vn+h1HjqIPil z>l$R_&2#K<6B{c_063k!0BnB!!tlo*cjsG)S5IQ{Vc?<4YI(R-KD}tY^OXNT{s06) Vi0u{`Px$?MXyIR5*>TlRs!vQ5431Cy6id56!EIrmtFD9D;vv(JCbl3Q|yOy45TNA$4d5 z32s6W8#lqlQ8LHH#mUhY2gNL!($+L3Mzk#r*an2Q!M@}0%u8a@Mf~6l_q+Fe=R4=# z3;zSE%F=YwU9UcSq=i&M3#o+83=ite@SryKTF(La07{t&mndh_x?Y)Q->28u;wAKl ze{jUoO&b8|aL`aKq!L<;8Cr}PIvTX}*0HD?#h9TvQ*<(9X={!Lz~l2%&ZO1<@g)FL zb0Nkrm=f=;O1!r!uf8wJYRymoz#&WzOolA=`20-=Rl5rHp8U$cduYij`b1-d0S1OR#l zjssA0>Nx^GO3Uo-DglAz$9KC5?8SQkR^ERA;6T9WdZ-oQXcVuvd6Vu8_Hf=6`vabK zVre=_&Jg~nQGT}T+XiVaCK~4 zBRzEhezmw2$G%d^Opt$?)zjy~Y}>-ZH)ZHfTmaVdpY`kPTZS(8ac>r$+`l0wr=BAs zO#uKAA!mxKe|y6gfa{S{T34s?o9euXbbg0_#%~FH-PHZIS>FHv002ovPDHLkV1l^_ B{?z~g literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/varenyk.png b/src/main/resources/assets/ukrainian_delight/textures/item/varenyk.png index 3fd6b4dec530525f1eb0ba802322af6012d8d385..c5b7bcabe177663e3ad39bff86e1262b2d826fb8 100644 GIT binary patch delta 415 zcmV;Q0bu^H1h@l`BYyw^b5ch_0Itp)=>Px$a!Eu%R5*>*kg-nNP#A^3YvVYC1_A-P zL`aoj>kuLJ36SW5cmP(A7HKi_}Og?FR&*{;r;8~-x4&iD1-(=A=DeWG=;nSX(d3^OL(N5&VvAbL}P z%H129pt|^#p3^`+-ar~rsm*bFyfKg>lc0IJqXA;?9sp}%mgEUW;trxEF;9IR3Nnpy$kf4CIc0mAA1_0=QIElqvxQa4kB!${U)*3Ax%@RkJfcAz$lcc z)|UZ@+gBuF6o1Syv{txXP-2v%>*iNze&2qjmOj?#OCQmXNW%`k8zAp4kb%So`ZCJ@ zgUR{Nka#HRBhr90e8P7F;)hFQASn`nRbX!IKx6>gt^f+<{Q1F!^;BYy$+NkliDJwL?aZ=~Qa(4-4W7e$JQC?Ej>D3)_d;*YzteLm;ByA+O&SO%ep>2@{mGxLsS z;6FoLCfVD6r!T&*+>Sp@RRF@HAAbP+5pc4-rmcknVdE>= zaus1_&_j>zmu+S$4-n~vB-i*`k6jqVZK`FAO+erTq-E&cWm$uu& z;uFQ{3o&Iun143Gw_Qd<1$GW2yNDrs7|}67)1&RS2%7#x!30oWuj%~ibIkcAx_g_b z&H=*PM@1e0N~*C~K~0-zbMfbX_xY;W*$b4^do zK#wBA!(E(w3ESu(Yzq~f0MK?@sF5T%^^j7Y3)Jr+)_>P)y0G$u$oB~kwor~m+8!n1 zpy|_bo5)xqOam25l)L~qN0QFkSj#uZo`c53(9Q;DAYggr5r&bX{P?v<0QTb27!mg& zWdVY|-$w{R_S!NClRWc8euv(1gX*g{$qgkPv_5Pg&cD;eTi_J29B|UJW{D diff --git a/src/main/resources/data/ukrainian_delight/recipes/cutting/apple.json b/src/main/resources/data/ukrainian_delight/recipes/cutting/apple.json new file mode 100644 index 0000000..5179363 --- /dev/null +++ b/src/main/resources/data/ukrainian_delight/recipes/cutting/apple.json @@ -0,0 +1,17 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "minecraft:apple" + } + ], + "result": [ + { + "count": 2, + "item": "ukrainian_delight:apple_slice" + } + ], + "tool": { + "tag": "c:tools/knives" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ukrainian_delight/recipes/dried_apple_slice_from_apple_slice.json b/src/main/resources/data/ukrainian_delight/recipes/dried_apple_slice_from_apple_slice.json new file mode 100644 index 0000000..512222b --- /dev/null +++ b/src/main/resources/data/ukrainian_delight/recipes/dried_apple_slice_from_apple_slice.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, + "group": "copper_ingot", + "ingredient": { + "item": "ukrainian_delight:apple_slice" + }, + "result": "ukrainian_delight:dried_apple_slice" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b338a8a..ed9232b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Ukrainian Delight", "description": "A mod for Minecraft that adds Ukrainian cuisine as a mod add-on to Farmer's Delight", "authors": [ - "MEGATREX4" + "MEGATREX4, hnufelka" ], "contact": { "sources": "https://github.com/SKZGx/ukrainian-delight",