diff --git a/src/main/java/ru/betterend/blocks/BlockBulbVine.java b/src/main/java/ru/betterend/blocks/BlockBulbVine.java index 08fbf52b..28961ca1 100644 --- a/src/main/java/ru/betterend/blocks/BlockBulbVine.java +++ b/src/main/java/ru/betterend/blocks/BlockBulbVine.java @@ -7,6 +7,8 @@ import com.google.common.collect.Lists; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; import ru.betterend.blocks.BlockProperties.TripleShape; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.registry.EndBlocks; @@ -30,4 +32,9 @@ public class BlockBulbVine extends BlockVine { return Lists.newArrayList(); } } + + @Override + public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { + return false; + } } diff --git a/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java b/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java index 3cdad85c..45d5e2aa 100644 --- a/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java +++ b/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java @@ -1,9 +1,12 @@ package ru.betterend.blocks; +import net.minecraft.block.BlockState; import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.color.item.ItemColorProvider; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3i; +import net.minecraft.world.BlockView; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.interfaces.IColorProvider; import ru.betterend.util.MHelper; @@ -27,6 +30,11 @@ public class BlockTenaneaFlowers extends BlockVine implements IColorProvider { return ITEM_PROVIDER; } + @Override + public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { + return false; + } + static { COLORS = new Vec3i[] { new Vec3i(250, 111, 222), diff --git a/src/main/java/ru/betterend/blocks/basis/BlockVine.java b/src/main/java/ru/betterend/blocks/basis/BlockVine.java index a9f48599..5ff39c4b 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockVine.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockVine.java @@ -120,7 +120,10 @@ public class BlockVine extends BlockBaseNotFull implements IRenderTypeable, Fert @Override public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { - return true; + while (world.getBlockState(pos).getBlock() == this) { + pos = pos.down(); + } + return world.getBlockState(pos).isAir(); } @Override diff --git a/src/main/resources/assets/betterend/blockstates/bulb_vine_seed.json b/src/main/resources/assets/betterend/blockstates/bulb_vine_seed.json new file mode 100644 index 00000000..2693bb52 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/bulb_vine_seed.json @@ -0,0 +1,8 @@ +{ + "variants": { + "age=0": { "model": "betterend:block/bulb_vine_seed_0" }, + "age=1": { "model": "betterend:block/bulb_vine_seed_1" }, + "age=2": { "model": "betterend:block/bulb_vine_seed_2" }, + "age=3": { "model": "betterend:block/bulb_vine_seed_3" } + } +} diff --git a/src/main/resources/assets/betterend/models/block/bulb_vine_seed_0.json b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_0.json new file mode 100644 index 00000000..2fc2f445 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_0.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/bulb_vine_seed_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bulb_vine_seed_1.json b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_1.json new file mode 100644 index 00000000..48acc771 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/bulb_vine_seed_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bulb_vine_seed_2.json b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_2.json new file mode 100644 index 00000000..3fe25051 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/bulb_vine_seed_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bulb_vine_seed_3.json b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_3.json new file mode 100644 index 00000000..dbd9606e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_vine_seed_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/bulb_vine_seed_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/bulb_vine_seed.json b/src/main/resources/assets/betterend/models/item/bulb_vine_seed.json new file mode 100644 index 00000000..7d70fd83 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/bulb_vine_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/bulb_vine_seed" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_0.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_0.png new file mode 100644 index 00000000..0c51d27c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_0.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_1.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_1.png new file mode 100644 index 00000000..6c8df6b1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_2.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_2.png new file mode 100644 index 00000000..7fef82c1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_3.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_3.png new file mode 100644 index 00000000..6427f088 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bulb_vine_seed_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png b/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png index efdecb02..2d67b177 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png and b/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/cave_moss_top.png b/src/main/resources/assets/betterend/textures/block/cave_moss_top.png index 335fa1cb..1d3698b2 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_moss_top.png and b/src/main/resources/assets/betterend/textures/block/cave_moss_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_plant.png b/src/main/resources/assets/betterend/textures/block/chorus_plant.png index 2bf9e6f2..756dae1e 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_plant.png and b/src/main/resources/assets/betterend/textures/block/chorus_plant.png differ diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png index b7bf2ef7..e8a075de 100644 Binary files a/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png and b/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png b/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png index d0eb1f48..0de57261 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_moss_side.png b/src/main/resources/assets/betterend/textures/block/end_moss_side.png index 26a0031b..6a328812 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_moss_side.png and b/src/main/resources/assets/betterend/textures/block/end_moss_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png b/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png index b550c4db..0aad4be7 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png and b/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_polished.png b/src/main/resources/assets/betterend/textures/block/flavolite_polished.png index a98bc902..fdcb63e7 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite_polished.png and b/src/main/resources/assets/betterend/textures/block/flavolite_polished.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png index d6dff737..dab4d306 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/pink_moss_side.png b/src/main/resources/assets/betterend/textures/block/pink_moss_side.png index 61f41c33..51f56f33 100644 Binary files a/src/main/resources/assets/betterend/textures/block/pink_moss_side.png and b/src/main/resources/assets/betterend/textures/block/pink_moss_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png b/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png index 3ae83134..837015c2 100644 Binary files a/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png and b/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png differ diff --git a/src/main/resources/assets/betterend/textures/item/bulb_vine_seed.png b/src/main/resources/assets/betterend/textures/item/bulb_vine_seed.png new file mode 100644 index 00000000..97146646 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/bulb_vine_seed.png differ