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 0000000..3fe7f1b Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/brown_tv.png differ 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 0000000..91b32b6 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png differ 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 0000000..ec7dd88 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png differ 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 0000000..0500545 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png new file mode 100644 index 0000000..de672ee Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png differ 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 0000000..e5e5a1f Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png differ 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 0000000..73bf772 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png differ 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 0000000..5c6f245 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png new file mode 100644 index 0000000..d02c39d Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png new file mode 100644 index 0000000..48c06e8 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png differ 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 0000000..ec85879 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_null.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_null.png new file mode 100644 index 0000000..be6bd78 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_null.png differ 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 0000000..a7faf3e Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png differ 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 0000000..ce04956 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png differ 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 0000000..0321d7f Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png new file mode 100644 index 0000000..4c2736c Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png differ 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 0000000..71a1bb0 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png differ 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 0000000..b74a3ba Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png differ 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 0000000..9cc105e Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/orange_tv.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/red_tv.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/red_tv.png new file mode 100644 index 0000000..5581a83 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/red_tv.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken.png new file mode 100644 index 0000000..9fc09b6 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken2.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken2.png new file mode 100644 index 0000000..eeffde4 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken2.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken3.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken3.png new file mode 100644 index 0000000..ff2ae1f Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_broken3.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png new file mode 100644 index 0000000..d70d39a Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png differ 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 0000000..b8a3853 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_normal.png differ