Re-work TVs

This commit is contained in:
Andrew-71 2023-10-19 00:21:45 +03:00
parent 3f6d2f2be5
commit 24e07523da
54 changed files with 610 additions and 183 deletions

View file

@ -1,7 +1,12 @@
0.1 -> 0.2 0.1 -> 0.2
* Added new dirt path block - till coarse dirt with a rake * Added new "Dirt Road" block
* Made by tilling coarse dirt with a rake
* Behaves like gravel
* Added golden lamp crafting recipe * Added golden lamp crafting recipe
* Improved TVs
Changed some models to more original ones * Re-made textures and models
* TV * Added white noise animation if TV is powered with redstone
* Radio * Added cracked screen if TV is hit with a snowball
* TVs can now be waterlogged
* Re-made Radio texure and model to make it fit the USSR aesthetic more
* Several tiny fixes

View file

@ -40,6 +40,8 @@ public class NewSovietClient implements ClientModInitializer {
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLUE_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);
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.TV, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RADIO_RECEIVER, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RADIO_RECEIVER, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.WHITE_BOUNDARY_MARKER, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.WHITE_BOUNDARY_MARKER, RenderLayer.getCutout());

View file

@ -3,32 +3,51 @@ package su.a71.new_soviet.blocks;
import net.minecraft.block.*; import net.minecraft.block.*;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.piston.PistonBehavior; import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.entity.projectile.ProjectileEntity;
import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemPlacementContext;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundCategory;
import net.minecraft.state.StateManager; import net.minecraft.state.StateManager;
import net.minecraft.state.property.BooleanProperty;
import net.minecraft.state.property.Properties; import net.minecraft.state.property.Properties;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.math.random.Random;
import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes; import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView; import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import su.a71.new_soviet.entities.TVBlockEntity; import su.a71.new_soviet.entities.TVBlockEntity;
import su.a71.new_soviet.registration.NSE_Sounds;
import su.a71.new_soviet.util.Shapes; import su.a71.new_soviet.util.Shapes;
import java.util.List; import java.util.List;
public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvider { public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvider, Waterloggable {
protected static final Shapes.HorizontalShapeLegacy SHAPE; protected static final Shapes.HorizontalShapeLegacy SHAPE;
public static final BooleanProperty BROKEN;
public static final BooleanProperty ON;
public static final BooleanProperty WATERLOGGED;
public TVBlock(AbstractBlock.Settings settings) { public TVBlock(AbstractBlock.Settings settings) {
super(settings.sounds(BlockSoundGroup.METAL).pistonBehavior(PistonBehavior.BLOCK).strength(1f, 2f)); super(settings.sounds(BlockSoundGroup.METAL).pistonBehavior(PistonBehavior.BLOCK).strength(1f, 2f));
setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH)); setDefaultState(getDefaultState()
.with(Properties.HORIZONTAL_FACING, Direction.NORTH)
.with(WATERLOGGED, false)
.with(ON, 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, WATERLOGGED, ON, BROKEN);
} }
@Override @Override
@ -44,7 +63,33 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide
@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(WATERLOGGED, fluidState.getFluid() == Fluids.WATER)
.with(ON, ctx.getWorld().isReceivingRedstonePower(ctx.getBlockPos()))
.with(BROKEN, false);
}
@Override
public void onProjectileHit(World world, BlockState state, BlockHitResult hit, ProjectileEntity projectile) {
if (!state.get(BROKEN)) {
world.playSound(null, hit.getBlockPos().getX(), hit.getBlockPos().getY(), hit.getBlockPos().getZ(), NSE_Sounds.LIGHT_BULB_BROKEN_SOUND, SoundCategory.BLOCKS, 0.8f, 1f);
}
world.setBlockState(hit.getBlockPos(), state.with(BROKEN, true), 2);
super.onProjectileHit(world, state, hit, projectile);
}
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 !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos);
}
public FluidState getFluidState(BlockState state) {
return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
} }
@Override @Override
@ -52,7 +97,29 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide
return new TVBlockEntity(pos, state); return new TVBlockEntity(pos, state);
} }
public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
if (state.get(ON) && !world.isReceivingRedstonePower(pos)) {
world.setBlockState(pos, state.cycle(ON), 2);
}
}
public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
if (!world.isClient) {
boolean bl = state.get(ON);
if (bl != world.isReceivingRedstonePower(pos)) {
if (bl) {
world.scheduleBlockTick(pos, this, 4);
} else {
world.setBlockState(pos, state.cycle(ON), 2);
}
}
}
}
static { static {
SHAPE = new Shapes.HorizontalShapeLegacy(List.of(List.of(0.0, 1.0, 3.0, 16.0, 13.0, 13.0), List.of(2.0, 0.0, 4.0, 14.0, 1.0, 12.0), List.of(6.0, 13.0, 7.0, 10.0, 14.0, 9.0))); SHAPE = new Shapes.HorizontalShapeLegacy(List.of(List.of(0.0, 0.0, 2.0, 16.0, 13.0, 13.0), List.of(6.0, 13.0, 7.0, 10.0, 13.5, 9.0)));
ON = RedstoneTorchBlock.LIT;
WATERLOGGED = Properties.WATERLOGGED;
BROKEN = Properties.CRACKED;
} }
} }

