diff --git a/projectfiles/salt.aseprite b/projectfiles/salt.aseprite index f2844ac..58eb7b3 100644 Binary files a/projectfiles/salt.aseprite and b/projectfiles/salt.aseprite differ diff --git a/projectfiles/varenyk2.aseprite b/projectfiles/varenyk2.aseprite new file mode 100644 index 0000000..de83ba2 Binary files /dev/null and b/projectfiles/varenyk2.aseprite differ diff --git "a/projectfiles/\320\223\321\226\321\200\320\276\320\272.aseprite" "b/projectfiles/\320\223\321\226\321\200\320\276\320\272.aseprite" new file mode 100644 index 0000000..0e5ba9d Binary files /dev/null and "b/projectfiles/\320\223\321\226\321\200\320\276\320\272.aseprite" differ diff --git "a/projectfiles/\320\261\320\276\321\200\321\211\321\226.aseprite" "b/projectfiles/\320\261\320\276\321\200\321\211\321\226.aseprite" new file mode 100644 index 0000000..8ecd8b3 Binary files /dev/null and "b/projectfiles/\320\261\320\276\321\200\321\211\321\226.aseprite" differ diff --git "a/projectfiles/\321\206\321\226\320\273\320\270\320\271 \320\263\321\226\321\200\320\276\320\272.aseprite" "b/projectfiles/\321\206\321\226\320\273\320\270\320\271 \320\263\321\226\321\200\320\276\320\272.aseprite" new file mode 100644 index 0000000..818c3d6 Binary files /dev/null and "b/projectfiles/\321\206\321\226\320\273\320\270\320\271 \320\263\321\226\321\200\320\276\320\272.aseprite" differ diff --git "a/projectfiles/\321\217\321\211\320\270\320\272 \320\263\321\226\321\200\320\276\320\272.aseprite" "b/projectfiles/\321\217\321\211\320\270\320\272 \320\263\321\226\321\200\320\276\320\272.aseprite" new file mode 100644 index 0000000..d68199c Binary files /dev/null and "b/projectfiles/\321\217\321\211\320\270\320\272 \320\263\321\226\321\200\320\276\320\272.aseprite" differ diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/ModBlock.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/ModBlock.java index 4e947b6..cb37852 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/ModBlock.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/ModBlock.java @@ -16,6 +16,9 @@ public class ModBlock { public static final Block SALT_BLOCK = registerBlock("salt_block", new Block(FabricBlockSettings.copyOf(Blocks.STONE).sounds(BlockSoundGroup.STONE))); + public static final Block SALT_BAG = registerBlock("salt_bag", + new Block(FabricBlockSettings.copyOf(Blocks.WHITE_WOOL).sounds(BlockSoundGroup.WOOL))); + public static final Block CUCUMBER_CRATE = registerBlock("cucumber_crate", new Block(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).sounds(BlockSoundGroup.WOOD))); 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 6f790bf..4a3339d 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java @@ -31,6 +31,7 @@ public class ModItemGroups { .displayName(Text.translatable("itemgroup.ingredients_ukrainian_delight")) .icon(() -> new ItemStack(ModItems.CUCUMBER)) .entries((displayContext, entries) -> { + entries.add(ModBlock.SALT_BAG); entries.add(ModBlock.SALT_BLOCK); entries.add(ModItems.SALT); diff --git a/src/main/resources/assets/ukrainian_delight/blockstates/salt_bag.json b/src/main/resources/assets/ukrainian_delight/blockstates/salt_bag.json new file mode 100644 index 0000000..72da18e --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/blockstates/salt_bag.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ukrainian_delight:block/salt_bag" + } + } +} \ No newline at end of file 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 0859f44..aad9b0d 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/en_us.json +++ b/src/main/resources/assets/ukrainian_delight/lang/en_us.json @@ -36,6 +36,7 @@ "_comment6": "blocks", "block.ukrainian_delight.salt_block": "Salt Block", + "block.ukrainian_delight.salt_bag": "Salt Bag", "_comment7": "advancements", "ukrainian_delight.advancement.root": "Ukrainian Delight", 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 428d1d1..e135e18 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json +++ b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json @@ -36,6 +36,7 @@ "_comment6": "blocks", "block.ukrainian_delight.salt_block": "Солевий блок", + "block.ukrainian_delight.salt_bag": "Мішок солі", "_comment7": "advancements", "ukrainian_delight.advancement.root": "Українська насолода", diff --git a/src/main/resources/assets/ukrainian_delight/models/block/salt_bag.json b/src/main/resources/assets/ukrainian_delight/models/block/salt_bag.json new file mode 100644 index 0000000..6d3a78d --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/block/salt_bag.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "ukrainian_delight:block/salt_bag_top", + "down": "ukrainian_delight:block/bag_bottom", + "up": "ukrainian_delight:block/salt_bag_top", + "north": "ukrainian_delight:block/bag_side_tied", + "south": "ukrainian_delight:block/bag_side_tied", + "east": "ukrainian_delight:block/bag_side", + "west": "ukrainian_delight:block/bag_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ukrainian_delight/models/item/salt_bag.json b/src/main/resources/assets/ukrainian_delight/models/item/salt_bag.json new file mode 100644 index 0000000..a09efea --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/models/item/salt_bag.json @@ -0,0 +1,3 @@ +{ + "parent": "ukrainian_delight:block/salt_bag" +} \ No newline at end of file diff --git a/src/main/resources/assets/ukrainian_delight/textures/block/bag_bottom.png b/src/main/resources/assets/ukrainian_delight/textures/block/bag_bottom.png new file mode 100644 index 0000000..1b4a927 Binary files /dev/null and b/src/main/resources/assets/ukrainian_delight/textures/block/bag_bottom.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/block/bag_side.png b/src/main/resources/assets/ukrainian_delight/textures/block/bag_side.png new file mode 100644 index 0000000..d5b42b5 Binary files /dev/null and b/src/main/resources/assets/ukrainian_delight/textures/block/bag_side.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/block/bag_side_tied.png b/src/main/resources/assets/ukrainian_delight/textures/block/bag_side_tied.png new file mode 100644 index 0000000..e775aa1 Binary files /dev/null and b/src/main/resources/assets/ukrainian_delight/textures/block/bag_side_tied.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/block/salt_bag_top.png b/src/main/resources/assets/ukrainian_delight/textures/block/salt_bag_top.png new file mode 100644 index 0000000..557ca23 Binary files /dev/null and b/src/main/resources/assets/ukrainian_delight/textures/block/salt_bag_top.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/block/salt_block.png b/src/main/resources/assets/ukrainian_delight/textures/block/salt_block.png index 02a4acb..3c04451 100644 Binary files a/src/main/resources/assets/ukrainian_delight/textures/block/salt_block.png and b/src/main/resources/assets/ukrainian_delight/textures/block/salt_block.png differ diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/salt.png b/src/main/resources/assets/ukrainian_delight/textures/item/salt.png index afaa8c4..9a65ac6 100644 Binary files a/src/main/resources/assets/ukrainian_delight/textures/item/salt.png and b/src/main/resources/assets/ukrainian_delight/textures/item/salt.png differ diff --git a/src/main/resources/data/ukrainian_delight/loot_tables/blocks/salt_bag.json b/src/main/resources/data/ukrainian_delight/loot_tables/blocks/salt_bag.json new file mode 100644 index 0000000..5aee497 --- /dev/null +++ b/src/main/resources/data/ukrainian_delight/loot_tables/blocks/salt_bag.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "pool1", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "ukrainian_delight:salt_bag" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ 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 index 512222b..3de845d 100644 --- 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 @@ -3,7 +3,7 @@ "category": "misc", "cookingtime": 200, "experience": 0.1, - "group": "copper_ingot", + "group": "apple_slice", "ingredient": { "item": "ukrainian_delight:apple_slice" }, diff --git a/src/main/resources/data/ukrainian_delight/recipes/salt_block_from_salt.json b/src/main/resources/data/ukrainian_delight/recipes/salt_bag_from_salt.json similarity index 82% rename from src/main/resources/data/ukrainian_delight/recipes/salt_block_from_salt.json rename to src/main/resources/data/ukrainian_delight/recipes/salt_bag_from_salt.json index cb9ad2e..1028e42 100644 --- a/src/main/resources/data/ukrainian_delight/recipes/salt_block_from_salt.json +++ b/src/main/resources/data/ukrainian_delight/recipes/salt_bag_from_salt.json @@ -12,6 +12,6 @@ } }, "result": { - "item": "ukrainian_delight:salt_block" + "item": "ukrainian_delight:salt_bag" } } diff --git a/src/main/resources/data/ukrainian_delight/recipes/salt_from_salt_block.json b/src/main/resources/data/ukrainian_delight/recipes/salt_from_salt_bag.json similarity index 80% rename from src/main/resources/data/ukrainian_delight/recipes/salt_from_salt_block.json rename to src/main/resources/data/ukrainian_delight/recipes/salt_from_salt_bag.json index 1693201..898537a 100644 --- a/src/main/resources/data/ukrainian_delight/recipes/salt_from_salt_block.json +++ b/src/main/resources/data/ukrainian_delight/recipes/salt_from_salt_bag.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "ukrainian_delight:salt_block" + "item": "ukrainian_delight:salt_bag" } ], "result": {