Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add concrete with bars functionality and other minor improvements

Browse source
This commit is contained in:
Andrew-71 2023-09-29 13:18:16 +03:00
parent 55c1976583
commit c1d7208ae8
15 changed files with 212 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/java/su/a71/new_soviet/NewSovietClient.java
View file

@ -21,12 +21,18 @@ public class NewSovietClient implements ClientModInitializer {
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.VINTAGE_LAMP, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.VINTAGE_LAMP, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CEILING_FAN, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CEILING_FAN, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.SIREN, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.SIREN, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CAGED_POST_LAMP, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CAGED_POST_LAMP, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.MODERN_POST_LAMP, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.MODERN_POST_LAMP, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.BIG_POST_LAMP, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.BIG_POST_LAMP, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.VINTAGE_POST_LAMP, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.VINTAGE_POST_LAMP, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.RED_CONCRETE_WITH_BARS, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.GREEN_CONCRETE_WITH_BARS, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.WHITE_CONCRETE_WITH_BARS, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BEIGE_CONCRETE_WITH_BARS, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.YELLOW_CONCRETE_WITH_BARS, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLUE_CONCRETE_WITH_BARS, RenderLayer.getCutout());
BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new); BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new);
} }
} }

59
src/main/java/su/a71/new_soviet/blocks/ConcreteWithBarsBlock.java
View file

@ -1,26 +1,71 @@
package su.a71.new_soviet.blocks; package su.a71.new_soviet.blocks;
import net.minecraft.block.Block; import net.minecraft.block.*;
import net.minecraft.block.BlockState; import net.minecraft.block.enums.Thickness;
import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.entity.Entity;
import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemPlacementContext;
import net.minecraft.state.StateManager; import net.minecraft.state.StateManager;
import net.minecraft.state.property.BooleanProperty;
import net.minecraft.state.property.DirectionProperty;
import net.minecraft.state.property.Properties; import net.minecraft.state.property.Properties;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.WorldView;
import org.jetbrains.annotations.Nullable;
public class ConcreteWithBarsBlock extends HorizontalFacingBlock implements Waterloggable {
public static final DirectionProperty VERTICAL_DIRECTION;
public static final BooleanProperty WATERLOGGED;
public class ConcreteWithBarsBlock extends HorizontalFacingBlock {
public ConcreteWithBarsBlock(Settings settings) { public ConcreteWithBarsBlock(Settings settings) {
super(settings); super(settings);
setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH)); setDefaultState(getDefaultState()
.with(Properties.HORIZONTAL_FACING, Direction.NORTH)
.with(VERTICAL_DIRECTION, Direction.UP)
.with(WATERLOGGED, false));
} }
@Override @Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) { protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
builder.add(Properties.HORIZONTAL_FACING); builder.add(Properties.HORIZONTAL_FACING, VERTICAL_DIRECTION, WATERLOGGED);
} }
@Override @Override
public BlockState getPlacementState(ItemPlacementContext ctx) { public BlockState getPlacementState(ItemPlacementContext ctx) {
return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()); FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos());
return super.getPlacementState(ctx)
.with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite())
.with(VERTICAL_DIRECTION, ctx.getVerticalPlayerLookDirection().getOpposite())
.with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
}
public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
if (state.get(VERTICAL_DIRECTION) == Direction.UP) {
entity.handleFallDamage(fallDistance + 2.0F, 2.0F, world.getDamageSources().stalagmite());
} else {
super.onLandedUpon(world, state, pos, entity, fallDistance);
}
}
@Override
public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) {
if (state.get(WATERLOGGED)) {
world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world));
}
return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos);
}
public FluidState getFluidState(BlockState state) {
return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
}
static {
VERTICAL_DIRECTION = Properties.VERTICAL_DIRECTION;
WATERLOGGED = Properties.WATERLOGGED;
} }
} }

28
src/main/java/su/a71/new_soviet/blocks/LandMineBlock.java
View file