View file

@ -77,7 +77,7 @@ public class LightBulbLampBlock extends LampBlock {
@Override @Override
public void onProjectileHit(World world, BlockState state, BlockHitResult hit, ProjectileEntity projectile) { public void onProjectileHit(World world, BlockState state, BlockHitResult hit, ProjectileEntity projectile) {
if (!state.get(BROKEN)) { if (!state.get(BROKEN)) {
world.playSound(null, hit.getBlockPos().getX(), hit.getBlockPos().getY(), hit.getBlockPos().getZ(), NSE_Sounds.LIGHT_BULB_BROKEN_SOUND, SoundCategory.NEUTRAL, 0.8f, 1f); world.playSound(null, hit.getBlockPos().getX(), hit.getBlockPos().getY(), hit.getBlockPos().getZ(), NSE_Sounds.LIGHT_BULB_BROKEN_SOUND, SoundCategory.BLOCKS, 0.8f, 1f);
} }
world.setBlockState(hit.getBlockPos(), state.with(BROKEN, true), 2); world.setBlockState(hit.getBlockPos(), state.with(BROKEN, true), 2);
super.onProjectileHit(world, state, hit, projectile); super.onProjectileHit(world, state, hit, projectile);

View file

@ -1,8 +1,71 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/brown_tv", "uvlock": true }, "facing=north,lit=false,cracked=false": {
"facing=east": { "model": "new_soviet:block/brown_tv", "y": 90, "uvlock": false }, "model": "new_soviet:block/tv/brown_tv", "uvlock": true
"facing=south": { "model": "new_soviet:block/brown_tv", "y": 180, "uvlock": false }, },
"facing=west": { "model": "new_soviet:block/brown_tv", "y": 270, "uvlock": false } "facing=north,lit=true,cracked=false": {
"model": "new_soviet:block/tv/brown_tv_on", "uvlock": true
},
"facing=north,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/brown_tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "uvlock": true
}
],
"facing=east,lit=false,cracked=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1","y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2","y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3","y": 90, "uvlock": false
}
],
"facing=south,lit=false,cracked=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3","y": 180, "uvlock": false
}
],
"facing=west,lit=false,cracked=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3","y": 270, "uvlock": false
}
]
} }
} }

View file

@ -1,8 +1,71 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/red_tv", "uvlock": true }, "facing=north,lit=false,cracked=false": {
"facing=east": { "model": "new_soviet:block/red_tv", "y": 90, "uvlock": false }, "model": "new_soviet:block/tv/red_tv", "uvlock": true
"facing=south": { "model": "new_soviet:block/red_tv", "y": 180, "uvlock": false }, },
"facing=west": { "model": "new_soviet:block/red_tv", "y": 270, "uvlock": false } "facing=north,lit=true,cracked=false": {
"model": "new_soviet:block/tv/red_tv_on", "uvlock": true
},
"facing=north,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/red_tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/red_tv_broken3", "uvlock": true
}
],
"facing=east,lit=false,cracked=false": {
"model": "new_soviet:block/tv/red_tv", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1","y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2","y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3","y": 90, "uvlock": false
}
],
"facing=south,lit=false,cracked=false": {
"model": "new_soviet:block/tv/red_tv", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3","y": 180, "uvlock": false
}
],
"facing=west,lit=false,cracked=false": {
"model": "new_soviet:block/tv/red_tv", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3","y": 270, "uvlock": false
}
]
} }
} }

View file

