Skip to content

Commit fe2ec6b

Browse files
MEGATREX4MEGATREX4
committed
added lean_borscht
update to uk_ua update to en_us
1 parent f0000dd commit fe2ec6b

File tree

23 files changed

+281
-26
lines changed

23 files changed

+281
-26
lines changed

‎src/main/java/com/megatrex4/ukrainian_dlight/block/ModBlock.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
public class ModBlock {
2020
public static final Block SALT_BLOCK = registerBlock("salt_block",
2121
new Block(FabricBlockSettings.copyOf(Blocks.SAND).sounds(BlockSoundGroup.WET_GRASS)));
22+
public static final Block CUCUMBER_CRATE = registerBlock("cucumber_crate",
23+
new Block(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).sounds(BlockSoundGroup.WOOD)));
2224

2325
private static Block registerBlock(String name, Block block){
2426
registerBlockItem(name, block);
@@ -31,6 +33,6 @@ private static Item registerBlockItem(String name, Block block){
3133
}
3234

3335
public static void registerModBlock(){
34-
UkrainianDelight.LOGGER.info("Registring ModBlocks for " + UkrainianDelight.MOD_ID);
36+
UkrainianDelight.LOGGER.info("Registring Mod Blocks for " + UkrainianDelight.MOD_ID);
3537
}
3638
}

‎src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java

+21-8
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,17 @@
33
import com.nhoryzon.mc.farmersdelight.registry.EffectsRegistry;
44
import net.minecraft.entity.effect.StatusEffect;
55
import net.minecraft.entity.effect.StatusEffectInstance;
6-
import net.minecraft.entity.effect.StatusEffects;
76
import net.minecraft.item.FoodComponent;
8-
import net.minecraft.registry.Registries;
9-
import net.minecraft.registry.Registry;
10-
import net.minecraft.util.Identifier;
117