@ -30,6 +30,7 @@ import su.a71.new_soviet.NewSoviet;
public class LandMineBlock extends HorizontalFacingBlock implements Waterloggable { public class LandMineBlock extends HorizontalFacingBlock implements Waterloggable {
public static final BooleanProperty WATERLOGGED; public static final BooleanProperty WATERLOGGED;
protected static final VoxelShape SHAPE; protected static final VoxelShape SHAPE;
public float explosion_power = 4.0f;
public LandMineBlock(Settings settings) { public LandMineBlock(Settings settings) {
super(settings); super(settings);
@ -69,34 +70,34 @@ public class LandMineBlock extends HorizontalFacingBlock implements Waterloggabl
} }
} }
// We would have a 25% chance of explosion on break with a shovel, but I can't implement brushing yet. // 20% chance of explosion on break without a shovel
public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
// if (!world.isClient() && !player.isCreative() && !(player.getHandItems().iterator().next().getItem() instanceof ShovelItem)) { if (!world.isClient() && !player.isCreative() && !(player.getHandItems().iterator().next().getItem() instanceof ShovelItem)) {
// if (NewSoviet.RANDOM.nextBetween(1, 4) != 1) { if (NewSoviet.RANDOM.nextBetween(1, 5) == 1) {
// explode(world, pos); explode(world, pos);
// } }
// } }
super.onBreak(world, pos, state, player); super.onBreak(world, pos, state, player);
} }
// Only chain explode every 2/3rd of times to nerf instant long range explosions // Only chain explode every 20% of times to prevent instant&long explosion chains
@Override @Override
public void onDestroyedByExplosion(World world, BlockPos pos, Explosion explosion) { public void onDestroyedByExplosion(World world, BlockPos pos, Explosion explosion) {
if (!world.isClient) { if (!world.isClient) {
int chance = NewSoviet.RANDOM.nextBetween(0, 2); int chance = NewSoviet.RANDOM.nextBetween(1, 5);
if (chance != 0) { if (chance == 1) {
explode(world, pos); explode(world, pos);
} }
} }
super.onDestroyedByExplosion(world, pos, explosion); super.onDestroyedByExplosion(world, pos, explosion);
} }
// Without a shovel, 80% chance of explosion on breaking start // Without a shovel, 5% chance of explosion on breaking start
@Override @Override
public void onBlockBreakStart(BlockState state, World world, BlockPos pos, PlayerEntity player) { public void onBlockBreakStart(BlockState state, World world, BlockPos pos, PlayerEntity player) {
if (!world.isClient() && !(player.getHandItems().iterator().next().getItem() instanceof ShovelItem)) if (!world.isClient() && !(player.getHandItems().iterator().next().getItem() instanceof ShovelItem))
{ {
if (NewSoviet.RANDOM.nextBetween(1, 10) < 2) { if (NewSoviet.RANDOM.nextBetween(1, 100) < 5) {
explode(world, pos); explode(world, pos);
} }
} }
@ -114,8 +115,7 @@ public class LandMineBlock extends HorizontalFacingBlock implements Waterloggabl
public void explode(World world, BlockPos pos) { public void explode(World world, BlockPos pos) {
if (world.isClient()) return; if (world.isClient()) return;
world.removeBlock(pos, false); world.removeBlock(pos, false);
float f = 4.0F; world.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), explosion_power, World.ExplosionSourceType.TNT);
world.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.0F, World.ExplosionSourceType.TNT);
} }
@Nullable @Nullable
@ -152,8 +152,6 @@ public class LandMineBlock extends HorizontalFacingBlock implements Waterloggabl
static { static {
SHAPE = Block.createCuboidShape(4, 0, 4, 12, 4, 12); // VoxelShapes.cuboid(0.4, 0, 0.4, 0.6, 0.3, 0.6); // SHAPE = Block.createCuboidShape(4, 0, 4, 12, 4, 12); // VoxelShapes.cuboid(0.4, 0, 0.4, 0.6, 0.3, 0.6); //
// SHAPE = Block.createCuboidShape(5, 0, 5, 11, 3, 11); // VoxelShapes.cuboid(0.4, 0, 0.4, 0.6, 0.3, 0.6); //
WATERLOGGED = Properties.WATERLOGGED; WATERLOGGED = Properties.WATERLOGGED;
} }
} }

12
src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/beige_concrete_with_bars", "uvlock": true }, "facing=north,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "uvlock": false },
"facing=east": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 90, "uvlock": false }, "facing=east,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 180, "uvlock": false }, "facing=south,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 270, "uvlock": false } "facing=west,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
} }
} }