@ -1,8 +1,71 @@
{ {
"variants": { "variants": {
"facing=north": { "model": "new_soviet:block/tv", "uvlock": true }, "facing=north,lit=false,cracked=false": {
"facing=east": { "model": "new_soviet:block/tv", "y": 90, "uvlock": false }, "model": "new_soviet:block/tv/tv", "uvlock": true
"facing=south": { "model": "new_soviet:block/tv", "y": 180, "uvlock": false }, },
"facing=west": { "model": "new_soviet:block/tv", "y": 270, "uvlock": false } "facing=north,lit=true,cracked=false": {
"model": "new_soviet:block/tv/tv_on", "uvlock": true
},
"facing=north,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/tv_broken3", "uvlock": true
}
],
"facing=east,lit=false,cracked=false": {
"model": "new_soviet:block/tv/tv", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false": {
"model": "new_soviet:block/tv/tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1","y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2","y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3","y": 90, "uvlock": false
}
],
"facing=south,lit=false,cracked=false": {
"model": "new_soviet:block/tv/tv", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false": {
"model": "new_soviet:block/tv/tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3","y": 180, "uvlock": false
}
],
"facing=west,lit=false,cracked=false": {
"model": "new_soviet:block/tv/tv", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false": {
"model": "new_soviet:block/tv/tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3","y": 270, "uvlock": false
}
]
} }
} }

View file

@ -1,7 +0,0 @@
{
"parent": "new_soviet:block/tv",
"textures": {
"0": "new_soviet:block/custom/electronics/brown_television",
"particle": "new_soviet:block/custom/electronics/brown_television_particle"
}
}

View file

@ -1,7 +0,0 @@
{
"parent": "new_soviet:block/tv",
"textures": {
"0": "new_soviet:block/custom/electronics/red_television",
"particle": "new_soviet:block/custom/electronics/red_television_particle"
}
}

View file

