From 83a976ae8b43bf78721f7c73c983d43e7fd3f941 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Wed, 6 Sep 2023 13:07:56 +0300 Subject: [PATCH] Davey? --- .../su/a71/new_soviet/NewSovietClient.java | 5 + .../blocks/lamps/GoldenTableLampBlock.java | 10 -- .../lamps/lamp_post/LampPostLampBlock.java | 105 +++++++++++ .../su/a71/new_soviet/items/DiceItem.java | 2 +- .../new_soviet/registration/NSE_Custom.java | 34 ++++ .../new_soviet/blockstates/big_post_lamp.json | 8 + .../blockstates/caged_post_lamp.json | 8 + .../blockstates/modern_post_lamp.json | 8 + .../blockstates/vintage_post_lamp.json | 8 + .../assets/new_soviet/lang/en_us.json | 6 +- .../new_soviet/models/block/lamp_post.json | 165 ++++++++++++++++++ .../new_soviet/models/block/lamp_post_2.json | 144 +++++++++++++++ .../new_soviet/models/block/lamp_post_3.json | 114 ++++++++++++ .../new_soviet/models/block/lamp_post_4.json | 110 ++++++++++++ .../models/block/lamp_post_base.json | 4 +- .../models/block/lamp_post_base_attached.json | 4 +- .../new_soviet/models/item/big_post_lamp.json | 3 + .../models/item/caged_post_lamp.json | 3 + .../models/item/modern_post_lamp.json | 3 + .../models/item/vintage_post_lamp.json | 3 + .../textures/block/custom/lamp_post_v4.png | Bin 830 -> 0 bytes .../block/{custom => lamp_post}/lamp_post.png | Bin .../lamp_post_2.png} | Bin .../lamp_post_3.png} | Bin .../textures/block/lamp_post/lamp_post_4.png | Bin 0 -> 873 bytes .../block/lamp_post/lamp_post_particle.png | Bin 0 -> 160 bytes 26 files changed, 731 insertions(+), 16 deletions(-) create mode 100644 src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java create mode 100644 src/main/resources/assets/new_soviet/blockstates/big_post_lamp.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/caged_post_lamp.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/modern_post_lamp.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/vintage_post_lamp.json create mode 100644 src/main/resources/assets/new_soviet/models/block/lamp_post.json create mode 100644 src/main/resources/assets/new_soviet/models/block/lamp_post_2.json create mode 100644 src/main/resources/assets/new_soviet/models/block/lamp_post_3.json create mode 100644 src/main/resources/assets/new_soviet/models/block/lamp_post_4.json create mode 100644 src/main/resources/assets/new_soviet/models/item/big_post_lamp.json create mode 100644 src/main/resources/assets/new_soviet/models/item/caged_post_lamp.json create mode 100644 src/main/resources/assets/new_soviet/models/item/modern_post_lamp.json create mode 100644 src/main/resources/assets/new_soviet/models/item/vintage_post_lamp.json delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v4.png rename src/main/resources/assets/new_soviet/textures/block/{custom => lamp_post}/lamp_post.png (100%) rename src/main/resources/assets/new_soviet/textures/block/{custom/lamp_post_v2.png => lamp_post/lamp_post_2.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/{custom/lamp_post_v3.png => lamp_post/lamp_post_3.png} (100%) create mode 100644 src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_4.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_particle.png diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index e92a9b6..925c627 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -23,6 +23,11 @@ public class NewSovietClient implements ClientModInitializer { BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CEILING_FAN, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.SIREN, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CAGED_POST_LAMP, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.MODERN_POST_LAMP, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.BIG_POST_LAMP, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.VINTAGE_POST_LAMP, RenderLayer.getCutout()); + BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new); } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java index b607968..f51f6f9 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java @@ -59,16 +59,6 @@ public class GoldenTableLampBlock extends LampBlock { return Block.sideCoversSmallSquare(world, pos.offset(direction), direction.getOpposite()); } - public VoxelShape getStandingShape(){ - VoxelShape shape = VoxelShapes.empty(); - shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.4375, 0.25, 0.4375, 0.5625, 0.875, 0.5625)); - shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.375, 0, 0.375, 0.625, 0.25, 0.625)); - shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.25, 0.6875, 0.25, 0.75, 0.9375, 0.75)); - shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.125, 0.3125, 0.125, 0.875, 0.6875, 0.875)); - shape.simplify(); - return shape; - } - @Override public BlockState getPlacementState(ItemPlacementContext ctx) { return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()); diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java new file mode 100644 index 0000000..063ae63 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java @@ -0,0 +1,105 @@ +package su.a71.new_soviet.blocks.lamps.lamp_post; + +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; +import net.minecraft.util.BlockMirror; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; + +import org.jetbrains.annotations.Nullable; +import su.a71.new_soviet.util.Shapes; + +public class LampPostLampBlock extends Block implements Waterloggable { + public static final DirectionProperty FACING; + public static final BooleanProperty WATERLOGGED; + public Shapes.HorizontalShape SHAPE; + + public LampPostLampBlock(AbstractBlock.Settings settings, Shapes.HorizontalShape shape) { + super(settings.luminance((state) -> 14)); + SHAPE = shape; + this.setDefaultState(this.stateManager.getDefaultState() + .with(WATERLOGGED, false) + .with(Properties.HORIZONTAL_FACING, Direction.NORTH)); + + } + + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + Direction dir = state.get(FACING); + return switch (dir) { + case NORTH -> SHAPE.north(); + case SOUTH -> SHAPE.south(); + case EAST -> SHAPE.east(); + case WEST -> SHAPE.west(); + default -> VoxelShapes.fullCube(); + }; + } + + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + Direction direction = Direction.DOWN; + return Block.sideCoversSmallSquare(world, pos.offset(direction), direction.getOpposite()); + } + + @Nullable + public BlockState getPlacementState(ItemPlacementContext ctx) { + FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos()); + Direction[] directions = ctx.getPlacementDirections(); + for (Direction direction : directions) { + if (direction.getAxis() == Direction.Axis.Y) { + BlockState blockState = this.getDefaultState(); + if (blockState.canPlaceAt(ctx.getWorld(), ctx.getBlockPos())) { + return blockState + .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER) + .with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + } + } + } + return null; + } + + protected void appendProperties(StateManager.Builder builder) { + builder.add(new Property[]{WATERLOGGED, Properties.HORIZONTAL_FACING}); + } + + 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); + } + + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return false; + } + + public BlockState rotate(BlockState state, BlockRotation rotation) { + return (BlockState)state.with(FACING, rotation.rotate((Direction)state.get(FACING))); + } + + public BlockState mirror(BlockState state, BlockMirror mirror) { + return state.rotate(mirror.getRotation((Direction)state.get(FACING))); + } + + static { + WATERLOGGED = Properties.WATERLOGGED; + FACING = Properties.HORIZONTAL_FACING; + } +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/items/DiceItem.java b/src/main/java/su/a71/new_soviet/items/DiceItem.java index 727d953..07d5189 100644 --- a/src/main/java/su/a71/new_soviet/items/DiceItem.java +++ b/src/main/java/su/a71/new_soviet/items/DiceItem.java @@ -37,7 +37,7 @@ public class DiceItem extends Item { world.playSound((PlayerEntity)null, user.getX(), user.getY(), user.getZ(), NSE_Sounds.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); output.append(NewSoviet.RANDOM.nextBetween(1, this.getSides())).append(", "); } - user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2)), Config.INSTANCE.shouldAnnounceDice()); + user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2)), !Config.INSTANCE.shouldAnnounceDice()); } user.increaseStat(Stats.USED.getOrCreateStat(this), itemStack.getCount()); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java index 6266f8a..981a7c3 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java @@ -24,7 +24,11 @@ import su.a71.new_soviet.blocks.lamps.LightBulbLampBlock; import su.a71.new_soviet.blocks.lamps.TableLampBlock; import su.a71.new_soviet.blocks.lamps.VintageLampBlock; import su.a71.new_soviet.blocks.lamps.lamp_post.LampPostBaseBlock; +import su.a71.new_soviet.blocks.lamps.lamp_post.LampPostLampBlock; import su.a71.new_soviet.entity.TVBlockEntity; +import su.a71.new_soviet.util.Shapes; + +import java.util.List; public class NSE_Custom extends NSE_BaseRegistration { public static final TVBlock TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_YELLOW)); @@ -41,6 +45,30 @@ public class NSE_Custom extends NSE_BaseRegistration { public static final LightBulbLampBlock LIGHT_BULB_LAMP = new LightBulbLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.GLASS).strength(0.9f, 1.5f).mapColor(MapColor.WHITE).requiresTool()); public static final LampPostBaseBlock LAMP_POST_BASE = new LampPostBaseBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY)); + public static final LampPostLampBlock CAGED_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), + new Shapes.HorizontalShape(List.of( + List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0), + List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0), + List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0), + List.of(3.0, 9.0, 3.0, 13.0, 13.0, 7.0)))); + public static final LampPostLampBlock MODERN_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), + new Shapes.HorizontalShape(List.of( + List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0), + List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0), + List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0), + List.of(3.0, 9.0, 3.0, 13.0, 13.0, 7.0)))); + public static final LampPostLampBlock BIG_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), + new Shapes.HorizontalShape(List.of( + List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0), + List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0), + List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0), + List.of(3.0, 9.0, 3.0, 13.0, 13.0, 7.0)))); + public static final LampPostLampBlock VINTAGE_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), + new Shapes.HorizontalShape(List.of( + List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0), + List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0), + List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0), + List.of(3.0, 9.0, 3.0, 13.0, 13.0, 7.0)))); public static final CeilingFanBlock CEILING_FAN = new CeilingFanBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.WHITE)); @@ -80,6 +108,12 @@ public class NSE_Custom extends NSE_BaseRegistration { registerBlock("golden_table_lamp", () -> GOLDEN_LAMP, NSE_CUSTOM_TAB); registerBlock("vintage_lamp", () -> VINTAGE_LAMP, NSE_CUSTOM_TAB); registerBlock("light_bulb_lamp", () -> LIGHT_BULB_LAMP, NSE_CUSTOM_TAB); + + registerBlock("caged_post_lamp", () -> CAGED_POST_LAMP, NSE_CUSTOM_TAB); + registerBlock("modern_post_lamp", () -> MODERN_POST_LAMP, NSE_CUSTOM_TAB); + registerBlock("big_post_lamp", () -> BIG_POST_LAMP, NSE_CUSTOM_TAB); + registerBlock("vintage_post_lamp", () -> VINTAGE_POST_LAMP, NSE_CUSTOM_TAB); + registerBlock("lamp_post_base", () -> LAMP_POST_BASE, NSE_CUSTOM_TAB); registerBlock("ceiling_fan", () -> CEILING_FAN, NSE_CUSTOM_TAB); registerBlock("siren", () -> SIREN, NSE_CUSTOM_TAB); diff --git a/src/main/resources/assets/new_soviet/blockstates/big_post_lamp.json b/src/main/resources/assets/new_soviet/blockstates/big_post_lamp.json new file mode 100644 index 0000000..a7a357e --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/big_post_lamp.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "new_soviet:block/lamp_post_3", "uvlock": true }, + "facing=east": { "model": "new_soviet:block/lamp_post_3", "y": 90, "uvlock": false }, + "facing=south": { "model": "new_soviet:block/lamp_post_3", "y": 180, "uvlock": false }, + "facing=west": { "model": "new_soviet:block/lamp_post_3", "y": 270, "uvlock": false } + } +} diff --git a/src/main/resources/assets/new_soviet/blockstates/caged_post_lamp.json b/src/main/resources/assets/new_soviet/blockstates/caged_post_lamp.json new file mode 100644 index 0000000..8a6678c --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/caged_post_lamp.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "new_soviet:block/lamp_post", "uvlock": true }, + "facing=east": { "model": "new_soviet:block/lamp_post", "y": 90, "uvlock": false }, + "facing=south": { "model": "new_soviet:block/lamp_post", "y": 180, "uvlock": false }, + "facing=west": { "model": "new_soviet:block/lamp_post", "y": 270, "uvlock": false } + } +} diff --git a/src/main/resources/assets/new_soviet/blockstates/modern_post_lamp.json b/src/main/resources/assets/new_soviet/blockstates/modern_post_lamp.json new file mode 100644 index 0000000..8291337 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/modern_post_lamp.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "new_soviet:block/lamp_post_2", "uvlock": true }, + "facing=east": { "model": "new_soviet:block/lamp_post_2", "y": 90, "uvlock": false }, + "facing=south": { "model": "new_soviet:block/lamp_post_2", "y": 180, "uvlock": false }, + "facing=west": { "model": "new_soviet:block/lamp_post_2", "y": 270, "uvlock": false } + } +} diff --git a/src/main/resources/assets/new_soviet/blockstates/vintage_post_lamp.json b/src/main/resources/assets/new_soviet/blockstates/vintage_post_lamp.json new file mode 100644 index 0000000..1719989 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/vintage_post_lamp.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "new_soviet:block/lamp_post_4", "uvlock": true }, + "facing=east": { "model": "new_soviet:block/lamp_post_4", "y": 90, "uvlock": false }, + "facing=south": { "model": "new_soviet:block/lamp_post_4", "y": 180, "uvlock": false }, + "facing=west": { "model": "new_soviet:block/lamp_post_4", "y": 270, "uvlock": false } + } +} diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index e6a6b3d..0169ab6 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -435,5 +435,9 @@ "subtitles.new_soviet.electric_hit": "Electric shock", "block.new_soviet.vintage_lamp": "Vintage Lamp", "block.new_soviet.golden_table_lamp": "Golden Lamp", - "block.new_soviet.lamp_post_base": "Lamp Post Base" + "block.new_soviet.lamp_post_base": "Lamp Post Base", + "block.new_soviet.caged_post_lamp": "Caged Post Lamp", + "block.new_soviet.modern_post_lamp": "Modern Post Lamp", + "block.new_soviet.big_post_lamp": "Big Post Lamp", + "block.new_soviet.vintage_post_lamp": "Vintage Post Lamp" } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/lamp_post.json b/src/main/resources/assets/new_soviet/models/block/lamp_post.json new file mode 100644 index 0000000..60bfa59 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/lamp_post.json @@ -0,0 +1,165 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [48, 48], + "textures": { + "0": "new_soviet:block/lamp_post/lamp_post", + "particle": "new_soviet:block/lamp_post/lamp_post" + }, + "elements": [ + { + "from": [8, 2, -7], + "to": [8, 16, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [2.67733, 0.01067, 7.98933, 4.656], "texture": "#0"}, + "west": {"uv": [7.98933, 0.01067, 2.67733, 4.656], "texture": "#0"} + } + }, + { + "from": [6, 3, -7], + "to": [10, 10, -3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [5.344, 8.344, 6.656, 10.656], "texture": "#0"}, + "east": {"uv": [4.01067, 8.344, 5.32267, 10.656], "texture": "#0"}, + "south": {"uv": [2.67733, 8.344, 3.98933, 10.656], "texture": "#0"}, + "west": {"uv": [6.67733, 8.344, 7.98933, 10.656], "texture": "#0"}, + "up": {"uv": [5.32267, 8.32267, 4.01067, 7.01067], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.656, 7.01067, 5.344, 8.32267], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [6.5, 2, -6.5], + "to": [9.5, 3, -3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [13.01067, 9.67733, 13.98933, 9.98933], "texture": "#0"}, + "east": {"uv": [12.01067, 9.67733, 12.98933, 9.98933], "texture": "#0"}, + "south": {"uv": [11.01067, 9.67733, 11.98933, 9.98933], "texture": "#0"}, + "west": {"uv": [14.01067, 9.67733, 14.98933, 9.98933], "texture": "#0"}, + "down": {"uv": [13.98933, 8.67733, 13.01067, 9.656], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [5.5, 7, -7.5], + "to": [10.5, 9, -2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6.01067, 6.344, 7.656, 6.98933], "texture": "#0"}, + "east": {"uv": [4.344, 6.344, 5.98933, 6.98933], "texture": "#0"}, + "south": {"uv": [2.67733, 6.344, 4.32267, 6.98933], "texture": "#0"}, + "west": {"uv": [7.67733, 6.344, 9.32267, 6.98933], "texture": "#0"}, + "up": {"uv": [5.98933, 6.32267, 4.344, 4.67733], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7.656, 4.67733, 6.01067, 6.32267], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [5.5, 2.5, -5.5], + "to": [10.5, 7.5, -4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [9.67733, 10.344, 9.98933, 11.98933], "texture": "#0"}, + "west": {"uv": [12.344, 10.344, 12.656, 11.98933], "texture": "#0"}, + "down": {"uv": [10.656, 8.67733, 10.344, 10.32267], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [7.5, 2.5, -7.5], + "to": [8.5, 7.5, -2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [12.344, 10.344, 12.656, 11.98933], "texture": "#0"}, + "south": {"uv": [9.67733, 10.344, 9.98933, 11.98933], "texture": "#0"}, + "down": {"uv": [10.656, 8.67733, 10.344, 10.32267], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [7, 0, 7], + "to": [9, 12, 9], + "faces": { + "north": {"uv": [0.66667, 0.67733, 1.33333, 4.67733], "texture": "#0"}, + "east": {"uv": [0, 0.67733, 0.66667, 4.67733], "texture": "#0"}, + "south": {"uv": [2, 0.67733, 2.66667, 4.67733], "texture": "#0"}, + "west": {"uv": [1.33333, 0.67733, 2, 4.67733], "texture": "#0"}, + "up": {"uv": [1.32267, 0.656, 0.67733, 0.01067], "texture": "#0"}, + "down": {"uv": [1.98933, 0.01067, 1.344, 0.656], "texture": "#0"} + } + }, + { + "from": [6.5, 7, 6.5], + "to": [9.5, 9, 9.5], + "faces": { + "north": {"uv": [3.67733, 11.67733, 4.656, 12.32267], "texture": "#0"}, + "east": {"uv": [2.67733, 11.67733, 3.656, 12.32267], "texture": "#0"}, + "south": {"uv": [5.67733, 11.67733, 6.656, 12.32267], "texture": "#0"}, + "west": {"uv": [4.67733, 11.67733, 5.656, 12.32267], "texture": "#0"}, + "up": {"uv": [4.656, 11.656, 3.67733, 10.67733], "texture": "#0"}, + "down": {"uv": [5.656, 10.67733, 4.67733, 11.656], "texture": "#0"} + } + }, + { + "from": [6.5, 0, 6.5], + "to": [9.5, 2, 9.5], + "faces": { + "north": {"uv": [3.67733, 11.67733, 4.656, 12.32267], "texture": "#0"}, + "east": {"uv": [2.67733, 11.67733, 3.656, 12.32267], "texture": "#0"}, + "south": {"uv": [5.67733, 11.67733, 6.656, 12.32267], "texture": "#0"}, + "west": {"uv": [4.67733, 11.67733, 5.656, 12.32267], "texture": "#0"}, + "up": {"uv": [4.656, 11.656, 3.67733, 10.67733], "texture": "#0"}, + "down": {"uv": [5.656, 10.67733, 4.67733, 11.656], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [1.75, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [1.75, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, -1.75, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [-2.5, 1.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [85, -180, 90], + "translation": [-7, 22.5, 8] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -16], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0, 1, 2, 3, 4, 5] + }, + 6, + 7, + 8 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/lamp_post_2.json b/src/main/resources/assets/new_soviet/models/block/lamp_post_2.json new file mode 100644 index 0000000..10259fc --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/lamp_post_2.json @@ -0,0 +1,144 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [48, 48], + "textures": { + "1": "new_soviet:block/lamp_post/lamp_post_2", + "2": "new_soviet:block/lamp_post/lamp_post", + "particle": "new_soviet:block/lamp_post/lamp_post" + }, + "elements": [ + { + "from": [8, 2, -7], + "to": [8, 16, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [2.66667, 0, 8, 4.66667], "texture": "#1"}, + "west": {"uv": [8, 0, 2.66667, 4.66667], "texture": "#1"} + } + }, + { + "from": [4, 7, -8], + "to": [12, 10, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [8, 7.33333, 10.66667, 8.33333], "texture": "#1"}, + "east": {"uv": [5.33333, 7.33333, 8, 8.33333], "texture": "#1"}, + "south": {"uv": [2.66667, 7.33333, 5.33333, 8.33333], "texture": "#1"}, + "west": {"uv": [10.66667, 7.33333, 13.33333, 8.33333], "texture": "#1"}, + "up": {"uv": [8, 7.33333, 5.33333, 4.66667], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [4, 7, 0], + "to": [12, 10, -8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [8, 7.33333, 10.66667, 8.33333], "texture": "#1"}, + "east": {"uv": [5.33333, 7.33333, 8, 8.33333], "texture": "#1"}, + "south": {"uv": [2.66667, 7.33333, 5.33333, 8.33333], "texture": "#1"}, + "west": {"uv": [10.66667, 7.33333, 13.33333, 8.33333], "texture": "#1"}, + "up": {"uv": [8, 7.33333, 5.33333, 4.66667], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [6, 6, -6], + "to": [10, 10, -2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [10.66667, 9.66667, 12, 11], "texture": "#1"}, + "east": {"uv": [9.33333, 9.66667, 10.66667, 11], "texture": "#1"}, + "south": {"uv": [8, 9.66667, 9.33333, 11], "texture": "#1"}, + "west": {"uv": [12, 9.66667, 13.33333, 11], "texture": "#1"}, + "down": {"uv": [12, 8.33333, 10.66667, 9.66667], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [7, 0, 7], + "to": [9, 12, 9], + "faces": { + "north": {"uv": [0.66667, 0.67733, 1.33333, 4.67733], "texture": "#2"}, + "east": {"uv": [0, 0.67733, 0.66667, 4.67733], "texture": "#2"}, + "south": {"uv": [2, 0.67733, 2.66667, 4.67733], "texture": "#2"}, + "west": {"uv": [1.33333, 0.67733, 2, 4.67733], "texture": "#2"}, + "up": {"uv": [1.32267, 0.656, 0.67733, 0.01067], "texture": "#2"}, + "down": {"uv": [1.98933, 0.01067, 1.344, 0.656], "texture": "#2"} + } + }, + { + "from": [6.5, 7, 6.5], + "to": [9.5, 9, 9.5], + "faces": { + "north": {"uv": [3.67733, 11.67733, 4.656, 12.32267], "texture": "#2"}, + "east": {"uv": [2.67733, 11.67733, 3.656, 12.32267], "texture": "#2"}, + "south": {"uv": [5.67733, 11.67733, 6.656, 12.32267], "texture": "#2"}, + "west": {"uv": [4.67733, 11.67733, 5.656, 12.32267], "texture": "#2"}, + "up": {"uv": [4.656, 11.656, 3.67733, 10.67733], "texture": "#2"}, + "down": {"uv": [5.656, 10.67733, 4.67733, 11.656], "texture": "#2"} + } + }, + { + "from": [6.5, 0, 6.5], + "to": [9.5, 2, 9.5], + "faces": { + "north": {"uv": [3.67733, 11.67733, 4.656, 12.32267], "texture": "#2"}, + "east": {"uv": [2.67733, 11.67733, 3.656, 12.32267], "texture": "#2"}, + "south": {"uv": [5.67733, 11.67733, 6.656, 12.32267], "texture": "#2"}, + "west": {"uv": [4.67733, 11.67733, 5.656, 12.32267], "texture": "#2"}, + "up": {"uv": [4.656, 11.656, 3.67733, 10.67733], "texture": "#2"}, + "down": {"uv": [5.656, 10.67733, 4.67733, 11.656], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [1.75, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [1.75, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, -1, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [-2.5, 1.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [75, -180, 90], + "translation": [-7, 22.5, 8] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -16], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/lamp_post_3.json b/src/main/resources/assets/new_soviet/models/block/lamp_post_3.json new file mode 100644 index 0000000..eb98a13 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/lamp_post_3.json @@ -0,0 +1,114 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [80, 80], + "textures": { + "1": "new_soviet:block/lamp_post/lamp_post", + "2": "new_soviet:block/lamp_post/lamp_post_3", + "particle": "new_soviet:block/lamp_post/lamp_post_3" + }, + "elements": [ + { + "from": [-0.5, 2, 8], + "to": [15.5, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1.6, 6, 4.8, 8.8], "texture": "#2"}, + "south": {"uv": [4.8, 6, 1.6, 8.8], "texture": "#2"} + } + }, + { + "from": [-0.5, 2, 8], + "to": [15.5, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1.6, 6, 4.8, 8.8], "texture": "#2"}, + "south": {"uv": [4.8, 6, 1.6, 8.8], "texture": "#2"} + } + }, + { + "from": [3.5, 7, 3.5], + "to": [12.5, 16, 12.5], + "faces": { + "north": {"uv": [1.8, 1.8, 3.6, 3.6], "texture": "#2"}, + "east": {"uv": [0, 1.8, 1.8, 3.6], "texture": "#2"}, + "south": {"uv": [5.4, 1.8, 7.2, 3.6], "texture": "#2"}, + "west": {"uv": [3.6, 1.8, 5.4, 3.6], "texture": "#2"}, + "up": {"uv": [1.8, 0, 3.6, 1.8], "texture": "#2"}, + "down": {"uv": [5.4, 0, 3.6, 1.8], "texture": "#2"} + } + }, + { + "from": [7, 0, 7], + "to": [9, 12, 9], + "faces": { + "north": {"uv": [0.66667, 0.67733, 1.33333, 4.67733], "texture": "#1"}, + "east": {"uv": [0, 0.67733, 0.66667, 4.67733], "texture": "#1"}, + "south": {"uv": [2, 0.67733, 2.66667, 4.67733], "texture": "#1"}, + "west": {"uv": [1.33333, 0.67733, 2, 4.67733], "texture": "#1"}, + "down": {"uv": [1.98933, 0.01067, 1.344, 0.656], "texture": "#1"} + } + }, + { + "from": [6.5, 0, 6.5], + "to": [9.5, 2, 9.5], + "faces": { + "north": {"uv": [3.67733, 11.67733, 4.656, 12.32267], "texture": "#1"}, + "east": {"uv": [2.67733, 11.67733, 3.656, 12.32267], "texture": "#1"}, + "south": {"uv": [5.67733, 11.67733, 6.656, 12.32267], "texture": "#1"}, + "west": {"uv": [4.67733, 11.67733, 5.656, 12.32267], "texture": "#1"}, + "up": {"uv": [4.656, 11.656, 3.67733, 10.67733], "texture": "#1"}, + "down": {"uv": [5.656, 10.67733, 4.67733, 11.656], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 1, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 1, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [1.75, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [1.75, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, -2, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-90, -180, 0], + "translation": [-7, 22.5, 14.5] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -16], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0, 1, 2] + }, + 3, + 4 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/lamp_post_4.json b/src/main/resources/assets/new_soviet/models/block/lamp_post_4.json new file mode 100644 index 0000000..f5a5686 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/lamp_post_4.json @@ -0,0 +1,110 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [48, 48], + "textures": { + "0": "new_soviet:block/lamp_post/lamp_post_4", + "particle": "new_soviet:block/lamp_post/lamp_post_4" + }, + "elements": [ + { + "from": [6.5, 0, 6.5], + "to": [9.5, 2, 9.5], + "faces": { + "north": {"uv": [11.67733, 5.67733, 12.656, 6.32267], "texture": "#0"}, + "east": {"uv": [10.67733, 5.67733, 11.656, 6.32267], "texture": "#0"}, + "south": {"uv": [13.67733, 5.67733, 14.656, 6.32267], "texture": "#0"}, + "west": {"uv": [12.67733, 5.67733, 13.656, 6.32267], "texture": "#0"}, + "up": {"uv": [12.656, 5.656, 11.67733, 4.67733], "texture": "#0"}, + "down": {"uv": [13.656, 4.67733, 12.67733, 5.656], "texture": "#0"} + } + }, + { + "from": [6.5, 7, 6.5], + "to": [9.5, 9, 9.5], + "faces": { + "north": {"uv": [11.67733, 5.67733, 12.656, 6.32267], "texture": "#0"}, + "east": {"uv": [10.67733, 5.67733, 11.656, 6.32267], "texture": "#0"}, + "south": {"uv": [13.67733, 5.67733, 14.656, 6.32267], "texture": "#0"}, + "west": {"uv": [12.67733, 5.67733, 13.656, 6.32267], "texture": "#0"}, + "up": {"uv": [12.656, 5.656, 11.67733, 4.67733], "texture": "#0"}, + "down": {"uv": [13.656, 4.67733, 12.67733, 5.656], "texture": "#0"} + } + }, + { + "from": [7, 0, 7], + "to": [9, 14, 9], + "faces": { + "north": {"uv": [0.66667, 0.67733, 1.33333, 5.344], "texture": "#0"}, + "east": {"uv": [0, 0.67733, 0.66667, 5.344], "texture": "#0"}, + "south": {"uv": [2, 0.67733, 2.66667, 5.344], "texture": "#0"}, + "west": {"uv": [1.33333, 0.67733, 2, 5.344], "texture": "#0"}, + "up": {"uv": [1.32267, 0.656, 0.67733, 0.01067], "texture": "#0"}, + "down": {"uv": [1.98933, 0.01067, 1.344, 0.656], "texture": "#0"} + } + }, + { + "from": [8, 2, -7], + "to": [8, 16, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [2.66667, 0, 8, 4.66667], "texture": "#0"}, + "west": {"uv": [8, 0, 2.66667, 4.66667], "texture": "#0"} + } + }, + { + "from": [8, 14, 7], + "to": [8, 17, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [2.66667, 6.33333, 3.33333, 7.33334], "texture": "#0"}, + "west": {"uv": [3.33333, 6.33333, 2.66667, 7.33334], "texture": "#0"} + } + }, + { + "from": [3, 5, -8.5], + "to": [13, 5, 1.5], + "faces": { + "north": {"uv": [12.66667, 2.33333, 16, 2.33333], "texture": "#0"}, + "east": {"uv": [12.66667, 2.33333, 16, 2.33333], "texture": "#0"}, + "south": {"uv": [12.66667, 2.33333, 16, 2.33333], "texture": "#0"}, + "west": {"uv": [13.66667, 2.33333, 16, 2.33333], "texture": "#0"}, + "up": {"uv": [4.66667, 5, 8, 8.33333], "texture": "#0"}, + "down": {"uv": [4.66667, 5, 8, 8.33333], "texture": "#0"} + } + }, + { + "from": [6, 4, -5.5], + "to": [10, 10, -1.5], + "faces": { + "north": {"uv": [4, 9.66667, 5.33333, 11.66667], "texture": "#0"}, + "east": {"uv": [2.66667, 9.66667, 4, 11.66667], "texture": "#0"}, + "south": {"uv": [6.66667, 9.66667, 8, 11.66667], "texture": "#0"}, + "west": {"uv": [5.33333, 9.66667, 6.66667, 11.66667], "texture": "#0"}, + "up": {"uv": [4, 8.33333, 5.33333, 9.66667], "texture": "#0"}, + "down": {"uv": [5.33333, 8.33333, 6.66667, 9.66667], "rotation": 90, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [ + 0, + 1, + 2, + 3, + 4, + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [5, 6] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/lamp_post_base.json b/src/main/resources/assets/new_soviet/models/block/lamp_post_base.json index 20d9aca..67e477e 100644 --- a/src/main/resources/assets/new_soviet/models/block/lamp_post_base.json +++ b/src/main/resources/assets/new_soviet/models/block/lamp_post_base.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [48, 48], "textures": { - "0": "new_soviet:block/custom/lamp_post", - "particle": "new_soviet:block/custom/lamp_post" + "0": "new_soviet:block/lamp_post/lamp_post", + "particle": "new_soviet:block/lamp_post/lamp_post_particle" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/lamp_post_base_attached.json b/src/main/resources/assets/new_soviet/models/block/lamp_post_base_attached.json index 8ef3bed..384e1a4 100644 --- a/src/main/resources/assets/new_soviet/models/block/lamp_post_base_attached.json +++ b/src/main/resources/assets/new_soviet/models/block/lamp_post_base_attached.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [48, 48], "textures": { - "0": "new_soviet:block/custom/lamp_post", - "particle": "new_soviet:block/custom/lamp_post" + "0": "new_soviet:block/lamp_post/lamp_post", + "particle": "new_soviet:block/lamp_post/lamp_post_particle" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/item/big_post_lamp.json b/src/main/resources/assets/new_soviet/models/item/big_post_lamp.json new file mode 100644 index 0000000..7202930 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/big_post_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/lamp_post_3" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/caged_post_lamp.json b/src/main/resources/assets/new_soviet/models/item/caged_post_lamp.json new file mode 100644 index 0000000..47885c8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/caged_post_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/lamp_post" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/modern_post_lamp.json b/src/main/resources/assets/new_soviet/models/item/modern_post_lamp.json new file mode 100644 index 0000000..ab74848 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/modern_post_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/lamp_post_2" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/vintage_post_lamp.json b/src/main/resources/assets/new_soviet/models/item/vintage_post_lamp.json new file mode 100644 index 0000000..6ea387c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/vintage_post_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/lamp_post_4" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v4.png b/src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v4.png deleted file mode 100644 index 2c1bfa94ba712fbed605f89af84b16535902b9ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 830 zcmV-E1Ht@>P)Px%_(?=TRA_YEUvgJ7~%z+3kea_92jMpVvDY8O5uuQ`97-ZU7zwe<%CSq)ho0C6#L~$m5a%J z+eBIcAbAg~2wjCJ?$?db2CSRsiAejvI@^%gY(CPL7fCI@?uGlL;o*ygjjfKsj7cXCN@mq3){7)Kx_x8<{ zQx-O$T&eO>u>fGSQeqE5$7}#xwF;eX4{{XHDR|cSlmX(PJi#&z9G}$qm(QPkO6an ztQa1Tb1CKlOmZTLDwL9QU|voHL0-<=Ij>SA8G^COsNi8v37hyv7WD&a=z&qFynkJU zVQ1lV`?zUeB>tS$i<8J^XEdU7BKHiF7Lw#7+AecshE%vwwGanuR3t z3i!`X_b~ka1BRVlre2{@8X(8K%<~VuakX+V7&^ZBtG>NZ8qn)aHYC?|0U)xxN|Xj< zG8vSLg(>gT=0&$~s`slzX@Kjxo^s?-x}_s|*83y~)e|o&yRM6ifBmU*lq|Px&BS}O-RA_x3rN>y?OU0`VSQE zihqG#6~TWXhaP&8imCLVQZdl1g_^L;VGr$TJS1;A*&m(V>}H#Wd@k9U?2q@}y!Yn4 z(J*9vW0Nz+U>F7%V>oIbXt)8C=t36WFpTSzDHR%79)J*B9`En9Gyqs`u5p?RDjB6b zJvV7e>RT>3Y9DCiUi*73&9+R~mMIiHY9DB}Wfmqp0F-UZ6c)EF697Wvpc3mFo7}cc z^!i?*!bVXB5c2uB7}(n0;k~{m6pRx7`1haOg}jP#(i;uK7_m6TM3ADhS7HUo_m`V% zTn_H*Ce;c6#amcK;w(gdKW!vdVA?ECq}m6jk=amyF*f4k!SOVcI13elyu-V$3tiXY z`#w6yKVsuA7X@f<0FbE^w=EMjrz+l)q$)1=`kolb*HPmjv>P|-OX9;PT^9g2kUn$K z_j-K~zV8Eo_>Cj;3XqkCf{VGNG4%Y!OD;cKbE>F0RXk~~h<7$0uW&NZ+c&RAj54+Y z%gr_3s4oE+SWNCAsLTeyRjY8)brJLes)FO@M--4JgE!cgiLLD&{`u3#kPwDppypI@ z(se@_jC@(;f&dWp?lhET>&Zgg6qFkoV+@OphoRD$F(!Oe&K7b^6k!Nu48-~HaGnQz z9>8Tx6j48wf-!JaOhiFertBfl6+xynDp{CQz!rU`lv)AW?ty`;yn9uL=~Uo#&v4N> z$D^mkc50~=khgoHWG}$77x1_9B{#v6lIm0#0l4T&nlwBt#lR6y5tH0nzu)~C&j zPT^GlPZFg9zV8d+$f9&gN8`Bviy%=?Jnq={eH{Kf8>yp$s`@0#l$ZodB6=dp(mdKI;Vst0Odq6 AbN~PV literal 0 HcmV?d00001