diff --git a/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java b/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java index bd7264eb..c6e5d493 100644 --- a/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java +++ b/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java @@ -1,9 +1,14 @@ package ru.betterend.blocks; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; import ru.betterend.blocks.BlockProperties.TripleShape; import ru.betterend.blocks.basis.UpDownPlantBlock; import ru.betterend.registry.EndBlocks; @@ -20,4 +25,10 @@ public class GlowingPillarRootsBlock extends UpDownPlantBlock { protected boolean isTerrain(BlockState state) { return state.isOf(EndBlocks.AMBER_MOSS); } + + @Override + @Environment(EnvType.CLIENT) + public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) { + return new ItemStack(EndBlocks.GLOWING_PILLAR_SEED); + } } diff --git a/src/main/java/ru/betterend/blocks/LumecornBlock.java b/src/main/java/ru/betterend/blocks/LumecornBlock.java index 0011b4ce..c29c2c95 100644 --- a/src/main/java/ru/betterend/blocks/LumecornBlock.java +++ b/src/main/java/ru/betterend/blocks/LumecornBlock.java @@ -3,6 +3,8 @@ package ru.betterend.blocks; import java.util.Collections; import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; @@ -100,4 +102,14 @@ public class LumecornBlock extends BlockBaseNotFull implements IRenderTypeable { return Collections.emptyList(); } } + + @Override + @Environment(EnvType.CLIENT) + public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) { + LumecornShape shape = state.get(SHAPE); + if (shape == LumecornShape.BOTTOM_BIG || shape == LumecornShape.BOTTOM_SMALL || shape == LumecornShape.MIDDLE) { + return new ItemStack(EndBlocks.LUMECORN_SEED); + } + return new ItemStack(EndItems.LUMECORN_ROD); + } } diff --git a/src/main/resources/assets/betterend/materialmaps/block/eternal_pedestal.json b/src/main/resources/assets/betterend/materialmaps/block/eternal_pedestal.json new file mode 100644 index 00000000..5d23c84f --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/eternal_pedestal.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_purple" +} diff --git a/src/main/resources/assets/betterend/patterns/block/furnace.json b/src/main/resources/assets/betterend/patterns/block/furnace.json index accba1f5..be5bece7 100644 --- a/src/main/resources/assets/betterend/patterns/block/furnace.json +++ b/src/main/resources/assets/betterend/patterns/block/furnace.json @@ -4,6 +4,6 @@ "top": "betterend:block/%top%", "front": "betterend:block/%front%", "side": "betterend:block/%side%", - "bottom": "betterend:block/%bottom%" + "bottom": "betterend:block/%top%" } } diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_fron_on.png.mcmeta b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_fron_on.png.mcmeta new file mode 100644 index 00000000..98b9ae71 --- /dev/null +++ b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_fron_on.png.mcmeta @@ -0,0 +1,12 @@ +{ + "animation": { + "interpolate": true, + "frametime": 8, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front.png new file mode 100644 index 00000000..21056757 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front_on.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front_on.png new file mode 100644 index 00000000..57455f26 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front_on.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_side.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_side.png new file mode 100644 index 00000000..1b99c12f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_top.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_top.png new file mode 100644 index 00000000..fb000c3a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_top.png differ