128
public class ModFoodComponents {
139
// Retrieve the StatusEffect instances using the EffectsRegistry
1410
public static final StatusEffect COMFORT = EffectsRegistry.COMFORT.get();
1511
public static final StatusEffect NOURISHMENT = EffectsRegistry.NOURISHMENT.get();
1612

17-
// Define food components with multiple effects
13+
// MEALS
1814
public static final FoodComponent VARENYK = new FoodComponent.Builder()
19-
.hunger(3)
20-
.saturationModifier(0.35f)
15+
.hunger(6)
16+
.saturationModifier(0.40f)
2117
.statusEffect(new StatusEffectInstance(COMFORT, 25*20, 0), 1.0F)
2218
.snack()
2319
.build();
@@ -30,10 +26,27 @@ public class ModFoodComponents {
3026
// .statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 3*20, 3), 1.0f)
3127
.build();
3228

29+
public static final FoodComponent LEAN_BORSCHT = new FoodComponent.Builder()
30+
.hunger(15)
31+
.saturationModifier(1f)
32+
.statusEffect(new StatusEffectInstance(NOURISHMENT, 5*60*19, 0), 1.0F)
33+
.statusEffect(new StatusEffectInstance(COMFORT, 5*60*19, 0), 1.0F)
34+
.build();
35+
36+
// INGREDIENTS
3337
public static final FoodComponent HORSERADISH = new FoodComponent.Builder()
38+
.hunger(2)
39+
.saturationModifier(0.15f)
40+
.build();
41+
42+
public static final FoodComponent CUCUMBER = new FoodComponent.Builder()
43+
.hunger(2)
44+
.saturationModifier(0.15f)
45+
.build();
46+
47+
public static final FoodComponent CUTTED_CUCUMBER = new FoodComponent.Builder()
3448
.hunger(1)
3549
.saturationModifier(0.1f)
36-
.snack()
3750
.build();
3851

3952
// Ensure that the class is initialized

‎src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java

+21-7
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,36 @@
1212
import net.minecraft.util.Identifier;
1313

1414
public class ModItemGroups {
15-
public static final ItemGroup UKRAINIAN_DELIGHT_GROUP = Registry.register(Registries.ITEM_GROUP,
16-
new Identifier(UkrainianDelight.MOD_ID, "ukrainian_delight"),
15+
public static final ItemGroup MEALS_UKRAINIAN_DELIGHT = Registry.register(Registries.ITEM_GROUP,
16+
new Identifier(UkrainianDelight.MOD_ID, "meals_ukrainian_delight"),
1717
FabricItemGroup.builder()
18-
.displayName(Text.translatable("itemgroup.ukrainian_delight"))
19-
.icon(() -> new ItemStack(ModItems.VARENYK))
18+
.displayName(Text.translatable("itemgroup.meals_ukrainian_delight"))
19+
.icon(() -> new ItemStack(ModItems.BORSCHT))
2020
.entries((displayContext, entries) -> {
21-
entries.add(ModItems.HORSERADISH);
22-
2321
entries.add(ModItems.VARENYK);
2422
entries.add(ModItems.BORSCHT);
23+
entries.add(ModItems.LEAN_BORSCHT);
24+
}).build());
2525

26-
entries.add(ModItems.SALT);
26+
public static final ItemGroup INGREDIENT_UKRAINIAN_DELIGHT = Registry.register(Registries.ITEM_GROUP,
27+
new Identifier(UkrainianDelight.MOD_ID, "ingredients_ukrainian_delight"),
28+
FabricItemGroup.builder()
29+
.displayName(Text.translatable("itemgroup.ingredients_ukrainian_delight"))
30+
.icon(() -> new ItemStack(ModItems.CUCUMBER))
31+
.entries((displayContext, entries) -> {
2732
entries.add(ModBlock.SALT_BLOCK);
33+
entries.add(ModItems.SALT);
34+
35+
entries.add(ModItems.HORSERADISH);
36+
entries.add(ModBlock.CUCUMBER_CRATE);
37+
entries.add(ModItems.CUCUMBER);
38+
entries.add(ModItems.CUTTED_CUCUMBER);
2839
}).build());
2940

41+
3042
public static void registerItemGroups() {
3143
UkrainianDelight.LOGGER.info("Registering Item Groups for " + UkrainianDelight.MOD_ID);
3244
}
45+
46+
3347
}

‎src/main/java/com/megatrex4/ukrainian_dlight/item/ModItems.java

+4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ public class ModItems {
1313
// Define items without specifying maxCount, defaults to 64
1414
public static final Item VARENYK = createFoodItem("varenyk", ModFoodComponents.VARENYK);
1515
public static final Item BORSCHT = createFoodItem("borscht", ModFoodComponents.BORSCHT, 16);
16+
public static final Item LEAN_BORSCHT = createFoodItem("lean_borscht", ModFoodComponents.LEAN_BORSCHT, 16);
17+
1618
public static final Item HORSERADISH = createFoodItem("horseradish", ModFoodComponents.HORSERADISH);
19+
public static final Item CUCUMBER = createFoodItem("cucumber", ModFoodComponents.CUCUMBER);
20+
public static final Item CUTTED_CUCUMBER = createFoodItem("cutted_cucumber", ModFoodComponents.CUTTED_CUCUMBER);
1721

1822
// Simple items without specifying maxCount, defaults to 64
1923
public static final Item SALT = registerItem("salt", new Item(new FabricItemSettings()));

‎src/main/resources/assets/ukrainian_delight/blockstates/cucumber_crate.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "ukrainian_delight:block/cucumber_crate"
5+
}
6+
}
7+
}

‎src/main/resources/assets/ukrainian_delight/lang/en_us.json

+23-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,34 @@
11
{
2-
"itemgroup.ukrainian_delight": "Ukrainian Delight",
2+
"_comment1": "groups",
3+
"itemgroup.meals_ukrainian_delight": "Ukrainian Delight",
4+
"itemgroup.ingredients_ukrainian_delight": "Ukrainian Delight Ingredients",
35
"rei.ukrainian_delight": "Ukrainian Delight",
46

5-
"item.ukrainian_delight.varenyk": "Varenyk",
6-
"item.ukrainian_delight.borscht": "Borscht",
7-
7+
"_comment2": "ingredients",
88
"item.ukrainian_delight.horseradish": "Horseradish",
99
"item.ukrainian_delight.salt": "Salt",
10+
"item.ukrainian_delight.cucumber": "Cucumber",
11+
"item.ukrainian_delight.cutted_cucumber": "Cut Cucumber",
12+
"block.ukrainian_delight.cucumber_crate": "Cucumber Crate",
13+
14+
"_comment3": "meals",
15+
"item.ukrainian_delight.varenyk": "Varenyk",
16+
"item.ukrainian_delight.borscht": "Borscht",
17+
"item.ukrainian_delight.lean_borscht": "Lean Borscht",
1018

19+
"_comment4": "blocks",
1120
"block.ukrainian_delight.salt_block": "Salt Block",
1221

22+
"_comment5": "advancements",
23+
"ukrainian_delight.advancement.root": "Ukrainian Delight",
24+
"ukrainian_delight.advancement.root.desc": "The power of Ukrainian delicacies!",
25+
26+
"ukrainian_delight.advancement.borscht": "Where to find red water!",
27+
"ukrainian_delight.advancement.borscht.desc": "Cook borscht",
28+
"ukrainian_delight.advancement.lean_borscht": "The same, but with mushrooms!",
29+
"ukrainian_delight.advancement.lean_borscht.desc": "Cook lean borscht",
30+
31+
"_comment6": "tooltip",
1332
"tooltip.ukrainian_delight.no_effects": "No effects",
1433

1534
"amplifier.none": "",

‎src/main/resources/assets/ukrainian_delight/lang/uk_ua.json

+36-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,46 @@
11
{
2-
"itemgroup.ukrainian_delight": "Українська насолода",
2+
"_comment1": "groups",
3+
"itemgroup.meals_ukrainian_delight": "Українська насолода страви",
4+
"itemgroup.ingredients_ukrainian_delight": "Українська насолода складові",
35
"rei.ukrainian_delight": "Українська насолода",
46

5-
"item.ukrainian_delight.varenyk": "Вареник",
6-
"item.ukrainian_delight.borscht": "Борщ",
7-
7+
"_comment2": "ingredients",
88
"item.ukrainian_delight.horseradish": "Хрін",
99
"item.ukrainian_delight.salt": "Сіль",
10+
"item.ukrainian_delight.cucumber": "Огірок",
11+
"item.ukrainian_delight.cutted_cucumber": "Скибка огірка",
12+
"block.ukrainian_delight.cucumber_crate": "Ящик огірків",
1013

14+
"_comment3": "meals",
15+
"item.ukrainian_delight.varenyk": "Вареник",
16+
"item.ukrainian_delight.borscht": "Борщ",
17+
"item.ukrainian_delight.lean_borscht": "Пісний борщ",
18+
19+
"_comment4": "blocks",
1120
"block.ukrainian_delight.salt_block": "Солевий блок",
1221

13-
"tooltip.ukrainian_delight.no_effects": "Немає ефектів"
22+
"_comment5": "advancements",
23+
"ukrainian_delight.advancement.root": "Українська насолода",
24+
"ukrainian_delight.advancement.root.desc": "Сила українських смаколиків!",
25+
26+
"ukrainian_delight.advancement.borscht": "Де знайти червону воду!",
27+
"ukrainian_delight.advancement.borscht.desc": "Зваріть борщ",
28+
"ukrainian_delight.advancement.lean_borscht": "Те саме тільки з грибами",
29+
"ukrainian_delight.advancement.lean_borscht.desc": "Зваріть пісний борщ",
30+
31+
"_comment6": "tooltip",
32+
"tooltip.ukrainian_delight.no_effects": "Немає ефектів",
33+
34+
"amplifier.none": "",
35+
"amplifier.1": "",
36+
"amplifier.2": " II",
37+
"amplifier.3": " III",
38+
"amplifier.4": " IV",
39+
"amplifier.5": " V",
40+
"amplifier.6": " VI",
41+
"amplifier.7": " VII",
42+
"amplifier.8": " VIII",
43+
"amplifier.9": " IX",
44+
"amplifier.10": " X"
1445

1546
}

‎src/main/resources/assets/ukrainian_delight/models/block/cucumber_crate.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/cube_bottom_top",
3+
"textures": {
4+
"side": "ukrainian_delight:block/cucumber_crate_side",
5+
"bottom": "farmersdelight:block/crate_bottom",
6+
"top": "ukrainian_delight:block/cucumber_crate_top"
7+
}
8+
}

‎src/main/resources/assets/ukrainian_delight/models/item/cucumber.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "ukrainian_delight:item/cucumber"
5+
}
6+
}

