diff --git a/src/main/java/ru/betterend/blocks/ShadowBerryBlock.java b/src/main/java/ru/betterend/blocks/ShadowBerryBlock.java index 06c06ef8..28851136 100644 --- a/src/main/java/ru/betterend/blocks/ShadowBerryBlock.java +++ b/src/main/java/ru/betterend/blocks/ShadowBerryBlock.java @@ -1,64 +1,24 @@ package ru.betterend.blocks; -import java.util.List; -import java.util.Random; - -import com.google.common.collect.Lists; - -import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.StructureWorldAccess; -import net.minecraft.world.World; -import ru.betterend.blocks.basis.EndPlantWithAgeBlock; +import ru.betterend.blocks.basis.EndCropBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; -import ru.betterend.util.MHelper; -public class ShadowBerryBlock extends EndPlantWithAgeBlock { +public class ShadowBerryBlock extends EndCropBlock { private static final VoxelShape SHAPE = Block.createCuboidShape(1, 0, 1, 15, 8, 15); - @Override - public void growAdult(StructureWorldAccess world, Random random, BlockPos pos) {} - - @Override - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - if (state.get(AGE) < 3) { - return Lists.newArrayList(new ItemStack(this)); - } - else { - return Lists.newArrayList(new ItemStack(this), new ItemStack(EndItems.SHADOW_BERRY_RAW, MHelper.randRange(1, 3, MHelper.RANDOM))); - } - } - - @Override - public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { - return state.get(AGE) < 3; - } - - @Override - public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) { - return state.get(AGE) < 3; + public ShadowBerryBlock() { + super(EndItems.SHADOW_BERRY_RAW, EndBlocks.SHADOW_GRASS); } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { return SHAPE; } - - @Override - public AbstractBlock.OffsetType getOffsetType() { - return AbstractBlock.OffsetType.NONE; - } - - @Override - protected boolean isTerrain(BlockState state) { - return state.isOf(EndBlocks.SHADOW_GRASS); - } } diff --git a/src/main/java/ru/betterend/blocks/basis/EndCropBlock.java b/src/main/java/ru/betterend/blocks/basis/EndCropBlock.java index 16d5e8f9..2ff00d6b 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndCropBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndCropBlock.java @@ -12,6 +12,7 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; +import net.minecraft.block.ShapeContext; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.Item; @@ -24,12 +25,14 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.IntProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; public class EndCropBlock extends EndPlantBlock { + private static final VoxelShape SHAPE = Block.createCuboidShape(2, 0, 2, 14, 14, 14); public static final IntProperty AGE = IntProperty.of("age", 0, 3); private final Block[] terrain; @@ -101,14 +104,19 @@ public class EndCropBlock extends EndPlantBlock { @Override public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) { - return random.nextInt(8) == 0 && state.get(AGE) < 3; + return state.get(AGE) < 3; } @Override public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { super.scheduledTick(state, world, pos, random); - if (canGrow(world, random, pos, state)) { + if (canGrow(world, random, pos, state) && random.nextInt(8) == 0) { grow(world, random, pos, state); } } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { + return SHAPE; + } } diff --git a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java index 8f5546bb..ff5dd528 100644 --- a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java +++ b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java @@ -14,5 +14,6 @@ public class FurnaceRecipes { FurnaceRecipe.make("end_fish", EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED).build(); FurnaceRecipe.make("slime_ball", EndBlocks.JELLYSHROOM_CAP_PURPLE, Items.SLIME_BALL).build(); FurnaceRecipe.make("menger_sponge", EndBlocks.MENGER_SPONGE_WET, EndBlocks.MENGER_SPONGE).build(); + FurnaceRecipe.make("chorus_mushroom", EndItems.CHORUS_MUSHROOM_RAW, EndItems.CHORUS_MUSHROOM_COOKED).build(); } } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index ed788d7b..d7312cb8 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -279,7 +279,11 @@ public class EndBlocks { public static final Block AMARANITA_CAP = registerBlock("amaranita_cap", new AmaranitaCapBlock()); // Crops + public static final Block SHADOW_BERRY = registerBlock("shadow_berry", new ShadowBerryBlock()); public static final Block BLOSSOM_BERRY = registerBlock("blossom_berry_seed", new EndCropBlock(EndItems.BLOSSOM_BERRY, PINK_MOSS)); + public static final Block AMBER_ROOT = registerBlock("amber_root_seed", new EndCropBlock(EndItems.AMBER_ROOT_RAW, AMBER_MOSS)); + public static final Block CHORUS_MUSHROOM = registerBlock("chorus_mushroom_seed", new EndCropBlock(EndItems.CHORUS_MUSHROOM_RAW, CHORUS_NYLIUM)); + public static final Block PEARLBERRY = registerBlock("pearlberry_seed", new EndCropBlock(EndItems.BLOSSOM_BERRY, END_MOSS, END_MYCELIUM)); // Water plants public static final Block BUBBLE_CORAL = registerBlock("bubble_coral", new BubbleCoralBlock()); @@ -314,9 +318,6 @@ public class EndBlocks { public static final Block BULB_MOSS = registerBlock("bulb_moss", new EndWallPlantBlock(12)); public static final Block JUNGLE_FERN = registerBlock("jungle_fern", new EndWallPlantBlock()); - // Crops // - public static final Block SHADOW_BERRY = registerBlock("shadow_berry", new ShadowBerryBlock()); - // Vines // public static final Block DENSE_VINE = registerBlock("dense_vine", new VineBlock(15, true)); public static final Block TWISTED_VINE = registerBlock("twisted_vine", new VineBlock()); diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 16e29828..3d142761 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -117,6 +117,9 @@ public class EndItems { 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 StatusEffectInstance(StatusEffects.NIGHT_VISION, 400)); public final static Item BLOSSOM_BERRY = registerFood("blossom_berry", FoodComponents.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); + public final static Item CHORUS_MUSHROOM_COOKED = registerFood("chorus_mushroom_cooked", FoodComponents.MUSHROOM_STEW); // Drinks // public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice", 5, 0.7F); diff --git a/src/main/resources/assets/betterend/blockstates/amber_root_seed.json b/src/main/resources/assets/betterend/blockstates/amber_root_seed.json new file mode 100644 index 00000000..73ec7c46 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/amber_root_seed.json @@ -0,0 +1,20 @@ +{ + "variants": { + "age=0": [ + { "model": "betterend:block/amber_root_0" }, + { "model": "betterend:block/amber_root_1" } + ], + "age=1": [ + { "model": "betterend:block/amber_root_2" }, + { "model": "betterend:block/amber_root_3" } + ], + "age=2": [ + { "model": "betterend:block/amber_root_4" }, + { "model": "betterend:block/amber_root_5" } + ], + "age=3": [ + { "model": "betterend:block/amber_root_6" }, + { "model": "betterend:block/amber_root_7" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_mushroom_seed.json b/src/main/resources/assets/betterend/blockstates/chorus_mushroom_seed.json new file mode 100644 index 00000000..5868fee9 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_mushroom_seed.json @@ -0,0 +1,20 @@ +{ + "variants": { + "age=0": [ + { "model": "betterend:block/chorus_mushroom_0" }, + { "model": "betterend:block/chorus_mushroom_1" } + ], + "age=1": [ + { "model": "betterend:block/chorus_mushroom_2" }, + { "model": "betterend:block/chorus_mushroom_3" } + ], + "age=2": [ + { "model": "betterend:block/chorus_mushroom_4" }, + { "model": "betterend:block/chorus_mushroom_5" } + ], + "age=3": [ + { "model": "betterend:block/chorus_mushroom_6" }, + { "model": "betterend:block/chorus_mushroom_7" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index fab8ebd6..07d42dd2 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -699,5 +699,65 @@ "block.betterend.rutiscus_path": "Rutiscus Path", "block.betterend.sangnum": "Sangnum", "block.betterend.sangnum_path": "Sangnum Path", - "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom" + "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom", + + "block.betterend.amber_root_seed": "Amber Root Seed", + "block.betterend.azure_jadestone": "Azure Jadestone", + "block.betterend.azure_jadestone_bricks": "Azure Jadestone Bricks", + "block.betterend.azure_jadestone_bricks_slab": "Azure Jadestone Bricks Slab", + "block.betterend.azure_jadestone_bricks_stairs": "Azure Jadestone Bricks Stairs", + "block.betterend.azure_jadestone_bricks_wall": "Azure Jadestone Bricks Wall", + "block.betterend.azure_jadestone_button": "Azure Jadestone Button", + "block.betterend.azure_jadestone_furnace": "Azure Jadestone Furnace", + "block.betterend.azure_jadestone_lantern": "Azure Jadestone Lantern", + "block.betterend.azure_jadestone_pedestal": "Azure Jadestone Pedestal", + "block.betterend.azure_jadestone_pillar": "Azure Jadestone Pillar", + "block.betterend.azure_jadestone_plate": "Azure Jadestone Pressure Plate", + "block.betterend.azure_jadestone_polished": "Azure Jadestone Polished", + "block.betterend.azure_jadestone_slab": "Azure Jadestone Slab", + "block.betterend.azure_jadestone_stairs": "Azure Jadestone Stairs", + "block.betterend.azure_jadestone_tiles": "Azure Jadestone Tiles", + "block.betterend.azure_jadestone_wall": "Azure Jadestone Wall", + "block.betterend.chorus_mushroom_seed": "Chorus Mushroom Seed", + "block.betterend.end_stone_stalactite": "End Stone Stalactite", + "block.betterend.end_stone_stalactite_cavemoss": "Cave Moss Endstone Stalactite", + "block.betterend.pearlberry_seed": "Pearlberry Seed", + "block.betterend.rubinea": "Rubinea", + "block.betterend.sandy_jadestone": "Sandy Jadestone", + "block.betterend.sandy_jadestone_bricks": "Sandy Jadestone Bricks", + "block.betterend.sandy_jadestone_bricks_slab": "Sandy Jadestone Bricks Slab", + "block.betterend.sandy_jadestone_bricks_stairs": "Sandy Jadestone Bricks Stairs", + "block.betterend.sandy_jadestone_bricks_wall": "Sandy Jadestone Bricks Wall", + "block.betterend.sandy_jadestone_button": "Sandy Jadestone Button", + "block.betterend.sandy_jadestone_furnace": "Sandy Jadestone Furnace", + "block.betterend.sandy_jadestone_lantern": "Sandy Jadestone Lantern", + "block.betterend.sandy_jadestone_pedestal": "Sandy Jadestone Pedestal", + "block.betterend.sandy_jadestone_pillar": "Sandy Jadestone Pillar", + "block.betterend.sandy_jadestone_plate": "Sandy Jadestone Pressure Plate", + "block.betterend.sandy_jadestone_polished": "Sandy Jadestone Polished", + "block.betterend.sandy_jadestone_slab": "Sandy Jadestone Slab", + "block.betterend.sandy_jadestone_stairs": "Sandy Jadestone Stairs", + "block.betterend.sandy_jadestone_tiles": "Sandy Jadestone Tiles", + "block.betterend.sandy_jadestone_wall": "Sandy Jadestone Wall", + "block.betterend.smaragdant_crystal": "Smaragdant Crystal", + "block.betterend.smaragdant_crystal_shard": "Smaragdant Crystal Shard", + "block.betterend.virid_jadestone": "Virid Jadestone", + "block.betterend.virid_jadestone_bricks": "Virid Jadestone Bricks", + "block.betterend.virid_jadestone_bricks_slab": "Virid Jadestone Bricks Slab", + "block.betterend.virid_jadestone_bricks_stairs": "Virid Jadestone Bricks Stairs", + "block.betterend.virid_jadestone_bricks_wall": "Virid Jadestone Bricks Wall", + "block.betterend.virid_jadestone_button": "Virid Jadestone Button", + "block.betterend.virid_jadestone_furnace": "Virid Jadestone Furnace", + "block.betterend.virid_jadestone_lantern": "Virid Jadestone Lantern", + "block.betterend.virid_jadestone_pedestal": "Virid Jadestone Pedestal", + "block.betterend.virid_jadestone_pillar": "Virid Jadestone Pillar", + "block.betterend.virid_jadestone_plate": "Virid Jadestone Pressure Plate", + "block.betterend.virid_jadestone_polished": "Virid Jadestone Polished", + "block.betterend.virid_jadestone_slab": "Virid Jadestone Slab", + "block.betterend.virid_jadestone_stairs": "Virid Jadestone Stairs", + "block.betterend.virid_jadestone_tiles": "Virid Jadestone Tiles", + "block.betterend.virid_jadestone_wall": "Virid Jadestone Wall", + "item.betterend.amber_root_raw": "Raw Amber Root", + "item.betterend.chorus_mushroom_cooked": "Cooked Chorus Mushroom", + "item.betterend.chorus_mushroom_raw": "Raw Chorus Mushroom" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 2cf2dc7b..8ff7218f 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -719,5 +719,65 @@ "block.betterend.rutiscus_path": "Тропа из рутискуса", "block.betterend.sangnum": "Сагнум", "block.betterend.sangnum_path": "Тропа из сагнума", - "block.betterend.small_amaranita_mushroom": "Маленький амаранит" + "block.betterend.small_amaranita_mushroom": "Маленький амаранит", + + "block.betterend.amber_root_seed": "Семена янтарного корня", + "block.betterend.azure_jadestone": "Лазурный нефрит", + "block.betterend.azure_jadestone_bricks": "Кирпичи из лазурного нефрита", + "block.betterend.azure_jadestone_bricks_slab": "Кирпичная плита из лазурного нефрита", + "block.betterend.azure_jadestone_bricks_stairs": "Кирпичные ступени из лазурного нефрита", + "block.betterend.azure_jadestone_bricks_wall": "Кирпичная стена из лазурного нефрита", + "block.betterend.azure_jadestone_button": "Кнопка из лазурного нефрита", + "block.betterend.azure_jadestone_furnace": "Печь из лазурного нефрита", + "block.betterend.azure_jadestone_lantern": "Фонарь из лазурного нефрита", + "block.betterend.azure_jadestone_pedestal": "Пьедестал из лазурного нефрита", + "block.betterend.azure_jadestone_pillar": "Колонна из лазурного нефрита", + "block.betterend.azure_jadestone_plate": "Нажимная плита из лазурного нефрита", + "block.betterend.azure_jadestone_polished": "Полированный лазурный нефрит", + "block.betterend.azure_jadestone_slab": "Плита из лазурного нефрита", + "block.betterend.azure_jadestone_stairs": "Ступени из лазурного нефрита", + "block.betterend.azure_jadestone_tiles": "Плитка из лазурного нефрита", + "block.betterend.azure_jadestone_wall": "Стена из лазурного нефрита", + "block.betterend.chorus_mushroom_seed": "Семена хорусового гриба", + "block.betterend.end_stone_stalactite": "Эндерняковый сталактит", + "block.betterend.end_stone_stalactite_cavemoss": "Замшелый эндерняковый сталактит", + "block.betterend.pearlberry_seed": "Семена жемчужной ягоды", + "block.betterend.rubinea": "Рубинея", + "block.betterend.sandy_jadestone": "Песчаный нефрит", + "block.betterend.sandy_jadestone_bricks": "Кирпичи из песчаного нефрита", + "block.betterend.sandy_jadestone_bricks_slab": "Кирпичная плита из песчаного нефрита", + "block.betterend.sandy_jadestone_bricks_stairs": "Кирпичные ступени из песчаного нефрита", + "block.betterend.sandy_jadestone_bricks_wall": "Кирпичная стена из песчаного нефрита", + "block.betterend.sandy_jadestone_button": "Кнопка из песчаного нефрита", + "block.betterend.sandy_jadestone_furnace": "Печь из песчаного нефрита", + "block.betterend.sandy_jadestone_lantern": "Фонарь из песчаного нефрита", + "block.betterend.sandy_jadestone_pedestal": "Пьедестал из лазурного нефрита", + "block.betterend.sandy_jadestone_pillar": "Колонна из песчаного нефрита", + "block.betterend.sandy_jadestone_plate": "Нажимная плита из песчаного нефрита", + "block.betterend.sandy_jadestone_polished": "Полированный песчаный нефрит", + "block.betterend.sandy_jadestone_slab": "Плита из песчаного нефрита", + "block.betterend.sandy_jadestone_stairs": "Ступени из песчаного нефрита", + "block.betterend.sandy_jadestone_tiles": "Плитка из песчаного нефрита", + "block.betterend.sandy_jadestone_wall": "Стена из песчаного нефрита", + "block.betterend.smaragdant_crystal": "Кристалл смарагданта", + "block.betterend.smaragdant_crystal_shard": "Осколок кристалла смарагданта", + "block.betterend.virid_jadestone": "Зелёный нефрит", + "block.betterend.virid_jadestone_bricks": "Кирпичи из зелёного нефрита", + "block.betterend.virid_jadestone_bricks_slab": "Кирпичная плита из зелёного нефрита", + "block.betterend.virid_jadestone_bricks_stairs": "Кирпичные ступени из зелёного нефрита", + "block.betterend.virid_jadestone_bricks_wall": "Кирпичная стена из зелёного нефрита", + "block.betterend.virid_jadestone_button": "Кнопка из зелёного нефрита", + "block.betterend.virid_jadestone_furnace": "Печь из зелёного нефрита", + "block.betterend.virid_jadestone_lantern": "Фонарь из зелёного нефрита", + "block.betterend.virid_jadestone_pedestal": "Пьедестал из лазурного нефрита", + "block.betterend.virid_jadestone_pillar": "Колонна из зелёного нефрита", + "block.betterend.virid_jadestone_plate": "Нажимная плита из зелёного нефрита", + "block.betterend.virid_jadestone_polished": "Полированный зелёный нефрит", + "block.betterend.virid_jadestone_slab": "Плита из зелёного нефрита", + "block.betterend.virid_jadestone_stairs": "Ступени из зелёного нефрита", + "block.betterend.virid_jadestone_tiles": "Плитка из зелёного нефрита", + "block.betterend.virid_jadestone_wall": "Стена из зелёного нефрита", + "item.betterend.amber_root_raw": "Сырой янтарный корень", + "item.betterend.chorus_mushroom_cooked": "Приготовленный хорусовый гриб", + "item.betterend.chorus_mushroom_raw": "Сырой хорусовый гриб" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_0.json b/src/main/resources/assets/betterend/models/block/amber_root_0.json new file mode 100644 index 00000000..b14bcf08 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_0.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/amber_root_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_1.json b/src/main/resources/assets/betterend/models/block/amber_root_1.json new file mode 100644 index 00000000..3e64c93c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/amber_root_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_2.json b/src/main/resources/assets/betterend/models/block/amber_root_2.json new file mode 100644 index 00000000..f8021e7a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/amber_root_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_3.json b/src/main/resources/assets/betterend/models/block/amber_root_3.json new file mode 100644 index 00000000..b542e478 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/amber_root_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_4.json b/src/main/resources/assets/betterend/models/block/amber_root_4.json new file mode 100644 index 00000000..4edf302e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/amber_root_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_5.json b/src/main/resources/assets/betterend/models/block/amber_root_5.json new file mode 100644 index 00000000..c40cb933 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_5.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/amber_root_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_6.json b/src/main/resources/assets/betterend/models/block/amber_root_6.json new file mode 100644 index 00000000..747cf5bb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_6.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/amber_root_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_root_7.json b/src/main/resources/assets/betterend/models/block/amber_root_7.json new file mode 100644 index 00000000..23144eda --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_root_7.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/amber_root_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_0.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_0.json new file mode 100644 index 00000000..aae1e0d1 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_0.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_mushroom_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_1.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_1.json new file mode 100644 index 00000000..1367615a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/chorus_mushroom_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_2.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_2.json new file mode 100644 index 00000000..ffadfcd9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_mushroom_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_3.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_3.json new file mode 100644 index 00000000..3df87588 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/chorus_mushroom_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_4.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_4.json new file mode 100644 index 00000000..f0e174e4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_mushroom_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_5.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_5.json new file mode 100644 index 00000000..d5049831 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_5.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/chorus_mushroom_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_6.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_6.json new file mode 100644 index 00000000..5b53ad87 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_6.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_mushroom_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_mushroom_7.json b/src/main/resources/assets/betterend/models/block/chorus_mushroom_7.json new file mode 100644 index 00000000..60260713 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_mushroom_7.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/chorus_mushroom_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/amber_root_seed.json b/src/main/resources/assets/betterend/models/item/amber_root_seed.json new file mode 100644 index 00000000..85d4164d --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/amber_root_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/amber_root_seed" + } +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_mushroom_seed.json b/src/main/resources/assets/betterend/models/item/chorus_mushroom_seed.json new file mode 100644 index 00000000..8f724c6b --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_mushroom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/chorus_mushroom_seed" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/amber_grass.png b/src/main/resources/assets/betterend/textures/block/amber_grass.png index aa86babf..c166e3c9 100644 Binary files a/src/main/resources/assets/betterend/textures/block/amber_grass.png and b/src/main/resources/assets/betterend/textures/block/amber_grass.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amber_root_0.png b/src/main/resources/assets/betterend/textures/block/amber_root_0.png new file mode 100644 index 00000000..3af4c596 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amber_root_0.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amber_root_1.png b/src/main/resources/assets/betterend/textures/block/amber_root_1.png new file mode 100644 index 00000000..1e597f1b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amber_root_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amber_root_2.png b/src/main/resources/assets/betterend/textures/block/amber_root_2.png new file mode 100644 index 00000000..6101e320 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amber_root_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amber_root_3.png b/src/main/resources/assets/betterend/textures/block/amber_root_3.png new file mode 100644 index 00000000..82d476f7 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amber_root_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_mushroom_0.png b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_0.png new file mode 100644 index 00000000..53543584 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_0.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_mushroom_1.png b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_1.png new file mode 100644 index 00000000..d311f780 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_mushroom_2.png b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_2.png new file mode 100644 index 00000000..6f2313fe Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_mushroom_3.png b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_3.png new file mode 100644 index 00000000..deb23ea5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_mushroom_3.png differ diff --git a/src/main/resources/assets/betterend/textures/item/amber_root_raw.png b/src/main/resources/assets/betterend/textures/item/amber_root_raw.png new file mode 100644 index 00000000..b2226f5f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/amber_root_raw.png differ diff --git a/src/main/resources/assets/betterend/textures/item/amber_root_seed.png b/src/main/resources/assets/betterend/textures/item/amber_root_seed.png new file mode 100644 index 00000000..25ce73b0 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/amber_root_seed.png differ diff --git a/src/main/resources/assets/betterend/textures/item/chorus_mushroom_cooked.png b/src/main/resources/assets/betterend/textures/item/chorus_mushroom_cooked.png new file mode 100644 index 00000000..2f55abb4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/chorus_mushroom_cooked.png differ diff --git a/src/main/resources/assets/betterend/textures/item/chorus_mushroom_raw.png b/src/main/resources/assets/betterend/textures/item/chorus_mushroom_raw.png new file mode 100644 index 00000000..25450dd5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/chorus_mushroom_raw.png differ diff --git a/src/main/resources/assets/betterend/textures/item/chorus_mushroom_seed.png b/src/main/resources/assets/betterend/textures/item/chorus_mushroom_seed.png new file mode 100644 index 00000000..b1fa828d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/chorus_mushroom_seed.png differ