12
src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/blue_concrete_with_bars", "uvlock": true }, "facing=north,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "uvlock": false },
"facing=east": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 90, "uvlock": false }, "facing=east,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 180, "uvlock": false }, "facing=south,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 270, "uvlock": false } "facing=west,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
} }
} }

12
src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/green_concrete_with_bars", "uvlock": true }, "facing=north,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "uvlock": false },
"facing=east": { "model": "new_soviet:block/green_concrete_with_bars", "y": 90, "uvlock": false }, "facing=east,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/green_concrete_with_bars", "y": 180, "uvlock": false }, "facing=south,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/green_concrete_with_bars", "y": 270, "uvlock": false } "facing=west,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
} }
} }

12
src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/red_concrete_with_bars", "uvlock": true }, "facing=north,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "uvlock": false },
"facing=east": { "model": "new_soviet:block/red_concrete_with_bars", "y": 90, "uvlock": false }, "facing=east,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/red_concrete_with_bars", "y": 180, "uvlock": false }, "facing=south,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/red_concrete_with_bars", "y": 270, "uvlock": false } "facing=west,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
} }
} }

12
src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/white_concrete_with_bars", "uvlock": true }, "facing=north,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "uvlock": false },
"facing=east": { "model": "new_soviet:block/white_concrete_with_bars", "y": 90, "uvlock": false }, "facing=east,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/white_concrete_with_bars", "y": 180, "uvlock": false }, "facing=south,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/white_concrete_with_bars", "y": 270, "uvlock": false } "facing=west,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
} }
} }

12
src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/yellow_concrete_with_bars", "uvlock": true }, "facing=north,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "uvlock": false },
"facing=east": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 90, "uvlock": false }, "facing=east,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 180, "uvlock": false }, "facing=south,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 270, "uvlock": false } "facing=west,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
} }
} }

8
src/main/resources/assets/new_soviet/models/block/golden_table_lamp.json
View file

@ -241,12 +241,17 @@
} }
} }
], ],
"display": {
"gui": {
"rotation": [30, 225, 0],
"translation": [-0.5, 1.5, 0]
}
},
"groups": [ "groups": [
{ {
"name": "group", "name": "group",
"origin": [8, 0, 8], "origin": [8, 0, 8],
"color": 0, "color": 0,
"nbt": "{}",
"children": [ "children": [
0, 0,
1, 1,
@ -261,7 +266,6 @@
"name": "group", "name": "group",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0, "color": 0,
"nbt": "{}",
"children": [9, 10, 11, 12, 13, 14, 15, 16, 17] "children": [9, 10, 11, 12, 13, 14, 15, 16, 17]
} }
] ]

37
src/main/resources/assets/new_soviet/models/block/lamp_post.json
View file

@ -112,42 +112,24 @@
], ],
"display": { "display": {
"thirdperson_righthand": { "thirdperson_righthand": {
"rotation": [75, 45, 0], "translation": [0, 3, 1],
"translation": [0, -0.5, 0], "scale": [0.55, 0.55, 0.55]
"scale": [0.375, 0.375, 0.375]
}, },
"thirdperson_lefthand": { "thirdperson_lefthand": {
"rotation": [75, 45, 0], "translation": [0, 3, 1],
"translation": [0, -0.5, 0], "scale": [0.55, 0.55, 0.55]
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
}, },
"ground": { "ground": {
"translation": [0, -1.75, 0], "translation": [0, 2, 0],
"scale": [0.25, 0.25, 0.25] "scale": [0.5, 0.5, 0.5]
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"translation": [-2.5, 1.5, 0], "translation": [-3.5, 1, 0],
"scale": [0.625, 0.625, 0.625] "scale": [0.8, 0.8, 0.8]
}, },
"head": { "head": {
"rotation": [85, -180, 90], "translation": [0, 11, 0]
"translation": [-7, 22.5, 8]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
} }
}, },
"groups": [ "groups": [
@ -155,7 +137,6 @@
"name": "group", "name": "group",
"origin": [0, 0, 0], "origin": [0, 0, 0],
"color": 0, "color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3, 4, 5] "children": [0, 1, 2, 3, 4, 5]
}, },
6, 6,

37
src/main/resources/assets/new_soviet/models/block/lamp_post_2.json
View file

