From 609381dee872f497052f8b75cdaf665e4fc9d581 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Wed, 5 May 2021 03:29:57 +0300 Subject: [PATCH] Blossom berry jelly (#136) and small rebalance --- .../integration/NourishIntegration.java | 2 ++ .../ru/betterend/recipe/CraftingRecipes.java | 30 +++++++++++------- .../java/ru/betterend/registry/EndItems.java | 5 +-- .../assets/betterend/lang/en_us.json | 3 +- .../assets/betterend/lang/ru_ru.json | 3 +- .../textures/item/blossom_berry_jelly.png | Bin 0 -> 209 bytes .../textures/item/sweet_berry_jelly.png | Bin 215 -> 209 bytes 7 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/item/blossom_berry_jelly.png diff --git a/src/main/java/ru/betterend/integration/NourishIntegration.java b/src/main/java/ru/betterend/integration/NourishIntegration.java index ca0efca9..0fdf6274 100644 --- a/src/main/java/ru/betterend/integration/NourishIntegration.java +++ b/src/main/java/ru/betterend/integration/NourishIntegration.java @@ -29,6 +29,7 @@ public class NourishIntegration extends ModIntegration { EndItems.BLOSSOM_BERRY, EndItems.SHADOW_BERRY_JELLY, EndItems.SWEET_BERRY_JELLY, + EndItems.BLOSSOM_BERRY_JELLY, EndItems.AMBER_ROOT_RAW, EndItems.CHORUS_MUSHROOM_RAW, EndItems.CHORUS_MUSHROOM_COOKED, @@ -46,6 +47,7 @@ public class NourishIntegration extends ModIntegration { sweets, EndItems.SHADOW_BERRY_JELLY, EndItems.SWEET_BERRY_JELLY, + EndItems.BLOSSOM_BERRY_JELLY, EndItems.CAVE_PUMPKIN_PIE ); } diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index 055d947f..617cbce4 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -101,19 +101,27 @@ public class CraftingRecipes { GridRecipe.make("petal_white_dye", Items.WHITE_DYE).setList("#").addMaterial('#', EndItems.HYDRALUX_PETAL).build(); GridRecipe.make("sweet_berry_jelly", EndItems.SWEET_BERRY_JELLY) - .setList("JWSB") - .addMaterial('J', EndItems.GELATINE) - .addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)) - .addMaterial('S', Items.SUGAR).addMaterial('B', Items.SWEET_BERRIES) - .build(); + .setList("JWSB") + .addMaterial('J', EndItems.GELATINE) + .addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)) + .addMaterial('S', Items.SUGAR).addMaterial('B', Items.SWEET_BERRIES) + .build(); GridRecipe.make("shadow_berry_jelly", EndItems.SHADOW_BERRY_JELLY) - .setList("JWSB") - .addMaterial('J', EndItems.GELATINE) - .addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)) - .addMaterial('S', Items.SUGAR) - .addMaterial('B', EndItems.SHADOW_BERRY_COOKED) - .build(); + .setList("JWSB") + .addMaterial('J', EndItems.GELATINE) + .addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)) + .addMaterial('S', Items.SUGAR) + .addMaterial('B', EndItems.SHADOW_BERRY_COOKED) + .build(); + + GridRecipe.make("shadow_berry_jelly", EndItems.BLOSSOM_BERRY_JELLY) + .setList("JWSB") + .addMaterial('J', EndItems.GELATINE) + .addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)) + .addMaterial('S', Items.SUGAR) + .addMaterial('B', EndItems.BLOSSOM_BERRY) + .build(); GridRecipe.make("sulphur_gunpowder", Items.GUNPOWDER).setList("SCB").addMaterial('S', EndItems.CRYSTALLINE_SULPHUR).addMaterial('C', Items.COAL, Items.CHARCOAL).addMaterial('B', Items.BONE_MEAL).build(); diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 72417b08..d174a18d 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -122,8 +122,9 @@ public class EndItems { public final static Item END_FISH_COOKED = registerFood("end_fish_cooked", Foods.COOKED_SALMON); public final static Item BUCKET_END_FISH = registerItem("bucket_end_fish", new EndBucketItem(EndEntities.END_FISH)); public final static Item BUCKET_CUBOZOA = registerItem("bucket_cubozoa", new EndBucketItem(EndEntities.CUBOZOA)); - public final static Item SWEET_BERRY_JELLY = registerFood("sweet_berry_jelly", 6, 0.75F); - public final static Item SHADOW_BERRY_JELLY = registerFood("shadow_berry_jelly", 7, 0.75F, new MobEffectInstance(MobEffects.NIGHT_VISION, 400)); + public final static Item SWEET_BERRY_JELLY = registerFood("sweet_berry_jelly", 8, 0.7F); + public final static Item SHADOW_BERRY_JELLY = registerFood("shadow_berry_jelly", 6, 0.8F, new MobEffectInstance(MobEffects.NIGHT_VISION, 400)); + public final static Item BLOSSOM_BERRY_JELLY = registerFood("blossom_berry_jelly", 8, 0.7F); public final static Item BLOSSOM_BERRY = registerFood("blossom_berry", Foods.APPLE); public final static Item AMBER_ROOT_RAW = registerFood("amber_root_raw", 2, 0.8F); public final static Item CHORUS_MUSHROOM_RAW = registerFood("chorus_mushroom_raw", 3, 0.5F); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 3983a76a..a573c1da 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -855,5 +855,6 @@ "block.betterend.neon_cactus_block": "Neon Cactus Block", "block.betterend.neon_cactus_slab": "Neon Cactus Slab", "block.betterend.neon_cactus_stairs": "Neon Cactus Stairs", - "biome.betterend.jade_cave": "Jade Cave" + "biome.betterend.jade_cave": "Jade Cave", + "item.betterend.blossom_berry_jelly": "Blossom Berry Jelly" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 0e550b66..0deedfee 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -874,5 +874,6 @@ "block.betterend.neon_cactus_block": "Блок неонового кактуса", "block.betterend.neon_cactus_slab": "Плита из неонового кактуса", "block.betterend.neon_cactus_stairs": "Ступени из неонового кактуса", - "biome.betterend.jade_cave": "Нефритовая пещера" + "biome.betterend.jade_cave": "Нефритовая пещера", + "item.betterend.blossom_berry_jelly": "Желе из цветущей ягоды" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/item/blossom_berry_jelly.png b/src/main/resources/assets/betterend/textures/item/blossom_berry_jelly.png new file mode 100644 index 0000000000000000000000000000000000000000..d09b7c25d85e2d503cb7b9cb6dcc603413cf76c6 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6zM9{GlYxBc0G|+7 zAl)Nhwbp3Hc8A61{C3_>Ir+Zk-v8Mje((9{p8AOeD9u?Czopr0Pr(S5dZ)H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/sweet_berry_jelly.png b/src/main/resources/assets/betterend/textures/item/sweet_berry_jelly.png index 916b336379bdaabbfe1a459f29065fd88e2c5944..4e2ff978efad495a15a7347cd45ea46342d8083c 100644 GIT binary patch delta 192 zcmcc4c#&~}WIZzj1A~Sxe=v|@Nq6*hWMJ6XSMxh?GLSDF;1l8sq!XB#YxpE)3aIar z4n1O)b(3c~~(PDeHX#>Z&@Of!gv`5o*Xpcsr#v;oM@hd&vBO*4i8N6fO|Q3zra zvK=D~V2VMSkqv;w1kouGW)Ms>$p&CEXz*qx00{i7=wd`{jQ{`u07*qoM6N<$f;Sya AF#rGn