‎src/main/resources/assets/ukrainian_delight/models/item/cucumber_crate.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "ukrainian_delight:block/cucumber_crate"
3+
}

‎src/main/resources/assets/ukrainian_delight/models/item/cutted_cucumber.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "ukrainian_delight:item/cutted_cucumber"
5+
}
6+
}

‎src/main/resources/assets/ukrainian_delight/models/item/lean_borscht.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "ukrainian_delight:item/lean_borscht"
5+
}
6+
}

‎src/main/resources/assets/ukrainian_delight/textures/block/cucumber_crate_side.png

2.12 KB
Loading

‎src/main/resources/assets/ukrainian_delight/textures/block/cucumber_crate_top.png

3.16 KB
Loading

‎src/main/resources/assets/ukrainian_delight/textures/item/borscht.png

24 Bytes
Loading

‎src/main/resources/assets/ukrainian_delight/textures/item/cucumber_сut.png renamed to ‎src/main/resources/assets/ukrainian_delight/textures/item/cutted_cucumber.png

File renamed without changes.

‎src/main/resources/assets/ukrainian_delight/textures/item/lean_borscht.png

461 Bytes
Loading

‎src/main/resources/data/minecraft/tags/blocks/mineable/axe.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
4+
"ukrainian_delight:cucumber_crate"
55
]
66
}

