diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 925c627..e92a9b6 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -23,11 +23,6 @@ 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/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index 4458b5a..0643e65 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -9,7 +9,6 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.ItemModelGenerator; @@ -826,12 +825,6 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Custom.RED_TV) .add(NSE_Custom.BROWN_TV); - getOrCreateTagBuilder(NSE_Tags.Blocks.POST_LAMPS) - .add(NSE_Custom.CAGED_POST_LAMP) - .add(NSE_Custom.VINTAGE_POST_LAMP) - .add(NSE_Custom.MODERN_POST_LAMP) - .add(NSE_Custom.BIG_POST_LAMP); - getOrCreateTagBuilder(BlockTags.DOORS) .add(NSE_Blocks.CHISELED_BIRCH_DOOR) .add(NSE_Blocks.CHISELED_OAK_DOOR) @@ -1793,7 +1786,6 @@ public class DataGeneration implements DataGeneratorEntrypoint { @Override public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { -// BlockStateModelGenerator.createSlabBlockState() // BlockStateModelGenerator.createWallBlockState() // BlockStateModelGenerator.createStairsBlockState(NSE_Blocks.SAND_TILES_STAIRS, new Identifier(NewSoviet.MOD_ID, "sand_tiles_stairs")); } diff --git a/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java b/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java index 48bac06..82e879c 100644 --- a/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java @@ -20,24 +20,24 @@ 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.gen.feature.util.CaveSurface; import su.a71.new_soviet.entity.TVBlockEntity; +import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.util.Shapes; + import java.util.List; +import java.util.Objects; import static net.minecraft.block.StairsBlock.HALF; import static net.minecraft.block.StairsBlock.SHAPE; -// FIXME: 05.09.2023 This class can probably be improved further. -// By the way, Blockstate not updating when removing stairs is a "creative decision" apparently -// - Andrew71 -public class HandrailBlock extends HorizontalFacingBlock implements BlockEntityProvider, Waterloggable { +public class HandrailBlock extends HorizontalFacingBlock implements BlockEntityProvider { protected static final Shapes.HorizontalShape2 SHAPE1; protected static final Shapes.HorizontalShape2 SHAPE2; protected static final Shapes.HorizontalShape2 SHAPE3; public static final BooleanProperty WATERLOGGED; - public static final IntProperty ROTATION; + public static final IntProperty ROTATE; public HandrailBlock(Settings settings) { super(settings.sounds(BlockSoundGroup.METAL).pistonBehavior(PistonBehavior.BLOCK).strength(1f, 2f)); @@ -46,17 +46,17 @@ public class HandrailBlock extends HorizontalFacingBlock implements BlockEntityP @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(Properties.HORIZONTAL_FACING, WATERLOGGED, ROTATION); + builder.add(Properties.HORIZONTAL_FACING, WATERLOGGED, ROTATE); } public FluidState getFluidState(BlockState state) { - return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state); + return (Boolean)state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state); } @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) { Direction dir = state.get(FACING); - int rot = state.get(ROTATION); + int rot = state.get(ROTATE); return switch (dir) { case NORTH -> switch (rot) { case 1 -> SHAPE1.north(); @@ -88,31 +88,54 @@ public class HandrailBlock extends HorizontalFacingBlock implements BlockEntityP @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - int rot = getRotation(ctx.getWorld().getBlockState(ctx.getBlockPos().down()), ctx); - return this.getDefaultState() + FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos()); + boolean bl = fluidState.getFluid() == Fluids.WATER; + int rot = 2; + BlockPos under = new BlockPos(ctx.getBlockPos().getX(), ctx.getBlockPos().getY() - 1, ctx.getBlockPos().getZ()); + if (istruestairs1(ctx.getWorld().getBlockState(ctx.getBlockPos().down(1)), ctx)) { + rot = 1; + } else if (istruestairs2(ctx.getWorld().getBlockState(ctx.getBlockPos().down(1)), ctx)) { + rot = 3; + } + return (BlockState)this.getDefaultState() .with(WATERLOGGED, ctx.getWorld().getFluidState(ctx.getBlockPos()).getFluid() == Fluids.WATER) .with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()) - .with(ROTATION, rot); + .with(ROTATE, rot); + } - private int getRotation(BlockState state, ItemPlacementContext ctx) { - if (state.isIn(BlockTags.STAIRS) && ((state.get(SHAPE) == StairShape.STRAIGHT) && state.get(HALF) == BlockHalf.BOTTOM)) { - if (returnFacing(state.get(FACING)) == ctx.getHorizontalPlayerFacing().getOpposite()) { - return 1; - } else if (state.get(FACING) == returnFacing(ctx.getHorizontalPlayerFacing().getOpposite())) { - return 3; + private boolean istruestairs1(BlockState blockState, ItemPlacementContext ctx) { + boolean output = false; + if (blockState.isIn(BlockTags.STAIRS)) { + boolean h = blockState.get(SHAPE) == StairShape.STRAIGHT; + if (h && blockState.get(HALF) == BlockHalf.BOTTOM && returnFacing(blockState.get(FACING).getName()) == ctx.getHorizontalPlayerFacing().getOpposite().getName()) { + output = true; } } - return 2; + return output; } - private Direction returnFacing(Direction facing) { - return switch (facing) { - case NORTH -> Direction.WEST; - case WEST -> Direction.SOUTH; - case SOUTH -> Direction.EAST; - default -> Direction.NORTH; - }; + private boolean istruestairs2(BlockState blockState, ItemPlacementContext ctx) { + boolean output = false; + if (blockState.isIn(BlockTags.STAIRS)) { + boolean h = blockState.get(SHAPE) == StairShape.STRAIGHT; + if (h && blockState.get(HALF) == BlockHalf.BOTTOM && blockState.get(FACING).getName() == returnFacing(ctx.getHorizontalPlayerFacing().getOpposite().getName())) { + output = true; + } + } + return output; + } + + private String returnFacing(String facing1) { + String facing2 = "north"; + if (facing1 == "north") { + facing2 = "west"; + } else if (facing1 == "west") { + facing2 = "south"; + } else if (facing1 == "south") { + facing2 = "east"; + } + return facing2; } @Override @@ -121,17 +144,22 @@ public class HandrailBlock extends HorizontalFacingBlock implements BlockEntityP } 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)); + if (!state.canPlaceAt(world, pos)) { + return Blocks.AIR.getDefaultState(); + } else { + if ((Boolean)state.get(WATERLOGGED)) { + world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + } + + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); } - return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); } static { SHAPE2 = new Shapes.HorizontalShape2(List.of(List.of(0.0, 0.0, 15.0, 16.0, 17.0, 16.0), List.of(0.0, 17.0, 14.5, 16.0, 19.0, 16.5))); SHAPE1 = new Shapes.HorizontalShape2(List.of(List.of(0.0, 0.0, 15.0, 8.0, 18.0, 16.0), List.of(8.0, -8.0, 15.0, 16.0, 10.0, 16.0))); SHAPE3 = new Shapes.HorizontalShape2(List.of(List.of(0.0, -8.0, 15.0, 8.0, 10.0, 16.0), List.of(8.0, 0.0, 15.0, 16.0, 18.0, 16.0))); - ROTATION = IntProperty.of("rotate", 1, 3);; + ROTATE = IntProperty.of("rotate", 1, 3);; WATERLOGGED = Properties.WATERLOGGED; } } \ 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 f51f6f9..b607968 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,6 +59,16 @@ 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 deleted file mode 100644 index fda08f7..0000000 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java +++ /dev/null @@ -1,106 +0,0 @@ -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; - -import java.util.List; - -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/CigaretteItem.java b/src/main/java/su/a71/new_soviet/items/CigaretteItem.java index 3d19a1c..8136ee2 100644 --- a/src/main/java/su/a71/new_soviet/items/CigaretteItem.java +++ b/src/main/java/su/a71/new_soviet/items/CigaretteItem.java @@ -1,20 +1,25 @@ package su.a71.new_soviet.items; import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.Entity; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.*; +import net.minecraft.particle.DustParticleEffect; +import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundCategory; import net.minecraft.stat.Stats; import net.minecraft.text.Text; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; import net.minecraft.world.World; import net.minecraft.entity.LivingEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.sound.SoundEvents; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import org.jetbrains.annotations.Nullable; @@ -77,9 +82,8 @@ public class CigaretteItem extends Item { @Override public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { user.setMovementSpeed(1.1f); - if (stack.getDamage() < durationInTicks - 1) { - stack.damage(1, user, e -> e.sendEquipmentBreakStatus(!(user.getMainHandStack() == stack) ? EquipmentSlot.OFFHAND : EquipmentSlot.MAINHAND)); - } + if (stack.getDamage() < durationInTicks - 1) + stack.damage(1, user, e -> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); double d = user.getX(); double e = user.getY() + user.getHeight(); @@ -99,11 +103,10 @@ public class CigaretteItem extends Item { @Override public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int remainingUseTicks) { if (stack.getDamage() < (durationInTicks - 1)) { - stack.damage(1, user, e -> e.sendEquipmentBreakStatus(!(user.getMainHandStack() == stack) ? EquipmentSlot.OFFHAND : EquipmentSlot.MAINHAND)); + stack.damage(1, user, e -> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); world.playSound(user, BlockPos.ofFloored(user.getPos()), NSE_Sounds.CIGARETTE_PAUSE, SoundCategory.PLAYERS, 1.0f, 1.0f); } else if (stack.getDamage() >= (durationInTicks - 2)) { - - user.equipStack((!(user.getMainHandStack() == stack) ? EquipmentSlot.OFFHAND : EquipmentSlot.MAINHAND), new ItemStack(returnedItem)); + user.equipStack(EquipmentSlot.MAINHAND, new ItemStack(returnedItem)); world.playSound(user, BlockPos.ofFloored(user.getPos()), NSE_Sounds.CIGARETTE_STOPPED, SoundCategory.PLAYERS, 1.0f, 1.0f); } double d = user.getX(); 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 85d4760..727d953 100644 --- a/src/main/java/su/a71/new_soviet/items/DiceItem.java +++ b/src/main/java/su/a71/new_soviet/items/DiceItem.java @@ -37,13 +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(", "); } - if (Config.INSTANCE.shouldAnnounceDice()) { - world.getPlayers().forEach(player -> { - player.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown_announce" : "item.new_soviet.dice.thrown_multiple_announce", user.getDisplayName()).append(" " + output.subSequence(0, output.length() - 2)), false); - }); - } else { - 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)), true); - } + 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 7814a20..6266f8a 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,11 +24,7 @@ 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)); @@ -45,26 +41,6 @@ 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(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), - List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), - List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), - List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.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(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), - List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), - List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), - List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.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(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), - List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), - List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), - List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.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(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), - List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), - List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), - List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.0)))); public static final CeilingFanBlock CEILING_FAN = new CeilingFanBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.WHITE)); @@ -104,12 +80,6 @@ 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/java/su/a71/new_soviet/registration/NSE_Tags.java b/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java index 2155253..f66073b 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java @@ -11,7 +11,5 @@ public class NSE_Tags extends NSE_BaseRegistration{ public static final TagKey RAKE_MINEABLE = createTag("rake"); public static final TagKey TV = createTag("tv"); - public static final TagKey POST_LAMPS = createTag("post_lamps"); - } } 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 deleted file mode 100644 index a7a357e..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/big_post_lamp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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 deleted file mode 100644 index 8a6678c..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/caged_post_lamp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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 deleted file mode 100644 index 8291337..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/modern_post_lamp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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 deleted file mode 100644 index 1719989..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/vintage_post_lamp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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 160be07..e6a6b3d 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -158,8 +158,6 @@ "item.new_soviet.dice_d20.tooltip": "Twenty sides", "item.new_soviet.dice.thrown": "Dice was thrown with result:", "item.new_soviet.dice.thrown_multiple": "Dice were thrown with result:", - "item.new_soviet.dice.thrown_announce": "Dice was thrown by %s with result:", - "item.new_soviet.dice.thrown_multiple_announce": "Dice were thrown by %s with result:", "subtitles.new_soviet.dice_throw": "Dice thrown", "block.new_soviet.landmine": "AP Landmine", "block.new_soviet.chiseled_mangrove_door": "Chiseled Mangrove Door", @@ -437,9 +435,5 @@ "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.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" + "block.new_soviet.lamp_post_base": "Lamp Post Base" } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/caged_lamp.json b/src/main/resources/assets/new_soviet/models/block/caged_lamp.json deleted file mode 100644 index 6a3e03e..0000000 --- a/src/main/resources/assets/new_soviet/models/block/caged_lamp.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [48, 48], - "textures": { - "0": "lamp_post", - "particle": "lamp_post" - }, - "elements": [ - { - "from": [6, 1, 6], - "to": [10, 8, 10], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [5.344, 8.344, 6.656, 10.656], "rotation": 180, "texture": "#0"}, - "east": {"uv": [6.67733, 8.344, 7.98933, 10.656], "rotation": 180, "texture": "#0"}, - "south": {"uv": [2.67733, 8.344, 3.98933, 10.656], "rotation": 180, "texture": "#0"}, - "west": {"uv": [4.01067, 8.344, 5.32267, 10.656], "rotation": 180, "texture": "#0"}, - "up": {"uv": [6.656, 7.01067, 5.344, 8.32267], "rotation": 90, "texture": "#0"}, - "down": {"uv": [5.32267, 8.32267, 4.01067, 7.01067], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [6.5, 8, 6.5], - "to": [9.5, 9, 9.5], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [13.01067, 9.67733, 13.98933, 9.98933], "rotation": 180, "texture": "#0"}, - "east": {"uv": [14.01067, 9.67733, 14.98933, 9.98933], "rotation": 180, "texture": "#0"}, - "south": {"uv": [11.01067, 9.67733, 11.98933, 9.98933], "rotation": 180, "texture": "#0"}, - "west": {"uv": [12.01067, 9.67733, 12.98933, 9.98933], "rotation": 180, "texture": "#0"}, - "up": {"uv": [13.98933, 8.67733, 13.01067, 9.656], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [5.5, 2, 5.5], - "to": [10.5, 4, 10.5], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [6.01067, 6.344, 7.656, 6.98933], "rotation": 180, "texture": "#0"}, - "east": {"uv": [7.67733, 6.344, 9.32267, 6.98933], "rotation": 180, "texture": "#0"}, - "south": {"uv": [2.67733, 6.344, 4.32267, 6.98933], "rotation": 180, "texture": "#0"}, - "west": {"uv": [4.344, 6.344, 5.98933, 6.98933], "rotation": 180, "texture": "#0"}, - "up": {"uv": [7.656, 4.67733, 6.01067, 6.32267], "rotation": 90, "texture": "#0"}, - "down": {"uv": [5.98933, 6.32267, 4.344, 4.67733], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [5.5, 3.5, 7.5], - "to": [10.5, 8.5, 8.5], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]}, - "faces": { - "east": {"uv": [12.344, 10.344, 12.656, 11.98933], "rotation": 180, "texture": "#0"}, - "west": {"uv": [9.67733, 10.344, 9.98933, 11.98933], "rotation": 180, "texture": "#0"}, - "up": {"uv": [10.656, 8.67733, 10.344, 10.32267], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [7.5, 3.5, 5.5], - "to": [8.5, 8.5, 10.5], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [12.344, 10.344, 12.656, 11.98933], "rotation": 180, "texture": "#0"}, - "south": {"uv": [9.67733, 10.344, 9.98933, 11.98933], "rotation": 180, "texture": "#0"}, - "up": {"uv": [10.656, 8.67733, 10.344, 10.32267], "texture": "#0"} - } - }, - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "faces": { - "north": {"uv": [4.33333, 6.33333, 6, 6.66667], "texture": "#0"}, - "east": {"uv": [4.33333, 6.33333, 6, 6.66667], "texture": "#0"}, - "south": {"uv": [4.33333, 6.33333, 6, 6.66667], "texture": "#0"}, - "west": {"uv": [4.33333, 6.33333, 6, 6.66667], "texture": "#0"}, - "up": {"uv": [4.33333, 4.66667, 6, 6.33333], "texture": "#0"}, - "down": {"uv": [4.33333, 4.66667, 6, 6.33333], "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, - "children": [0, 1, 2, 3, 4] - }, - 5 - ] -} \ 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 deleted file mode 100644 index 60bfa59..0000000 --- a/src/main/resources/assets/new_soviet/models/block/lamp_post.json +++ /dev/null @@ -1,165 +0,0 @@ -{ - "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 deleted file mode 100644 index 10259fc..0000000 --- a/src/main/resources/assets/new_soviet/models/block/lamp_post_2.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "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 deleted file mode 100644 index eb98a13..0000000 --- a/src/main/resources/assets/new_soviet/models/block/lamp_post_3.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "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 deleted file mode 100644 index f5a5686..0000000 --- a/src/main/resources/assets/new_soviet/models/block/lamp_post_4.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "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 67e477e..20d9aca 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/lamp_post/lamp_post", - "particle": "new_soviet:block/lamp_post/lamp_post_particle" + "0": "new_soviet:block/custom/lamp_post", + "particle": "new_soviet:block/custom/lamp_post" }, "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 384e1a4..8ef3bed 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/lamp_post/lamp_post", - "particle": "new_soviet:block/lamp_post/lamp_post_particle" + "0": "new_soviet:block/custom/lamp_post", + "particle": "new_soviet:block/custom/lamp_post" }, "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 deleted file mode 100644 index 7202930..0000000 --- a/src/main/resources/assets/new_soviet/models/item/big_post_lamp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 47885c8..0000000 --- a/src/main/resources/assets/new_soviet/models/item/caged_post_lamp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index ab74848..0000000 --- a/src/main/resources/assets/new_soviet/models/item/modern_post_lamp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 6ea387c..0000000 --- a/src/main/resources/assets/new_soviet/models/item/vintage_post_lamp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/lamp_post_4" -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post.png b/src/main/resources/assets/new_soviet/textures/block/custom/lamp_post.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post.png rename to src/main/resources/assets/new_soviet/textures/block/custom/lamp_post.png diff --git a/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_2.png b/src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v2.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_2.png rename to src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v2.png diff --git a/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_3.png b/src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v3.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_3.png rename to src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v3.png 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 new file mode 100644 index 0000000..2c1bfa9 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/lamp_post_v4.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_base.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_base.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_base.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_base.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_off.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_off.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_off.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_off.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_off.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_off_l.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_off.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_off_l.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_on.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_on.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_on.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_on.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_on.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_on_l.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/big_lamp_on.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/big_lamp_on_l.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_off.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_off.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_off.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_off.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_off.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_off.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_off.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_off.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_on.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_on.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_on.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_on.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_on.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_on.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/linear_lamp_on.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/diff_lamp_on.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_off.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_off.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_off.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_off.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_off.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_off.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_off.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_off.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_on.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_on.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_on.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_on.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_on.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_on.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/caged_lamp_on.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/inc_lamp_on.png diff --git a/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/ceil_lamp_off.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_off.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/industrial/lamps/ceil_lamp_off.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_off.png diff --git a/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/warm_ceil_lamp_on.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_on.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/industrial/lamps/warm_ceil_lamp_on.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_on.png diff --git a/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/warm_ceil_lamp_on.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_on_1.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/industrial/lamps/warm_ceil_lamp_on.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_on_1.json diff --git a/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/cold_ceil_lamp_on.png b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_on_2.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/industrial/lamps/cold_ceil_lamp_on.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_on_2.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/wall_linear_lamp_break.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/uf_lamp_break.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/wall_linear_lamp_break.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/uf_lamp_break.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/wall_linear_lamp_off.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/uf_lamp_off.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/wall_linear_lamp_off.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/uf_lamp_off.json diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/lamps/wall_linear_lamp_on.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/uf_lamp_on.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/lamps/wall_linear_lamp_on.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/uf_lamp_on.json diff --git a/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_4.png b/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_4.png deleted file mode 100644 index 414168e..0000000 Binary files a/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_4.png and /dev/null differ diff --git a/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_particle.png b/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_particle.png deleted file mode 100644 index 5b53fa2..0000000 Binary files a/src/main/resources/assets/new_soviet/textures/block/lamp_post/lamp_post_particle.png and /dev/null differ