diff --git a/projectfiles/cherry.aseprite b/projectfiles/cherry.aseprite new file mode 100644 index 0000000..294d2e6 Binary files /dev/null and b/projectfiles/cherry.aseprite differ diff --git a/projectfiles/cottage_cheese.aseprite b/projectfiles/cottage_cheese.aseprite new file mode 100644 index 0000000..c9ca760 Binary files /dev/null and b/projectfiles/cottage_cheese.aseprite differ diff --git a/projectfiles/salo.aseprite b/projectfiles/salo.aseprite new file mode 100644 index 0000000..c1b32b9 Binary files /dev/null and b/projectfiles/salo.aseprite differ diff --git a/projectfiles/yeast.aseprite b/projectfiles/yeast.aseprite new file mode 100644 index 0000000..4a61686 Binary files /dev/null and b/projectfiles/yeast.aseprite differ diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java index 2b61b0b..850147c 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java @@ -82,7 +82,6 @@ public class BrewingKegBlockEntity extends BlockEntity implements ExtendedScreen private int maxProgress = 200; // Adjusted to match the brewing time in the JSON private Text customName; private ItemStack drinkContainer; - private ItemStack lastContainer; 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 b8e53bc..fbb5e2d 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java @@ -72,6 +72,18 @@ public class ModFoodComponents { .saturationModifier(0.1f) .build(); + public static final FoodComponent COTTAGE_CHEESE = new FoodComponent.Builder() + .hunger(5) + .saturationModifier(0.25f) + .build(); + + public static final FoodComponent SALO = 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 20a13e6..39caaf8 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java @@ -42,6 +42,10 @@ public class ModItemGroups { entries.add(ModItems.CUTTED_CUCUMBER); entries.add(ModItems.APPLE_SLICE); entries.add(ModItems.DRIED_APPLE_SLICE); + entries.add(ModItems.CHERRY_BERRY); + entries.add(ModItems.COTTAGE_CHEESE); + entries.add(ModItems.SALO); + entries.add(ModItems.YEAST); }).build()); public static final ItemGroup JARS_UKRAINIAN_DELIGHT = Registry.register(Registries.ITEM_GROUP, 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 70418ba..7368f40 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItems.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItems.java @@ -54,8 +54,17 @@ public class ModItems { .food(ModFoodComponents.CHERRY_BERRY) .build()); + public static final Item COTTAGE_CHEESE = registerItem("cottage_cheese", new ItemBuilder() + .food(ModFoodComponents.COTTAGE_CHEESE) + .build()); + + public static final Item SALO = registerItem("salo", new ItemBuilder() + .food(ModFoodComponents.SALO) + .build()); + // Simple items without specifying maxCount, defaults to 64 public static final Item SALT = registerItem("salt", new ItemBuilder().build()); + public static final Item YEAST = registerItem("yeast", new ItemBuilder().build()); // Register items public static Item registerItem(String name, Item item) { 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 516f347..09a9413 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/en_us.json +++ b/src/main/resources/assets/ukrainian_delight/lang/en_us.json @@ -13,6 +13,10 @@ "block.ukrainian_delight.cucumber_crate": "Cucumber Crate", "item.ukrainian_delight.apple_slice": "Apple Slice", "item.ukrainian_delight.dried_apple_slice": "Dried Apple Slice", + "item.ukrainian_delight.cherry_berry": "Cherry Berry", + "item.ukrainian_delight.cottage_cheese": "Cottage Cheese", + "item.ukrainian_delight.salo": "Salo", + "item.ukrainian_delight.yeast": "Yeast", "_comment3": "meals", "item.ukrainian_delight.varenyk": "Varenyk", 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 df98811..a09d61a 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json +++ b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json @@ -13,6 +13,10 @@ "block.ukrainian_delight.cucumber_crate": "Ящик огірків", "item.ukrainian_delight.apple_slice": "Скибка яблука", "item.ukrainian_delight.dried_apple_slice": "Сушена скибка яблука", + "item.ukrainian_delight.cherry_berry": "Вишня", + "item.ukrainian_delight.cottage_cheese": "Домашній сир", + "item.ukrainian_delight.salo": "Сало", + "item.ukrainian_delight.yeast": "Дріжджі", "_comment3": "meals", "item.ukrainian_delight.varenyk": "Вареник", diff --git a/src/main/resources/assets/ukrainian_delight/models/item/cottage_cheese.json b/src/main/resources/assets/ukrainian_delight/models/item/cottage_cheese.json new file mode 100644 index 0000000..ae00b28 --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/item/cottage_cheese.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ukrainian_delight:item/cottage_cheese" + } +} diff --git a/src/main/resources/assets/ukrainian_delight/models/item/salo.json b/src/main/resources/assets/ukrainian_delight/models/item/salo.json new file mode 100644 index 0000000..937dc3f --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/item/salo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ukrainian_delight:item/salo" + } +} diff --git a/src/main/resources/assets/ukrainian_delight/models/item/yeast.json b/src/main/resources/assets/ukrainian_delight/models/item/yeast.json new file mode 100644 index 0000000..42164e1 --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/item/yeast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ukrainian_delight:item/yeast" + } +} diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/brewing_keg.png b/src/main/resources/assets/ukrainian_delight/textures/item/brewing_keg.png deleted file mode 100644 index 6abde9c..0000000 Binary files a/src/main/resources/assets/ukrainian_delight/textures/item/brewing_keg.png and /dev/null differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/cherry_berry.png b/src/main/resources/assets/ukrainian_delight/textures/item/cherry_berry.png index 459870e..a2b8579 100644 Binary files a/src/main/resources/assets/ukrainian_delight/textures/item/cherry_berry.png and b/src/main/resources/assets/ukrainian_delight/textures/item/cherry_berry.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/cottage_cheese.png b/src/main/resources/assets/ukrainian_delight/textures/item/cottage_cheese.png new file mode 100644 index 0000000..56dedcd Binary files /dev/null and b/src/main/resources/assets/ukrainian_delight/textures/item/cottage_cheese.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/salo.png b/src/main/resources/assets/ukrainian_delight/textures/item/salo.png new file mode 100644 index 0000000..f8a131a Binary files /dev/null and b/src/main/resources/assets/ukrainian_delight/textures/item/salo.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/yeast.png b/src/main/resources/assets/ukrainian_delight/textures/item/yeast.png new file mode 100644 index 0000000..7bfb27b Binary files /dev/null and b/src/main/resources/assets/ukrainian_delight/textures/item/yeast.png differ