@ -91,42 +91,24 @@
], ],
"display": { "display": {
"thirdperson_righthand": { "thirdperson_righthand": {
"rotation": [75, 45, 0], "translation": [0, 3, 1],
"translation": [0, -0.5, 0], "scale": [0.55, 0.55, 0.55]
"scale": [0.375, 0.375, 0.375]
}, },
"thirdperson_lefthand": { "thirdperson_lefthand": {
"rotation": [75, 45, 0], "translation": [0, 3, 1],
"translation": [0, -0.5, 0], "scale": [0.55, 0.55, 0.55]
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
}, },
"ground": { "ground": {
"translation": [0, -1, 0], "translation": [0, 2, 0],
"scale": [0.25, 0.25, 0.25] "scale": [0.5, 0.5, 0.5]
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"translation": [-2.5, 1.5, 0], "translation": [-3.5, 1, 0],
"scale": [0.625, 0.625, 0.625] "scale": [0.8, 0.8, 0.8]
}, },
"head": { "head": {
"rotation": [75, -180, 90], "translation": [0, 11, 0]
"translation": [-7, 22.5, 8]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
} }
}, },
"groups": [ "groups": [
@ -134,7 +116,6 @@
"name": "group", "name": "group",
"origin": [0, 0, 0], "origin": [0, 0, 0],
"color": 0, "color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3] "children": [0, 1, 2, 3]
}, },
4, 4,

36
src/main/resources/assets/new_soviet/models/block/lamp_post_3.json
View file

@ -63,41 +63,24 @@
], ],
"display": { "display": {
"thirdperson_righthand": { "thirdperson_righthand": {
"rotation": [75, 45, 0], "translation": [0, 3, 1],
"translation": [0, 1, 0], "scale": [0.55, 0.55, 0.55]
"scale": [0.375, 0.375, 0.375]
}, },
"thirdperson_lefthand": { "thirdperson_lefthand": {
"rotation": [75, 45, 0], "translation": [0, 3, 1],
"translation": [0, 1, 0], "scale": [0.55, 0.55, 0.55]
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
}, },
"ground": { "ground": {
"translation": [0, -2, 0], "translation": [0, 2, 0],
"scale": [0.25, 0.25, 0.25] "scale": [0.5, 0.5, 0.5]
}, },
"gui": { "gui": {
"rotation": [30, 225, 0], "rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625] "translation": [0, -1, 0],
"scale": [0.8, 0.8, 0.8]
}, },
"head": { "head": {
"rotation": [-90, -180, 0], "translation": [0, 11, 0]
"translation": [-7, 22.5, 14.5]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
} }
}, },
"groups": [ "groups": [
@ -105,7 +88,6 @@
"name": "group", "name": "group",
"origin": [0, 0, 0], "origin": [0, 0, 0],
"color": 0, "color": 0,
"nbt": "{}",
"children": [0, 1, 2] "children": [0, 1, 2]
}, },
3, 3,

24
src/main/resources/assets/new_soviet/models/block/lamp_post_4.json
View file

@ -85,12 +85,33 @@
} }
} }
], ],
"display": {
"thirdperson_righthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"thirdperson_lefthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [-3.5, 1, 0],
"scale": [0.8, 0.8, 0.8]
},
"head": {
"translation": [0, 11, 0]
}
},
"groups": [ "groups": [
{ {
"name": "group", "name": "group",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0, "color": 0,
"nbt": "{}",
"children": [ "children": [
0, 0,
1, 1,
@ -101,7 +122,6 @@
"name": "group", "name": "group",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0, "color": 0,
"nbt": "{}",
"children": [5, 6] "children": [5, 6]
} }
] ]

33
src/main/resources/assets/new_soviet/models/block/vintage_lamp.json
View file

@ -77,12 +77,43 @@
} }
} }
], ],
"display": {
"thirdperson_righthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"thirdperson_lefthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"firstperson_righthand": {
"rotation": [0, -90, 25],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"firstperson_lefthand": {
"rotation": [0, -90, 25],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0, -1, 0],
"scale": [0.7, 0.7, 0.7]
},
"fixed": {
"rotation": [0, 180, 0]
}
},
"groups": [ "groups": [
{ {
"name": "head", "name": "head",
"origin": [8, 16, 8], "origin": [8, 16, 8],
"color": 0, "color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3, 4] "children": [0, 1, 2, 3, 4]
} }
] ]