‎src/main/resources/data/ukrainian_delight/advancements/lean_borscht.json

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"display": {
3+
"icon": {
4+
"item": "ukrainian_delight:lean_borscht"
5+
},
6+
"title": {
7+
"translate": "ukrainian_delight.advancement.lean_borscht"
8+
},
9+
"description": {
10+
"translate": "ukrainian_delight.advancement.lean_borscht.desc"
11+
},
12+
"frame": "task",
13+
"show_toast": true,
14+
"announce_to_chat": true
15+
},
16+
"parent": "ukrainian_delight:ukrainian_delight",
17+
"criteria": {
18+
"requirement": {
19+
"trigger": "minecraft:inventory_changed",
20+
"conditions": {
21+
"items": [
22+
{
23+
"items": [
24+
"ukrainian_delight:lean_borscht"
25+
]
26+
}
27+
]
28+
}
29+
}
30+
}
31+
}

‎src/main/resources/data/ukrainian_delight/advancements/ukrainian_delight.json

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"display": {
3+
"icon": {
4+
"item": "ukrainian_delight:cucumber"
5+
},
6+
"title": {
7+
"translate": "ukrainian_delight.advancement.root"
8+
},
9+
"description": {
10+
"translate": "ukrainian_delight.advancement.root.desc"
11+
},
12+
"frame": "task",
13+
"show_toast": true,
14+
"announce_to_chat": true,
15+
"background": "ukrainian_delight:textures/block/cucumber_crate_side.png"
16+
},
17+
"criteria": {
18+
"requirement": {
19+
"trigger": "minecraft:inventory_changed",
20+
"conditions": {
21+
"items": [
22+
{
23+
"items": [
24+
"ukrainian_delight:cucumber",
25+
"ukrainian_delight:horseradish",
26+
"ukrainian_delight:salt"
27+
]
28+
}
29+
]
30+
}
31+
}
32+
}
33+
}

‎src/main/resources/data/ukrainian_delight/loot_tables/blocks/cucumber_crate.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"name": "pool1",
6+
"rolls": 1,
7+
"entries": [
8+
{
9+
"type": "minecraft:item",
10+
"name": "ukrainian_delight:cucumber_crate"
11+
}
12+
],
13+
"conditions": [
14+
{
15+
"condition": "minecraft:survives_explosion"
16+
}
17+
]
18+
}
19+
]
20+
}

‎src/main/resources/data/ukrainian_delight/recipes/cooking/lean_borscht.json

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"type": "farmersdelight:cooking",
3+
"container": {
4+
"item": "minecraft:bowl"
5+
},
6+
"cookingtime": 200,
7+
"experience": 1.0,
8+
"ingredients": [
9+
{
10+
"item": "minecraft:carrot"
11+
},
12+
{
13+
"item": "minecraft:potato"
14+
},
15+
{
16+
"item": "minecraft:beetroot_soup"
17+
},
18+
{
19+
"item": "farmersdelight:tomato_sauce"
20+
},
21+
{
22+
"tag": "c:salad_ingredients"
23+
},
24+
{
25+
"items": [
26+
"minecraft:red_mushroom",
27+
"minecraft:brown_mushroom"
28+
]
29+
}
30+
],
31+
"recipe_book_tab": "meals",
32+
"result": {
33+
"item": "ukrainian_delight:borscht"
34+
}
35+
}

0 commit comments

Comments
 (0)