MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes, lang

Browse source
This commit is contained in:
paulevsGitch 2020-11-27 00:15:26 +03:00
parent 5d27c8df9a
commit d750b35dc4
4 changed files with 58 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java
View file

@ -4,21 +4,30 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.Material;
import net.minecraft.block.MaterialColor;
import net.minecraft.block.ShapeContext;
import net.minecraft.block.Waterloggable;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.BooleanProperty;
import net.minecraft.state.property.Properties;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.BlockView;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.WorldView;
import ru.betterend.blocks.basis.BlockBaseNotFull;
import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable;
public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTypeable {
public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTypeable, Waterloggable {
private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(4, 4, 4, 12, 16, 12);
public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;
public BlockBulbVineLantern() {
super(FabricBlockSettings.of(Material.METAL)
@ -31,6 +40,22 @@ public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTyp
.luminance(15));
}
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> stateManager) {
stateManager.add(WATERLOGGED);
}
@Override
public BlockState getPlacementState(ItemPlacementContext ctx) {
WorldView worldView = ctx.getWorld();
BlockPos blockPos = ctx.getBlockPos();
if (sideCoversSmallSquare(worldView, blockPos.up(), Direction.DOWN)) {
boolean water = worldView.getFluidState(blockPos).getFluid() == Fluids.WATER;
return getDefaultState().with(WATERLOGGED, water);
}
return null;
}
@Override
public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
return sideCoversSmallSquare(world, pos.up(), Direction.DOWN);
@ -45,4 +70,18 @@ public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTyp
public ERenderLayer getRenderLayer() {
return ERenderLayer.CUTOUT;
}
@Override
public BlockState getStateForNeighborUpdate(BlockState state, Direction facing, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) {
Boolean water = state.get(WATERLOGGED);
if (water) {
world.getFluidTickScheduler().schedule(pos, Fluids.WATER, Fluids.WATER.getTickRate(world));
}
if (!canPlaceAt(state, world, pos)) {
return water ? Blocks.WATER.getDefaultState() : Blocks.AIR.getDefaultState();
}
else {
return state;
}
}
}

7
src/main/resources/assets/betterend/lang/en_us.json
View file

@ -338,5 +338,10 @@
"block.betterend.pink_moss": "Pink Moss",
"block.betterend.pink_moss_path": "Pink Moss Path",
"block.betterend.twisted_moss": "Twisted Moss"
"block.betterend.twisted_moss": "Twisted Moss",
"block.betterend.bulb_vine": "Bulb Vine",
"block.betterend.bulb_vine_lantern": "Bulb Vine Lantern",
"block.betterend.bulb_vine_seed": "Bulb Vine Seed",
"item.betterend.glowing_bulb": "Glowing Bulb"
}

7
src/main/resources/assets/betterend/lang/ru_ru.json
View file

@ -340,5 +340,10 @@
"block.betterend.pink_moss": "Розовый мох",
"block.betterend.pink_moss_path": "Тропа из розового мха",
"block.betterend.twisted_moss": "Закрученный мох"
"block.betterend.twisted_moss": "Закрученный мох",
"block.betterend.bulb_vine": "Луковичная лоза",
"block.betterend.bulb_vine_lantern": "Фонарь из светящейся луковицы",
"block.betterend.bulb_vine_seed": "Семя луковичной лозы",
"item.betterend.glowing_bulb": "Светящаяся луковица"
}

6
src/main/resources/assets/betterend/models/item/bulb_vine.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:block/bulb_vine_middle"
}
}