@ -1,143 +0,0 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "new_soviet:block/custom/electronics/television",
"particle": "new_soviet:block/custom/electronics/television_particle"
},
"elements": [
{
"name": "root",
"from": [2, 0, 4],
"to": [14, 1, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [2, 7.5, 5, 7.75], "texture": "#0"},
"east": {"uv": [0, 7.5, 2, 7.75], "texture": "#0"},
"south": {"uv": [7, 7.5, 10, 7.75], "texture": "#0"},
"west": {"uv": [5, 7.5, 7, 7.75], "texture": "#0"},
"up": {"uv": [5, 7.5, 2, 5.5], "texture": "#0"},
"down": {"uv": [8, 5.5, 5, 7.5], "texture": "#0"}
}
},
{
"name": "root",
"from": [0, 1, 3],
"to": [16, 13, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [2.5, 2.5, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 2.5, 2.5, 5.5], "texture": "#0"},
"south": {"uv": [9, 2.5, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 2.5, 9, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 2.5, 2.5, 0], "texture": "#0"},
"down": {"uv": [10.5, 0, 6.5, 2.5], "texture": "#0"}
}
},
{
"name": "root",
"from": [6, 13, 7],
"to": [10, 14, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0.5, 8.25, 1.5, 8.5], "texture": "#0"},
"east": {"uv": [0, 8.25, 0.5, 8.5], "texture": "#0"},
"south": {"uv": [2, 8.25, 3, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8.25, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8.25, 0.5, 7.75], "texture": "#0"},
"down": {"uv": [2.5, 7.75, 1.5, 8.25], "texture": "#0"}
}
},
{
"name": "aerial1",
"from": [8, 14, 8],
"to": [9, 23, 8],
"rotation": {"angle": -45, "axis": "z", "origin": [8, 14, 8]},
"faces": {
"north": {"uv": [0, 0, 0.25, 2.25], "texture": "#0"},
"east": {"uv": [0, 0, 0, 2.25], "texture": "#0"},
"south": {"uv": [0, 0, 0.25, 2.25], "texture": "#0"},
"west": {"uv": [0.25, 0, 0.25, 2.25], "texture": "#0"},
"up": {"uv": [0.25, 0, 0, 0], "texture": "#0"},
"down": {"uv": [0.5, 0, 0.25, 0], "texture": "#0"}
}
},
{
"name": "aerial2",
"from": [7, 14, 8],
"to": [8, 21, 8],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 14, 8]},
"faces": {
"north": {"uv": [0.5, 0, 0.75, 1.75], "texture": "#0"},
"east": {"uv": [0.5, 0, 0.5, 1.75], "texture": "#0"},
"south": {"uv": [0.5, 0, 0.75, 1.75], "texture": "#0"},
"west": {"uv": [0.75, 0, 0.75, 1.75], "texture": "#0"},
"up": {"uv": [0.75, 0, 0.5, 0], "texture": "#0"},
"down": {"uv": [1, 0, 0.75, 0], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [0, 180, 0],
"translation": [0, 1, -1.75],
"scale": [0.4, 0.4, 0.4]
},
"thirdperson_lefthand": {
"rotation": [0, 180, 0],
"translation": [0, 1, -1.75],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_righthand": {
"rotation": [0, 180, 0],
"translation": [1.75, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [0, 180, 0],
"translation": [1.75, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"scale": [0.4, 0.4, 0.4]
},
"gui": {
"rotation": [0, -135, 0],
"translation": [0, -1.5, 0],
"scale": [0.75, 0.75, 0.75]
},
"head": {
"scale": [1.5, 1.5, 1.5]
},
"fixed": {
"translation": [0, 0, -0.25]
}
},
"groups": [
{
"name": "root",
"origin": [0, 0, 0],
"color": 0,
"nbt": "{}",
"children": [
0,
1,
2,
{
"name": "aerial1",
"origin": [0, 14, 0],
"color": 1,
"nbt": "{}",
"children": [3]
},
{
"name": "aerial2",
"origin": [0, 14, 0],
"color": 2,
"nbt": "{}",
"children": [4]
}
]
}
]
}

View file

@ -0,0 +1,9 @@
{
"parent": "new_soviet:block/tv/tv",
"textures": {
"0": "new_soviet:block/custom/electronics/tv/brown_tv",
"1": "new_soviet:block/custom/electronics/tv/tv_screen_normal",
"2": "new_soviet:block/custom/electronics/tv/carpets/carpet_null",
"particle": "new_soviet:block/custom/electronics/tv/brown_tv"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/brown_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/brown_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/brown_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/brown_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_noise"
}
}

View file

@ -0,0 +1,9 @@
{
"parent": "new_soviet:block/tv/tv",
"textures": {
"0": "new_soviet:block/custom/electronics/tv/red_tv",
"1": "new_soviet:block/custom/electronics/tv/tv_screen_normal",
"2": "new_soviet:block/custom/electronics/tv/carpets/carpet_null",
"particle": "new_soviet:block/custom/electronics/tv/red_tv"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/red_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/red_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/red_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/red_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_noise"
}
}

View file

@ -0,0 +1,224 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "new_soviet:block/custom/electronics/tv/orange_tv",
"1": "new_soviet:block/custom/electronics/tv/tv_screen_normal",
"2": "new_soviet:block/custom/electronics/tv/carpets/carpet_null",
"particle": "new_soviet:block/custom/electronics/tv/orange_tv"
},
"elements": [
{
"name": "base",
"from": [0, 0, 2],
"to": [16, 13, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]},
"faces": {
"north": {"uv": [2.75, 2.75, 6.75, 6], "texture": "#0"},
"east": {"uv": [0, 2.75, 2.75, 6], "texture": "#0"},
"south": {"uv": [9.5, 2.75, 13.5, 6], "texture": "#0"},
"west": {"uv": [6.75, 2.75, 9.5, 6], "texture": "#0"},
"up": {"uv": [6.75, 2.75, 2.75, 0], "texture": "#0"},
"down": {"uv": [10.75, 0, 6.75, 2.75], "texture": "#0"}
}
},
{
"name": "base",
"from": [3, 2, 13],
"to": [13, 9, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 10]},
"faces": {
"north": {"uv": [0.5, 6.5, 3, 8.25], "texture": "#0"},
"east": {"uv": [0, 6.5, 0.5, 8.25], "texture": "#0"},
"south": {"uv": [3.5, 6.5, 6, 8.25], "texture": "#0"},
"west": {"uv": [3, 6.5, 3.5, 8.25], "texture": "#0"},
"up": {"uv": [3, 6.5, 0.5, 6], "texture": "#0"},
"down": {"uv": [5.5, 6, 3, 6.5], "texture": "#0"}
}
},
{
"name": "screen",
"from": [5, 2, 2],
"to": [15, 12, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]},
"faces": {
"north": {"uv": [0, 8.25, 2.5, 10.75], "texture": "#1"},
"east": {"uv": [0, 8.25, 0, 10.75], "texture": "#1"},
"south": {"uv": [2.5, 8.25, 5, 10.75], "texture": "#1"},
"west": {"uv": [2.5, 8.25, 2.5, 10.75], "texture": "#1"},
"up": {"uv": [2.5, 8.25, 0, 8.25], "texture": "#1"},
"down": {"uv": [5, 8.25, 2.5, 8.25], "texture": "#1"}
}
},
{
"name": "antenna",
"from": [7, 13.5, 8],
"to": [8, 22.5, 8],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 13.5, 8]},
"faces": {
"north": {"uv": [0, 0, 0.25, 2.25], "texture": "#0"},
"east": {"uv": [0, 0, 0, 2.25], "texture": "#0"},
"south": {"uv": [0.25, 0, 0.5, 2.25], "texture": "#0"},
"west": {"uv": [0.25, 0, 0.25, 2.25], "texture": "#0"},
"up": {"uv": [0.25, 0, 0, 0], "texture": "#0"},
"down": {"uv": [0.5, 0, 0.25, 0], "texture": "#0"}
}
},
{
"name": "antenna",
"from": [6, 12.5, 7],
"to": [10, 13.5, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -0.5, 8]},
"faces": {
"north": {"uv": [6.5, 6.5, 7.5, 6.75], "texture": "#0"},
"east": {"uv": [6, 6.5, 6.5, 6.75], "texture": "#0"},
"south": {"uv": [8, 6.5, 9, 6.75], "texture": "#0"},
"west": {"uv": [7.5, 6.5, 8, 6.75], "texture": "#0"},
"up": {"uv": [7.5, 6.5, 6.5, 6], "texture": "#0"},
"down": {"uv": [8.5, 6, 7.5, 6.5], "texture": "#0"}
}
},
{
"name": "antenna",
"from": [8, 13.5, 8],
"to": [9, 20.5, 8],
"rotation": {"angle": -45, "axis": "z", "origin": [8, 13.5, 8]},
"faces": {
"north": {"uv": [0.5, 0, 0.75, 1.75], "texture": "#0"},
"east": {"uv": [0.5, 0, 0.5, 1.75], "texture": "#0"},
"south": {"uv": [0.75, 0, 1, 1.75], "texture": "#0"},
"west": {"uv": [0.75, 0, 0.75, 1.75], "texture": "#0"},
"up": {"uv": [0.75, 0, 0.5, 0], "texture": "#0"},
"down": {"uv": [1, 0, 0.75, 0], "texture": "#0"}
}
},
{
"from": [-0.3, 10.7, 1.7],
"to": [16.3, 13.3, 13.3],
"faces": {
"north": {"uv": [2.75, 2.75, 6.75, 3.25], "texture": "#2"},
"east": {"uv": [0, 2.75, 2.75, 3.25], "texture": "#2"},
"south": {"uv": [9.5, 2.75, 13.5, 3.25], "texture": "#2"},
"west": {"uv": [6.75, 2.75, 9.5, 3.25], "texture": "#2"},
"up": {"uv": [6.75, 2.75, 2.75, 0], "texture": "#2"},
"down": {"uv": [10.75, 0, 6.75, 2.75], "texture": "#2"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
},
"head": {
"translation": [0, 1.5, 0.25],
"scale": [1, 1, 1.25]
}
},
"groups": [
{
"name": "root",
"origin": [8, 8, 8],
"color": 0,
"children": [
0,
1,
{
"name": "screen",
"origin": [8, 8, 8],
"color": 0,
"children": [2]
},
{
"name": "antenna",
"origin": [8, 8, 8],
"color": 0,
"children": [3, 4, 5]
},
{
"name": "carpet",
"origin": [8, 8, 8],
"color": 0,
"children": [6]
}
]
}
],
"criteria": {
"has_glass_pane": {
"conditions": {
"items": [
{
"items": ["minecraft:glass_pane"]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": ["minecraft:iron_nugget"]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_orange_dye": {
"conditions": {
"items": [
{
"items": ["minecraft:orange_dye"]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_redstone": {
"conditions": {
"items": [
{
"items": ["minecraft:redstone"]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:tv"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
["has_iron_nugget", "has_glass_pane", "has_redstone", "has_orange_dye", "has_the_recipe"]
],
"rewards": {
"recipes": ["new_soviet:tv"]
},
"sends_telemetry_event": false
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_noise"
}
}

View file

@ -1,4 +1,4 @@
{ {
"parent": "new_soviet:block/brown_tv" "parent": "new_soviet:block/tv/brown_tv"
} }

View file

@ -1,4 +1,4 @@
{ {
"parent": "new_soviet:block/red_tv" "parent": "new_soviet:block/tv/red_tv"
} }

View file

@ -1,4 +1,4 @@
{ {
"parent": "new_soviet:block/tv" "parent": "new_soviet:block/tv/tv"
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 687 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 518 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 569 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 481 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 557 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 434 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 490 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 B

View file

@ -0,0 +1,7 @@
{
"animation": {
"frametime": 2,
"interpolate": false,
"frames": [0, 1, 2]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B