From 24e07523da6c12a093e8156a80601016b7b1da46 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Thu, 19 Oct 2023 00:21:45 +0300 Subject: [PATCH] Re-work TVs --- CHANGELOG | 15 +- .../su/a71/new_soviet/NewSovietClient.java | 2 + .../su/a71/new_soviet/blocks/TVBlock.java | 77 +++++- .../blocks/lamps/LightBulbLampBlock.java | 2 +- .../new_soviet/blockstates/brown_tv.json | 71 +++++- .../assets/new_soviet/blockstates/red_tv.json | 71 +++++- .../assets/new_soviet/blockstates/tv.json | 71 +++++- .../new_soviet/models/block/brown_tv.json | 7 - .../new_soviet/models/block/red_tv.json | 7 - .../assets/new_soviet/models/block/tv.json | 143 ----------- .../new_soviet/models/block/tv/brown_tv.json | 9 + .../models/block/tv/brown_tv_broken1.json | 6 + .../models/block/tv/brown_tv_broken2.json | 6 + .../models/block/tv/brown_tv_broken3.json | 6 + .../models/block/tv/brown_tv_on.json | 6 + .../new_soviet/models/block/tv/red_tv.json | 9 + .../models/block/tv/red_tv_broken1.json | 6 + .../models/block/tv/red_tv_broken2.json | 6 + .../models/block/tv/red_tv_broken3.json | 6 + .../new_soviet/models/block/tv/red_tv_on.json | 6 + .../assets/new_soviet/models/block/tv/tv.json | 224 ++++++++++++++++++ .../models/block/tv/tv_broken1.json | 6 + .../models/block/tv/tv_broken2.json | 6 + .../models/block/tv/tv_broken3.json | 6 + .../new_soviet/models/block/tv/tv_on.json | 6 + .../new_soviet/models/item/brown_tv.json | 2 +- .../assets/new_soviet/models/item/red_tv.json | 2 +- .../assets/new_soviet/models/item/tv.json | 2 +- .../block/custom/electronics/tv/brown_tv.png | Bin 0 -> 1385 bytes .../electronics/tv/carpets/carpet_black.png | Bin 0 -> 266 bytes .../electronics/tv/carpets/carpet_blue.png | Bin 0 -> 520 bytes .../electronics/tv/carpets/carpet_brown.png | Bin 0 -> 687 bytes .../electronics/tv/carpets/carpet_cyan.png | Bin 0 -> 518 bytes .../electronics/tv/carpets/carpet_gray.png | Bin 0 -> 469 bytes .../electronics/tv/carpets/carpet_green.png | Bin 0 -> 569 bytes .../tv/carpets/carpet_light_blue.png | Bin 0 -> 491 bytes .../tv/carpets/carpet_light_gray.png | Bin 0 -> 576 bytes .../electronics/tv/carpets/carpet_lime.png | Bin 0 -> 481 bytes .../electronics/tv/carpets/carpet_magenta.png | Bin 0 -> 557 bytes .../electronics/tv/carpets/carpet_null.png | Bin 0 -> 146 bytes .../electronics/tv/carpets/carpet_orange.png | Bin 0 -> 434 bytes .../electronics/tv/carpets/carpet_pink.png | Bin 0 -> 490 bytes .../electronics/tv/carpets/carpet_purple.png | Bin 0 -> 459 bytes .../electronics/tv/carpets/carpet_red.png | Bin 0 -> 366 bytes .../electronics/tv/carpets/carpet_white.png | Bin 0 -> 351 bytes .../electronics/tv/carpets/carpet_yellow.png | Bin 0 -> 520 bytes .../block/custom/electronics/tv/orange_tv.png | Bin 0 -> 1377 bytes .../block/custom/electronics/tv/red_tv.png | Bin 0 -> 1396 bytes .../electronics/tv/tv_screen_broken.png | Bin 0 -> 330 bytes .../electronics/tv/tv_screen_broken2.png | Bin 0 -> 319 bytes .../electronics/tv/tv_screen_broken3.png | Bin 0 -> 319 bytes .../custom/electronics/tv/tv_screen_noise.png | Bin 0 -> 606 bytes .../electronics/tv/tv_screen_noise.png.mcmeta | 7 + .../electronics/tv/tv_screen_normal.png | Bin 0 -> 271 bytes 54 files changed, 610 insertions(+), 183 deletions(-) delete mode 100644 src/main/resources/assets/new_soviet/models/block/brown_tv.json delete mode 100644 src/main/resources/assets/new_soviet/models/block/red_tv.json delete mode 100644 src/main/resources/assets/new_soviet/models/block/tv.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/brown_tv.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken1.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken2.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken3.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/brown_tv_on.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/red_tv.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken1.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken2.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken3.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/red_tv_on.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/tv.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/tv_broken1.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/tv_broken2.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/tv_broken3.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/tv_on.json create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/brown_tv.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_null.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/orange_tv.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/red_tv.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken2.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken3.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png.mcmeta create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_normal.png diff --git a/CHANGELOG b/CHANGELOG index 338d4da..0cdd7ec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,12 @@ 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 - -Changed some models to more original ones - * TV - * Radio \ No newline at end of file +* Improved TVs + * Re-made textures and models + * Added white noise animation if TV is powered with redstone + * 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 \ No newline at end of file diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 4a2876f..cb7c049 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -40,6 +40,8 @@ public class NewSovietClient implements ClientModInitializer { BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLUE_CONCRETE_WITH_BARS, RenderLayer.getCutout()); // 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_Blocks.WHITE_BOUNDARY_MARKER, RenderLayer.getCutout()); diff --git a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java index ef8dc04..3580d9b 100644 --- a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java @@ -3,32 +3,51 @@ package su.a71.new_soviet.blocks; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; 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.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.sound.SoundCategory; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; 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.registration.NSE_Sounds; import su.a71.new_soviet.util.Shapes; 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; + public static final BooleanProperty BROKEN; + public static final BooleanProperty ON; + public static final BooleanProperty WATERLOGGED; + + public TVBlock(AbstractBlock.Settings settings) { 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 protected void appendProperties(StateManager.Builder builder) { - builder.add(Properties.HORIZONTAL_FACING); + builder.add(Properties.HORIZONTAL_FACING, WATERLOGGED, ON, BROKEN); } @Override @@ -44,7 +63,33 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide @Override 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 @@ -52,7 +97,29 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide 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 { - 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; } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java index f3f632a..ed0e319 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java @@ -77,7 +77,7 @@ public class LightBulbLampBlock extends LampBlock { @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.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); super.onProjectileHit(world, state, hit, projectile); diff --git a/src/main/resources/assets/new_soviet/blockstates/brown_tv.json b/src/main/resources/assets/new_soviet/blockstates/brown_tv.json index 83bbf8d..2887be5 100644 --- a/src/main/resources/assets/new_soviet/blockstates/brown_tv.json +++ b/src/main/resources/assets/new_soviet/blockstates/brown_tv.json @@ -1,8 +1,71 @@ { "variants": { - "facing=north": { "model": "new_soviet:block/brown_tv", "uvlock": true }, - "facing=east": { "model": "new_soviet:block/brown_tv", "y": 90, "uvlock": false }, - "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=false,cracked=false": { + "model": "new_soviet:block/tv/brown_tv", "uvlock": true + }, + "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 + } + ] } } diff --git a/src/main/resources/assets/new_soviet/blockstates/red_tv.json b/src/main/resources/assets/new_soviet/blockstates/red_tv.json index 4fbc38e..4bb35f0 100644 --- a/src/main/resources/assets/new_soviet/blockstates/red_tv.json +++ b/src/main/resources/assets/new_soviet/blockstates/red_tv.json @@ -1,8 +1,71 @@ { "variants": { - "facing=north": { "model": "new_soviet:block/red_tv", "uvlock": true }, - "facing=east": { "model": "new_soviet:block/red_tv", "y": 90, "uvlock": false }, - "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=false,cracked=false": { + "model": "new_soviet:block/tv/red_tv", "uvlock": true + }, + "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 + } + ] } } diff --git a/src/main/resources/assets/new_soviet/blockstates/tv.json b/src/main/resources/assets/new_soviet/blockstates/tv.json index 6330fc7..d51dd67 100644 --- a/src/main/resources/assets/new_soviet/blockstates/tv.json +++ b/src/main/resources/assets/new_soviet/blockstates/tv.json @@ -1,8 +1,71 @@ { "variants": { - "facing=north": { "model": "new_soviet:block/tv", "uvlock": true }, - "facing=east": { "model": "new_soviet:block/tv", "y": 90, "uvlock": false }, - "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=false,cracked=false": { + "model": "new_soviet:block/tv/tv", "uvlock": true + }, + "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 + } + ] } } diff --git a/src/main/resources/assets/new_soviet/models/block/brown_tv.json b/src/main/resources/assets/new_soviet/models/block/brown_tv.json deleted file mode 100644 index 77082dc..0000000 --- a/src/main/resources/assets/new_soviet/models/block/brown_tv.json +++ /dev/null @@ -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" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/red_tv.json b/src/main/resources/assets/new_soviet/models/block/red_tv.json deleted file mode 100644 index 917995f..0000000 --- a/src/main/resources/assets/new_soviet/models/block/red_tv.json +++ /dev/null @@ -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" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv.json b/src/main/resources/assets/new_soviet/models/block/tv.json deleted file mode 100644 index 3967938..0000000 --- a/src/main/resources/assets/new_soviet/models/block/tv.json +++ /dev/null @@ -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] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/brown_tv.json b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv.json new file mode 100644 index 0000000..fd62eab --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken1.json b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken1.json new file mode 100644 index 0000000..765a941 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken1.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/brown_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken2.json b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken2.json new file mode 100644 index 0000000..10b8ec0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken2.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/brown_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken3.json b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken3.json new file mode 100644 index 0000000..fb51e4f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_broken3.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/brown_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_on.json b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_on.json new file mode 100644 index 0000000..fbb8b3d --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/brown_tv_on.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/brown_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_noise" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/red_tv.json b/src/main/resources/assets/new_soviet/models/block/tv/red_tv.json new file mode 100644 index 0000000..191a681 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/red_tv.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken1.json b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken1.json new file mode 100644 index 0000000..c7ba45f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken1.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/red_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken2.json b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken2.json new file mode 100644 index 0000000..44310e9 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken2.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/red_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken3.json b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken3.json new file mode 100644 index 0000000..fb5e687 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_broken3.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/red_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/red_tv_on.json b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_on.json new file mode 100644 index 0000000..ea24353 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/red_tv_on.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/red_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_noise" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/tv.json b/src/main/resources/assets/new_soviet/models/block/tv/tv.json new file mode 100644 index 0000000..e20ded9 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/tv.json @@ -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 +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/tv_broken1.json b/src/main/resources/assets/new_soviet/models/block/tv/tv_broken1.json new file mode 100644 index 0000000..2b1877b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/tv_broken1.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/tv_broken2.json b/src/main/resources/assets/new_soviet/models/block/tv/tv_broken2.json new file mode 100644 index 0000000..f43f0b7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/tv_broken2.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/tv_broken3.json b/src/main/resources/assets/new_soviet/models/block/tv/tv_broken3.json new file mode 100644 index 0000000..3ae5263 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/tv_broken3.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/tv_on.json b/src/main/resources/assets/new_soviet/models/block/tv/tv_on.json new file mode 100644 index 0000000..349c0bc --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/tv_on.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_noise" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/brown_tv.json b/src/main/resources/assets/new_soviet/models/item/brown_tv.json index 583f5fa..31ea3ac 100644 --- a/src/main/resources/assets/new_soviet/models/item/brown_tv.json +++ b/src/main/resources/assets/new_soviet/models/item/brown_tv.json @@ -1,4 +1,4 @@ { - "parent": "new_soviet:block/brown_tv" + "parent": "new_soviet:block/tv/brown_tv" } diff --git a/src/main/resources/assets/new_soviet/models/item/red_tv.json b/src/main/resources/assets/new_soviet/models/item/red_tv.json index cc0becf..bb1582a 100644 --- a/src/main/resources/assets/new_soviet/models/item/red_tv.json +++ b/src/main/resources/assets/new_soviet/models/item/red_tv.json @@ -1,4 +1,4 @@ { - "parent": "new_soviet:block/red_tv" + "parent": "new_soviet:block/tv/red_tv" } diff --git a/src/main/resources/assets/new_soviet/models/item/tv.json b/src/main/resources/assets/new_soviet/models/item/tv.json index a581afb..ef12a65 100644 --- a/src/main/resources/assets/new_soviet/models/item/tv.json +++ b/src/main/resources/assets/new_soviet/models/item/tv.json @@ -1,4 +1,4 @@ { - "parent": "new_soviet:block/tv" + "parent": "new_soviet:block/tv/tv" } diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/brown_tv.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/brown_tv.png new file mode 100644 index 0000000000000000000000000000000000000000..3fe7f1ba0eec1276f0a6f1a2c53a98be7cc6696e GIT binary patch literal 1385 zcmV-v1(y1WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1pY}xK~#8N?U>zb zTtyhhXSX$)-DXp5HANGynvrj*%MPU?Le3>!gd|h)j$x0!_B4y2%14<$V}`>ezV_DxBAe`{0X&e{Ws>-+bcdVQayZ+3d)_W)We zgthK}A_T&3t**J%xnCMkhxO4Gg4;lF{T*p4L*r^Y4x*O8^m7ACfEOFn5@;O_zOkI3 zExuDYSf18*q07<6HO@FF6d-Fl->`hpr7CguSl zf@>%cL7tv~K&$KZuiGFUBMj==V~&$zmY2W&s)CSbOVO66rC)l!E@8IujO4jN>be?i za@+`Apo|;gB#GJsG_){cZEfKC=0h(DK$m|~L>((lo$p8UeOMpu7 zmEn6QdocE6FseiQ9uNzT#WJ@q1NVW6C;-=6Bp$VwN-s8WX_SY$whh`2^B(kFoqsjY z!SbVDyTAMPn;>OX-ah|M9}S=YTvo7&xu9}>xVaM4G5W>C0VcNc%lDG@DUf4B0Tdkb z(n^pxSA>0e)54=o=!RZp$C{sR-4l0Z7zOm(zSA~;{QhS#d7}HqST?AS073Ycpn$HM zt1Y}sCLd07ymI8AIW~7dg1*hgGJj;=%*`FnbB{rv>>p#5K_wtSp{~GkdP@wI3-7+y zM<-YUxU)Cw)8^+pt5S%K2VkODzhJ4o8su8&7uLt~_t^2Hrgi;_eCKHZxFJFb%h`t9 zBd`RZI0Ea2y0cz(Wsf?I*8}JUqj~@)e&XcIBD@Vffa8<_%Z3tDmpByw58#XL@9swa zH6D0Cr*k*YJqCTUe|nn>uI(6N+sIo0aF>Ux!z!>6g1)82a_;O2bK(5rF3X@#_K&f+ zyf_EUX%yi}OxvoS9Bx}!qdcz>uqWW?Vm=h~JKwCC_VS>Awnty+lX;G%Z-8h!iaV2- zwz34!fL5?$K+D9kboIK~T)my=2I#(AW9rGrDk8Q%*tG}XA;N&2*$$y#B8@{crn|B( zX;)u*EEloDfY>&b*Ur2ySK)hq-PmrtCF>Kh@6LXD@r=YgbA4woCc@(ko8hlFu1VU4 z|NJ=i3r838k^wkI@dp_{O3Pp!{y+`=gX~p+4=M%|N1As9ja`RnA3g;@cnEZNdAU#k z1!erv#f#?SOP3^%zsPJ8tbjZ&E)l**2Ok@->@YWjSJ;mc`)v?TpDFK z*I|(|Ug9_lm3gD1L|lxHyHhERbDhz>!O`7GygeSww6NyA3kw_#Gi9{li rNF)-8L?V$$Boc{4B9TZuA&mJSRB^L8FQ*^d00000NkvXXu0mjfJ!6gI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png new file mode 100644 index 0000000000000000000000000000000000000000..91b32b6bcd343b78adb0a4a92411ee9c0df35b66 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|j(EB_hE&XX zd(Bg*#el;h(C?t;j{jd@`0}^#Wklu){l9H-^b!k;>$;DxB0}40KwEhuyT( xE)$#ir}5sm&bc)|-_2Y7eQs!}4A9BwKuP~@TleAa@Ukf&8BbR~mvv4FO#tR3XW0M% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..ec7dd88f83e1f1d6b95fa516163974a529b297bd GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4|%#chE&XX zd(Agn*iq*A$9%KdxtC=RizywPQ1w}>;=4$C;!8=gMa!xE|l9^-oc*E@Z;=G zZR3Z$j}A%(RT+koK0TRL$Uph_cD|zj_kyF=KDsB@pT6$WgS)3s$r*-=KKI|5P&x1O zg6bK}?_9Uvcr^d*?5MS2zWepMi)G`xlyHInGvpHs_pbPU{)iJWY8gCT{an^LB{Ts5 DbVl-` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..0500545c038246e8c1b77880ec82c02170adcbd5 GIT binary patch literal 687 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V9NA#aSW-L z^Y+?#?q_nK}NwGJJR(@7<-_nx!+)}JehDD&xfvGin3Sv$5_n&rAEsMdwQ=7Z$4Z?f9?r!qe!UXMktZ;TsEH9yFhIz5Lvy za6ty)W?mneg?n_u*-U;N2r!q-`YidS5hz{ve*KyM{i?SbUhWJGkbAgr(H5bd-z=*8 zP9~nc;nB7u|HRhq$y+|{Gz@-oVT!f(MYfPrjn%J%H?vM>x_Zk_-~M-q{gsvb?lK-Q zpSAKPQ(_K7L~YFLCwr{b0{!;wuD-eMy41UyCeBl)r=}-zh^GB~#jcU6X?N%N@m)u? z^-mv3Xuh;~?&VnKx|o{We=8VP8Js@T-EdTWH_rvDS5ZH6?wnq{M~7jxV^`jk7ri-l zd(*U^GWZBjdG2@M-XT|peH-2H)+_`%ci%Rk)rZaJm*3^|Fj=_t^!wd;%tBWiwywRl@%kzIFy>1S_12pyhc%15-0MGMN9oVX%@Yp$ zYi{`z`CsDiqxt{mrcCv$Tu~x?Kf_Dg-F*Mnw=y%*UjGi$*P2^ss1f5;vJ~jFt=D$_ z$*Z^95x2qqwY_fgU%l2$ri4cv+5P?5YfHuF_gS3W*dpM>p@^IKVPDHW}-}EU2v1(8e=GH&*P6(i?*rt#z=&y!7`O}kwm>80J zx~r3RwQv7^DL_1MPQ$Xygr3Ila_1~_wntaIU%0hxtJ!(uV+;)6e%ofP{rD+fWx=Y1 z9>?pYl^GIkN4JPDwFLd#wQsleO|fjH?zH~ociVEg*OtCB_nmzE=i}SkT0J<=t^NGC z@e+&At6gnd#qRxn+`Yu5Ku`a#2-BLa9!?1|htmsV7CvG*Q(doDW4zXMk%d_0!jO5v z`Rl`Xvvzeq*z@N1zVpek*B!k&C6t#;nZNpA^_SXy5vRJe-Y($>dynUBXJ(LTV+=Pp z-*D}aMDqigD`~|><#|`VCI`%E_qF z)FwVbi+Zj(zc$Wt3OTw^@A0>XnoFnryJKgk-+yrFM!EU_^{(wy{%&qL?bA>3UHhzN zPWZm=*CqRBD__cXR~a0Sd99_WgaiC4|HG6Wf3D-$_J6N{5zFA|>gTe~DWM4fsMhC} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..e5e5a1f63a8fcfa200dbd220a0a4e4c6f8878fdb GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z`#oJ8Ln`LH zy=Itq+d$;lNBg53Dtl7TNbdQ`a<6z=Uu;!Fi~{>6^X!f5CmPOnY?^RKagxGmJ*h=4 z4^8gpPx4?=k^d=|abiQ%+;hhf_A^8$MdwI^~8~REg(J(}b#73v&}s{Ps*p2om>G&$wNr zt*4{Su=*-j!xSM+Rk3bXP1RlN7SGMuwC=Ux`{bTv*&m-w9~4+HOt-ZAe*ap7xZS6^ z3TA=Fk-ieI52S2<{6k`Y9q$j;3-NDPrRw_HWPLvfOsbP0l+XkKG?dS6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png new file mode 100644 index 0000000000000000000000000000000000000000..73bf772b7f40366a5dbeaa92e00f3588512bb217 GIT binary patch literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zKYO}3hE&XX zdu?ytZ37Y32hOJx&b(6RVq!L&V445yr1veu_Y*bsudj6$yKcYK>8PD-%EhwF3%lkz zXq+?e6k>f9H)*=jiv@G;UAW1_@Zd1hxxTXNqCQy%Oc@#Uv>%3leq3GFBHw@Cclt-W z!w+orO%IBHSjd#{xOVzfgO!d)=NCkF9-OXX$31<$di@)BiL%;6`_BtA?e!QK<_O6Z zKghiPQF}w>J@&nSw_5&8ws%_2GUG}@NIb)Vyl?%M(FYcLcEq1e{G3**qR;%}>+OHF z7c?1TghPKZt?Nv&$w{l&RsEwy?MLkGXJUzxNkYF?74v3v-+K6|@ASX^*JhjyNeAD| z_R~JFQ|R9Ll%ip^;dDDf<4;uTl7x3CinpZxa^*cE)?9Fy&0e^;c;~!UL zYOiWCo)as)#{YfWY|#&ijI*O}CSvZ#;`8f^c_pq^-uZ8~-Q$?^j|(CH zs-l&3m}?>wR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..5c6f245aaf128661a7134649ab658df18365a8a4 GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zmwLK5hE&XX zdv$-_LY~)hdpQAJmjiSH~(qG_2;L)_rKq%@PGRPuTQVH=rBG~I6nQI9#aad zPMy>Bo4-ra-o~;|-+A)<8EHTG!BqC^!!u(UyGHq+R_~um%*#D+JAWGUhW{l3 zH8ba2wfq)kvtp8smFMZxPhGytuf5&B|8NE0@_Uc2_NsIKiS-LRaB=sRHQ5(RS8ZWP zNZ+~H#$r47jFfrnWXsvk&apVb8ErV(h;5DBfnDeCFT2F_CQmS>)wbWx(Yj@WsBuq% z#6h>iA9uWcVVb*;&#t281)UJCSMRY*crc{fw8+T V`P{5LW8f?2nS0=U*m2_=YcWTD8U91I%m+*RCsnea>M`v7WF^nhsq1E_=1~-`z`olCIIL_F#F%&R-{s zY@GMTrI+N*;`jFVR1p&4VqFwBbwzmUA-RXo?nt~BoBm?zb;PmrEu@nerL7Gi9f%peS0IaG^jH~ z>u8qhkt|i04{tJKuBT>y5;>YQapRTLMY7I!B~LJZ5I^wtQP)-8hS$4fe*SBX(Q`MN z`Q-0m^%$F5PfmHx?sY$ZB5iYy#pETIfx4FpZQAkw*;5C#2d~w46yzP-BGX;A+gC;C zruFtW%q@o#l_qlRZE#*2c6;}=95c?Ug2#t?4nDtjlYgJwi?BzNGH;0WrQg`7E5qOR zMj`r(xxj9I1ATBVm{v?0E=cS)7&)O3VOcD&9u6{1- HoD!Mm|BAK&{;s!mU8s^^jn(-o0-(txq_>;Gr1kM)zQ>&0L zOxsxNaOd8mzeS zO%_J&E(_+-IxsohdiA?oYgE4pD$aWRnyDfGqG9)+27$A`d!zRr+1au@zbyRq`(Nd} zS`O;xWzVTHxID~~&%Y$OPmklI=lsW)BsPD$pV4^ydwd>a#M@sHM^tB(T+5eJ$l9*y z9lg8kGSGs55ASK6R%fuNud8G8`&inzp8MECJw;1J&fo`oe0LQm{V&K@j!w8B@}lnX z;!DiwGiE21{W%;lXJTRNs+#uV-~~?)zx-M!($#?z{E55I$n>#)g3>}IF<_iAc)I$z JtaD0e0sz2#->?7x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..ec8587923f4783743f04f314cb28d3e71732b85b GIT binary patch literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zpL@DEhE&XX zdv#;Bh@;5ykMG~!xmT6O)1IIlwo#BpvCH>B2aBQ$3v+t13FF2K_6{3FzsPS0)L{u^ zderEuz~#;rd_+r*Wz7)XRT z&+}5tt1}vQWiz~5%41)B=GB>Y#p0N{KXX9!t{>rCKY|_SJ&BfoFH$G^@|Nb+nSnVO zk+b5`J{~jbeWj%x9M2%Jzewo1ALEC0r{A9c{_EX0#dK!5c{}Da&RF3g@aD?r(lsY{ z-r_jCRnaasCRsW2@#J&g>V-us3*Nk&_wgnBPN@lHyBK~fX_nP_oa~-;XWpK(XL*vn z_a8kJv@Y}Y%oyGsdkXeGNN(S#YBrm3nb5;qn(oj0J|t%Kx|L2n%*}k`!lT&f&Fy>- z9G+w+9({fxJTtzWe9$nJWO9$lyT? XuY&^vBX_Z%EJ)bX)z4*}Q$iB}0~{am literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..a7faf3ec3fc1e38c8c551e775010a45809cced82 GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zb39!fLn`LH zy}Hrsu!GF;kNLNjb*>GG>I%?kQg9NCsbO%BU$lF2^SZfrWaiWexTlME>nk)pP&(+O z8KQmb!i-}NgKn+z)|%S2|9sK$|3xRCzN;@+_&?iUn2Cq;^Tq(*?nJYPJ|r)_~%zi^>eYV zY-7H{eL}ttPoLa7r0IA|j=g<#K!NYwvyHo14qh%fUexQgcxSd=iAHAU-@gd=7n#0e(u{KepTGV)o&u2eN(Brtfo L`njxgN@xNAJ%zN{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png new file mode 100644 index 0000000000000000000000000000000000000000..ce04956bbfc8a876924883f8d27d935aa345ec9d GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zmw383hE&XX zdv&9?jHAf$kMFIjUmuK`Q*kQxic?2xuNhmA#uCq$_Y+iw1ah2$miKF3TG|u4VT(_u z;O!;BO$r(BnB>ZPH@vYj7km6RDRE=qVwL^=#@6|1<bBf-HQXrn>)Rc%jW-0=n0xPipD&?hT0P-U4990d8`C%YESn@BCl@P5XP4fe zZ&(vE|H)S8x+6fV@lWKUR!b9V+pZ_2}~Y3A-pQnOg6Zj6M1Z}d-nVJ z=5OmK?~eLDSF@BUYWDq@khM?#p4V4nc+uDM{N!eXXOru9vWGfvzt?c%Le<{)c~$S6 zwZ3!n{Cj)E>00_!*%QBd=54KAW5mL4yI(SXI%9|R@_+Mg-1%^!Jv57X*86#^nUgkd z4f))-T7_|b$+hp-JI~(EusHR8@7JvNjyttJJUqgYeFkjzt&e`(e`&3`gl+cb z-9;z7K1px;>t=gQ>qB~~f!UMX_m8S>N>4fA$m3znIgyj|o}c|LUI9T|U}F7A)yk*U V!m1PBZUROggQu&X%Q~loCIGpn+Ts8J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..0321d7fa7d0e2fa63464427d3e6e2a360fbab729 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zTRmMILn`LH zy=w1$*g@vl$NcqQr53JecDt^1V`cWjQb9p>_4|`nuRm~h`vVQxIW6m)mUC@gY-Tm( zlH>ZbR~MRSHA#K+Klps}6At^L^7BupH~h(;X>xS-&aZ|J=f4*o+mOEcO04qEsP~LF z__pmR@vYj&f8gIAz2*JSzqkdi`dR0^idFaNp^abXy-nzz{bSm-4ZX(CN-v&p$P;q$ zXzXBQxK^!HZ(qzfqu+ZT>%y}Z$t!jrTm4)8VW5#+oE^)8Il4lI4;1zr&&<%BvGeR< z@u&w+JN0I^K54lx9K`S-tHicgaY+?()=#c$)lOVfo|$z>sMMZ+@pkdDt+x07hXm9s zhBBmgi%X{aY?_%V;Be{twdzwhm7eAZrt_@6DLTiHW#QbNm)oZ>+PLJ|ynUH=hjD>v z4)f%B>>6itFZ8}=xUua!O~kgP&MhTtH2%qH z#7}B7tNF?PX@9Eb+`q#AKK_$xIAqDt^L@^@Dv@)BW^IwN$(wpM8qVH!$TClU-pO~D z{#|da3wqDB&Q18)fr95(1ti{Xna^nEqIaAB(}YVx2F+R`?25Nm#JnxpURaZBxQlPb zl6%e?&KKRzx(C)CxIbxH!=A|4^L3JomhM!NIv3rujyaPvVe9$*$&0_MFRaNqvp!xh zlQUvXTJ_u(&yMC7nm6aM&OevC{Z!KWLOGvXiZc$oTc%5`+b(|Kn(6y{#TVZPTeN?i umpLtWoqNOfr;}#?dG6ocffKxW&;8%T%O%wES358O89ZJ6T-G@yGywpsY^eqS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png new file mode 100644 index 0000000000000000000000000000000000000000..71a1bb0b66e884acbf4bfefdc3ddf97a109455a3 GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zB|TjnLn`LH zy>_tckbywMLrpHZZvkB*Hb1!b{cnCETBPAIL9UBq;u}q)V=h^d5sUwq8~O@o8C}kF z5i7XXa%t=Qw%ye)OTW%BRn)r?Dg213^tQiqna|gfC6~)$GBVHX&U53&&##+M)a|Gxh3;BNBcv+mu?g}=6X{9d*E@*RKY z4(Wxg_2;fNzj~?hs_d-kgVf?xwYUBoN(OXgtTVHbj^7%z#5?f+3Mm20>~~%9n$oMh z|9|=XRVOz&rFf#>`=>8*F798N{!-uj9m}pSqSY32UK~DKRzIV(;$rc%bF;10^FnTa lHJaDA`8gvnP|!g9Bk`rd^QXwRNL7JkJYD@<);T3K0RZBhmpT9d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..b74a3ba5b29d8354ce78ceeddddafd4e7c69718b GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4|%#chE&XX zd-Zgdh@;4{kM*JcrM}-&ge3PgOyAKd;Cf|iN0ZxyUWIjMi+?aQJxG4S7_-Z;sj^## zscV+2m=&M#-Hp4K?~dtNz-Z39xaZg3veFf&ABM-FL18kqU^O~Ov9^J z$yMLy3twAjxZ|Tp`O0Oxesr9B%J}V+^Ba@jvOCYau4Y=3`)*c}6r*;;^rXctyWTne z;A&Wy62;dqC-6=4Q`6S7cUyPYW<)mZUHkPx@c-Z^%xa$^+79e|zme;8(4r6X8jc4z zzqhE4ew~;Xc|LHr7{ja-hMtU77j**mvht+v^LO@ApLZcdIcsxQ?*g;cKMa-`{Qa3` zr@of!!tT$fZX7<(z*0RcbEe=MPaf66sx|?oRY{Tsn^~{ACxmS|_*T5Wo;zjz`!+R6 zft`ARQ!aKU`xI|^KG*)w(_1HJvvc2Mdb{u7+unc~cKa+CUT6GTzGBmy9k1(hEG!p9 zT3Sn&1o`~yEc(MLA3g2eTb(D`0)n`}#QLM=M?W?`y*#t~C@^XnJYD@<);T3K0RV5V B=~@5) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/orange_tv.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/orange_tv.png new file mode 100644 index 0000000000000000000000000000000000000000..9cc105ee90cd109a3cd234d446f29222072806c7 GIT binary patch literal 1377 zcmV-n1)lneP)jD5c7vNk#a1HhlNyoXQ3wBVgY#k*9ibX^dtCT003w$Gywp%H3tCj`2YaWJw1raYjv>sDgfYN zxw&ak(U~~WIdr9hq918UJeA7Z)*M7Xl7ADnHHU7GO9P00gjUl+_cYm)-gxCHwFDTe zN&~c-afteSFs2-vua0??u__oJNJEh4^Pqask7QrdV3s~S*OePq9!|XmAodz#RWMe~ zY^T9a-iEA>1I8^+JqKxO>_I0JM<3+xuYvKa4lQX)-&xNjBtR zr(R2VJFhGcbx8oDkpI7^l<_=yRsB}WbYy9AP0PhRm7$-; zFRM3j4S&=}wDkNSU+wEKteztf8Bie)jG z+6oaRHna2u0N|4^f70ss&fR;%h7cr zaGbH+{>R@QCqnMc8>`wKN<|$9or4ZI7r4H)3GlY8`~A-Y`R#`R-h1n{F+(D62-9U{btN;$Xf-WmDO@V-Lyge1qq5qTC1C)c55R&Dk9M8_ z7;QXxXZa*{clIDS$JJ{a5Yb4!+v7lw%L~!=);fGXz)DKK;W+SIS9?9H%TAZ6MS$nJ zxW2VHAp(lM4@~xYy6sCbz@wcfi9O(2!OmU8?#>q-USIqNjYS)O>wOCV-^12CwRsMx>0stMN6#g zWJsn|B1D6zil}dPY2JS4-61dv&%D7n7g!n$v9#F4ZZH21puYK$4vA&SIX13t4(W9` z4ow)v49exU(SGP=kFgOZ56O9x#xbk><=v9aVOeK#m`4WA~72H_7^48^QdI4=X9v5>pzRK?Jp9Q^tq|?Os>k5eOA9{$QL2Huw?D>mc``H z;o-6T)@gsynN^j{JL1yiMUyWozlcPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1qn$+K~#8N?U>tZ zTtytmXV+@dU6N>Xp|LBqm=;wbTGz9+w(J#%(un@#dC9~frl%=LGf+bMi@?tH^2zW(aVLXzy@ zgAYGyl*=Va508wP;h`Z(yI5UYGpj2rlCIV266&>@gi#N8;BTH}?2xH^p5+Gn!NXwJ@{UY@M3Uc-GC8w6py?4CLTUOVf zCaG+O2VP22Eq<9>ka(&7*wmhFNcy#rmKW_S4NAOJe0ukit2?(^hUjMoc(jmg2u07^fl6t_6Z>|*(l58&8 z^0f3@&9#hhpy{^AbA!}%HQ4014`hKdZiM}$r(+P%!icrCLDn}HdPxAf{B{wvtA2Xo z&Bof3b*EKbu+6>de~EydOMpsnmEn6oPJy5f?R!8d-#`2-*X{Gbao86H;ChS1(e>rr ziw#^F<-V?MgSOqg2Yufk*gQI)=i2?lci(y`tMKtBry6Jg1^m<8bg+qKLFHVz`>R*S z=ob?QnApp6vyyfxkYhsu6dd!?N{~2F1aGcH3y(Iw8+wr)YpzfKF7C?E3+Q+5-#Ih$ z;9)v>qWi{JHmHvPLHL%SfP80YY~izHa*=roynm=-j#u_e(6_lzCSRR26BA=eZWHv$ z{xMb_R00ANniW`1ZwW!(0_X%w0FRY}`$o)tY2{Lw;3l6BDgYh;DO;5 z%CXT6bMnaE4$GiV_K&f+yf_EUsTbi%NZX>G9Bx}!qdcz>uqWW?V%`_@J3KmMRv)!? zY_>;V=#zPlrEh>}+lxDskhZb}(12E8j7^EqGNIi2>4DjpZ@=2=zBq;+TTebz5ux=# z#~#pnd$%4Vn4lee!9-wbv_abL2Lb5uY(j+rp=}E9yn9lv!UGFcaYH^lTzB?~siP9} z%ypf;mN@4INFiD$ArPA@xAeel$+J0&AtxwC_ zFFBsqJLws13g8m3h2l5+g5gttx462C^oIz5i&H2Kg|XMZPkrAX6FY^R0$lg5^-rh( z?gu{gce?_L5P|{$q_NTIK*4og-}<{9Q2@cjIeCr!T?_A1e>WpnVF=W1(k$;LJn2>* zi9{liNF)-8L?V$$Boc{4B9TZW5{X12kw|2lFy?=9agsz)I0VfA0000>$wg(A+Wgg;(Yx0Wbc)|LuJXl0EMj&2X;bke)El)!=?{;v8=kwC!S^?E5eL${>V!`>q+09!KmNMBn@j%QAbORm38Q3MNk8T~oWg zKFv+Tds$^&ZsBCs119H>L#$}n;Ki%Hf@>bAt z@mA)dp9e3o{`_81=DM%od%r}43k*D2{Fiy9Z2FNu1-oYg1A)QQ)z4*}Q$iB}zV3r%UwOXj6jVr zAd>gJ#3J^rk8f;t+%);_%yW0Yek{A08}fM7H_e*6HY?upPg-(wanc-M!L5zxL+A_nIx2t|LPgRlaSKqliY0j6Tx@j|4=E^^PSGhK1>h9GW z&Deb(UXIztyL8p12fx)!u069$NQ=IgAGV-xtR*07>k44ofy`glX=O&z$D@6;uumf z=j~nlt~&-I$3H&b$S3H;XLy(6+Jx6jyeE6>@Nfs~oGE3yrciF@!coonP~@Rzek*fk z&x4o0Gml-%Q+$2C`0Hd>ps{eUr~1t2Z!@01{rR-?v}L~K^P>MVo)_KUHQ!yb=-lnE zWz#Dxrytw0Mo2$>X3~`HQ&PGDj}^*Defwe_=)Sy?tzZU;Q)XfVgde{^8~4$YJ!ISiY0BWZP@e3x~4}Uhs7P(QL8bSFgP}Z~fg{ zw?Erng;`ts@K3`vSr`vQTg3cb`f~4!InVj^=YI=&eEoLpy6x5CAAbtyKmYW#QcyE~ zuK3T{vfG*;`)=T0bG_`C?fHEjCngl%%gMTy2mRNB;@Jp=d#Wzp$Pz))e)%x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png.mcmeta b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png.mcmeta new file mode 100644 index 0000000..95a1376 --- /dev/null +++ b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 2, + "interpolate": false, + "frames": [0, 1, 2] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_normal.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..b8a3853f0daa31bfa6e444878551430425845e1e GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|PI|gHhE&XX zd*w9OAp?Qdhl`gKZqRe7`L8Zgn3&=tzU#u2sFF;shyTNNmKdtf3}FIlfq{%WS@jln zXM8rkp3?p>dGnf`yY-%5&RQt-Uu(*T*gGq_XD@xdQqM!G+5Pp_x8;+TMDOa8KWn{M z_4UgoE%S@NYaP`|j6LM~`uNf4U0T&a-?oIrUTt}~WJ~S0C5rdsAGh6(uabA*w3Zi7 z3tPYF)FG2Q+oSV;{`C$jDBrpJ%&oky@yF^NUYqkm9W&tz%M@9+%H;|7R6!!1u6{1- HoD!M<4WDsm literal 0 HcmV?d00001