From 55724bb0a24f75aa81f47b53d64c2e8ae8df8386 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Thu, 19 Oct 2023 20:59:58 +0300 Subject: [PATCH] Various fixes and changes, see CHANGELOG --- CHANGELOG | 29 ++- LICENSE | 4 +- TODO.md | 11 +- gradle.properties | 2 +- .../su/a71/new_soviet/NewSovietClient.java | 2 + .../loot_tables/blocks/barbed_wire.json | 10 + .../loot_tables/blocks/dirt_road.json | 30 ++- .../new_soviet/blocks/CeilingFanBlock.java | 2 +- .../new_soviet/blocks/RadioReceiverBlock.java | 36 ++- .../su/a71/new_soviet/blocks/TVBlock.java | 31 ++- .../new_soviet/datagen/BlockLootTables.java | 18 +- .../new_soviet/blockstates/black_checker.json | 8 +- .../new_soviet/blockstates/brown_tv.json | 118 +++++++-- .../assets/new_soviet/blockstates/red_tv.json | 110 ++++++-- .../assets/new_soviet/blockstates/tv.json | 118 +++++++-- .../new_soviet/blockstates/white_checker.json | 8 +- .../block/beige_concrete_with_bars.json | 2 +- .../new_soviet/models/block/caged_lamp.json | 2 +- .../models/block/ceiling_fan_off.json | 152 ++++++----- .../models/block/ceiling_fan_on.json | 119 +++++---- .../new_soviet/models/block/ceiling_lamp.json | 2 +- .../block/{ => checkers}/black_checker.json | 0 .../block/{ => checkers}/black_checker2.json | 0 .../block/{ => checkers}/black_checker3.json | 0 .../block/{ => checkers}/black_checker4.json | 0 .../block/{ => checkers}/white_checker.json | 0 .../block/{ => checkers}/white_checker2.json | 0 .../block/{ => checkers}/white_checker3.json | 0 .../block/{ => checkers}/white_checker4.json | 0 .../new_soviet/models/block/chess/bishop.json | 78 +++--- .../models/block/chess/black/bishop.json | 127 +--------- .../models/block/chess/black/king.json | 238 +----------------- .../models/block/chess/black/knight.json | 139 +--------- .../models/block/chess/black/pawn.json | 113 +-------- .../models/block/chess/black/queen.json | 182 +------------- .../models/block/chess/black/rook.json | 128 +--------- .../new_soviet/models/block/chess/king.json | 196 +++++++++++---- .../new_soviet/models/block/chess/knight.json | 90 +++---- .../new_soviet/models/block/chess/pawn.json | 66 ++--- .../new_soviet/models/block/chess/queen.json | 136 ++++++---- .../new_soviet/models/block/chess/rook.json | 78 +++--- .../models/block/chess/white/bishop.json | 127 +--------- .../models/block/chess/white/king.json | 238 +----------------- .../models/block/chess/white/knight.json | 139 +--------- .../models/block/chess/white/pawn.json | 113 +-------- .../models/block/chess/white/queen.json | 182 +------------- .../models/block/chess/white/rook.json | 128 +--------- .../models/block/concrete_wall_inventory.json | 2 +- .../models/block/concrete_wall_post.json | 2 +- .../models/block/concrete_wall_side.json | 2 +- .../models/block/concrete_wall_side_tall.json | 2 +- .../assets/new_soviet/models/block/crate.json | 2 +- .../models/block/golden_table_lamp.json | 2 +- .../models/block/handrail/handrail.json | 2 +- .../models/block/handrail/handrail_left.json | 2 +- .../models/block/handrail/handrail_right.json | 2 +- .../new_soviet/models/block/lamp_post.json | 2 +- .../new_soviet/models/block/lamp_post_2.json | 2 +- .../new_soviet/models/block/lamp_post_3.json | 2 +- .../new_soviet/models/block/lamp_post_4.json | 2 +- .../models/block/lamp_post_base.json | 2 +- .../models/block/lamp_post_base_attached.json | 2 +- .../new_soviet/models/block/landmine.json | 2 +- .../models/block/light_bulb_broken.json | 2 +- .../models/block/light_bulb_on.json | 2 +- .../new_soviet/models/block/purple_goo_1.json | 2 +- .../new_soviet/models/block/purple_goo_2.json | 2 +- .../new_soviet/models/block/purple_goo_3.json | 2 +- .../new_soviet/models/block/purple_goo_4.json | 2 +- .../new_soviet/models/block/purple_goo_5.json | 2 +- .../new_soviet/models/block/purple_goo_6.json | 2 +- .../new_soviet/models/block/purple_goo_7.json | 2 +- .../new_soviet/models/block/purple_goo_8.json | 2 +- .../models/block/radio_receiver.json | 2 +- .../assets/new_soviet/models/block/siren.json | 2 +- .../models/block/switch_type_1_off.json | 2 +- .../models/block/switch_type_1_on.json | 2 +- .../models/block/switch_type_2_off.json | 2 +- .../models/block/switch_type_2_off_fix.json | 2 +- .../models/block/switch_type_2_on.json | 2 +- .../new_soviet/models/block/table_lamp.json | 2 +- .../assets/new_soviet/models/block/tv/tv.json | 2 +- .../new_soviet/models/block/vintage_lamp.json | 2 +- .../new_soviet/models/item/black_bishop.json | 3 +- .../new_soviet/models/item/black_checker.json | 5 +- .../new_soviet/models/item/black_king.json | 3 +- .../new_soviet/models/item/black_knight.json | 3 +- .../new_soviet/models/item/black_pawn.json | 3 +- .../new_soviet/models/item/black_queen.json | 3 +- .../new_soviet/models/item/black_rook.json | 3 +- .../new_soviet/models/item/brown_tv.json | 3 +- .../new_soviet/models/item/ceiling_fan.json | 3 +- .../new_soviet/models/item/cigarette.json | 2 +- .../models/item/cigarette_butt.json | 2 +- .../item/cracked_light_blue_bricks_slab.json | 3 +- .../cracked_light_blue_bricks_stairs.json | 3 +- .../new_soviet/models/item/dark_switch.json | 3 +- .../new_soviet/models/item/dice_d4.json | 3 +- .../new_soviet/models/item/dice_d6.json | 3 +- .../new_soviet/models/item/handrail.json | 3 +- .../assets/new_soviet/models/item/meat.json | 3 +- .../new_soviet/models/item/meat_eye.json | 3 +- .../new_soviet/models/item/meat_teeth.json | 3 +- .../new_soviet/models/item/purple_goo.json | 3 +- .../assets/new_soviet/models/item/rake.json | 2 +- .../assets/new_soviet/models/item/red_tv.json | 3 +- .../assets/new_soviet/models/item/siren.json | 3 +- .../assets/new_soviet/models/item/tv.json | 3 +- .../new_soviet/models/item/vintage_lamp.json | 3 +- .../new_soviet/models/item/white_bishop.json | 3 +- .../new_soviet/models/item/white_checker.json | 5 +- .../new_soviet/models/item/white_king.json | 3 +- .../new_soviet/models/item/white_knight.json | 3 +- .../new_soviet/models/item/white_pawn.json | 3 +- .../new_soviet/models/item/white_queen.json | 3 +- .../new_soviet/models/item/white_rook.json | 3 +- .../block/custom/appliances/bathroom.json | 204 --------------- .../block/custom/appliances/bathroom.png | Bin 2135 -> 0 bytes .../block/custom/appliances/ceiling_fan.png | Bin 0 -> 479 bytes .../block/custom/appliances/fan_animated.png | Bin 1421 -> 1440 bytes .../block/custom/appliances/fan_base.png | Bin 693 -> 0 bytes .../custom/appliances/fan_base_particle.png | Bin 287 -> 0 bytes .../block/custom/appliances/fan_static.png | Bin 456 -> 398 bytes .../block/custom/appliances/fridge.json | 23 -- .../block/custom/appliances/fridge.png | Bin 2334 -> 0 bytes .../block/custom/appliances/sink.json | 144 ----------- .../textures/block/custom/appliances/sink.png | Bin 1963 -> 0 bytes .../block/custom/appliances/toilet.json | 112 --------- .../block/custom/appliances/toilet.png | Bin 1877 -> 0 bytes .../block/custom/appliances/wash_basin.json | 151 ----------- .../block/custom/appliances/wash_basin.png | Bin 1843 -> 0 bytes .../custom/electronics/brown_television.png | Bin 1346 -> 0 bytes .../electronics/brown_television_particle.png | Bin 328 -> 0 bytes .../custom/electronics/red_television.png | Bin 1360 -> 0 bytes .../electronics/red_television_particle.png | Bin 308 -> 0 bytes .../block/custom/electronics/television.png | Bin 1458 -> 0 bytes .../electronics/television_particle.png | Bin 326 -> 0 bytes .../block/custom/furniture/bedside_table.json | 93 ------- .../block/custom/furniture/bedside_table.png | Bin 1479 -> 0 bytes src/main/resources/fabric.mod.json | 4 +- 140 files changed, 1074 insertions(+), 3141 deletions(-) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/black_checker.json (100%) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/black_checker2.json (100%) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/black_checker3.json (100%) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/black_checker4.json (100%) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/white_checker.json (100%) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/white_checker2.json (100%) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/white_checker3.json (100%) rename src/main/resources/assets/new_soviet/models/block/{ => checkers}/white_checker4.json (100%) delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/bathroom.json delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/bathroom.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/ceiling_fan.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base_particle.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/fridge.json delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/fridge.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/sink.json delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/sink.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/toilet.json delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/toilet.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/wash_basin.json delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/wash_basin.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/brown_television.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/brown_television_particle.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/red_television.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/red_television_particle.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/television.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/television_particle.png delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/furniture/bedside_table.json delete mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/furniture/bedside_table.png diff --git a/CHANGELOG b/CHANGELOG index 0cdd7ec..91cd50d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,25 @@ -0.1 -> 0.2 +### Changelog 0.1 -> 0.2 * Added new "Dirt Road" block - * Made by tilling coarse dirt with a rake + * Made by tilling coarse dirt with a rake. Right now you get 1 flint out of the process as a placeholder drop * Behaves like gravel -* Added golden lamp crafting recipe + * Drops with silk touch, otherwise result is dirt + * Texture will likely be adjusted in a future update * Improved TVs - * Re-made textures and models - * Added white noise animation if TV is powered with redstone - * Added cracked screen if TV is hit with a snowball + * Re-made texture and model to better fit the USSR aesthetic + * Added white noise animation if TV is powered with redstone or right-clicked (same as lamps). White noise emits a bit of light. + * Added cracked screen if TV is hit with a snowball (reset when block is broken) * TVs can now be waterlogged -* Re-made Radio texure and model to make it fit the USSR aesthetic more -* Several tiny fixes \ No newline at end of file +* Improved Radio + * Re-made texture and model to better fit the USSR aesthetic + * Added ability to waterlog radios +* Re-made ceiling fan texture and model to better fit the USSR aesthetic +* Added golden lamp crafting recipe +* Several tiny fixes + * Light bulb break noise is now in correct category + * Barbed wire drops iron nugget without silk touch + * Expanded description and removed dead link in metadata +* Technical changes + * Optimised chess model files + * Removed several unused textures (may reduce file size) + * Updated one of authors' nicks in credits + * Moved to newer versions of Yarn, Loom, Fabric loader & API \ No newline at end of file diff --git a/LICENSE b/LICENSE index 3d07e08..2ac819c 100644 --- a/LICENSE +++ b/LICENSE @@ -5,7 +5,7 @@ the license below. The only exceptions are some files in /src/main/resources/assets/new_soviet/sounds, see relevant LICENSE file there All Rights Reserved -Copyright (c) 2023 Andrey Nikitin and Рюжин Юрий. +Copyright (c) 2023 Andrew_7_1 and Feulim Temly. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR @@ -16,7 +16,7 @@ All other files within this repository are subject to the license below. MIT License -Copyright (c) 2023 Andrey Nikitin. +Copyright (c) 2023 Andrew_7_1. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/TODO.md b/TODO.md index 97aa041..801b4ce 100644 --- a/TODO.md +++ b/TODO.md @@ -4,12 +4,15 @@ * Add (with functionality) present appliance/furniture/electronics textures * Cigarette and handrail are BROKEN and the code is a MESS sorry, but it needs CLEANUP * Fix post lamp hitboxes -* Add credits in models - -* Create integration - tags, recipes +* Better landmines + * more types + * create integration ("landmine base" item) +* Add pipes/heating +* Add rubbish, rocks +* Figure out electronic devices - function + === ACHIEVEMENTS === -Kolkhoz warrior - kill someone with a sickle Gambler - throw dice 100 times One In 64 Million - roll perfect d20 x 6 Serious Addiction - throw a dice 1000 times, and then reevaluate your life choices diff --git a/gradle.properties b/gradle.properties index 1976e9e..ae18aef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10 loader_version=0.14.23 # Mod Properties -mod_version=0.1 +mod_version=0.2 maven_group=su.a71 mod_id=new_soviet diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index cb7c049..a9b27a7 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -41,6 +41,8 @@ public class NewSovietClient implements ClientModInitializer { // BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.TV, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RED_TV, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.BROWN_TV, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RADIO_RECEIVER, RenderLayer.getCutout()); diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/barbed_wire.json b/src/main/generated/data/new_soviet/loot_tables/blocks/barbed_wire.json index 54b86d4..1d0cfb2 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/barbed_wire.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/barbed_wire.json @@ -1,6 +1,16 @@ { "type": "minecraft:block", "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:iron_nugget" + } + ], + "rolls": 1.0 + }, { "bonus_rolls": 0.0, "conditions": [ diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/dirt_road.json b/src/main/generated/data/new_soviet/loot_tables/blocks/dirt_road.json index 7b4acd3..523572d 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/dirt_road.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/dirt_road.json @@ -3,11 +3,6 @@ "pools": [ { "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], "entries": [ { "type": "minecraft:item", @@ -15,6 +10,31 @@ } ], "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:dirt_road" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java b/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java index ed69602..9958218 100644 --- a/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java @@ -83,7 +83,7 @@ public class CeilingFanBlock extends Block implements Waterloggable { } static { - SHAPE = VoxelShapes.union(Block.createCuboidShape(4.0, 2.0, 4.0, 12.0, 7.0, 12.0), Block.createCuboidShape(7.0, 7.0, 7.0, 9.0, 13.0, 9.0), Block.createCuboidShape(6.0, 13.0, 6.0, 10.0, 16.0, 10.0)); + SHAPE = VoxelShapes.union(Block.createCuboidShape(4.0, 1.0, 4.0, 12.0, 4.0, 12.0), Block.createCuboidShape(6.5, 3.0, 6.5, 9.5, 7.0, 9.5), Block.createCuboidShape(7.5, 7.0, 7.5, 8.5, 13.0, 8.5), Block.createCuboidShape(6.5, 13.0, 6.5, 9.5, 16.0, 9.5)); ON = RedstoneTorchBlock.LIT; WATERLOGGED = Properties.WATERLOGGED; } diff --git a/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java b/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java index cb48fda..c85fd7b 100644 --- a/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java @@ -3,25 +3,33 @@ package su.a71.new_soviet.blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; 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; + +public class RadioReceiverBlock extends HorizontalFacingBlock implements Waterloggable { + public static final BooleanProperty WATERLOGGED; -public class RadioReceiverBlock extends HorizontalFacingBlock { public RadioReceiverBlock() { super(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.PALE_YELLOW)); - setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH)); + setDefaultState(getDefaultState() + .with(Properties.HORIZONTAL_FACING, Direction.NORTH) + .with(WATERLOGGED, false)); } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(Properties.HORIZONTAL_FACING); + builder.add(Properties.HORIZONTAL_FACING, WATERLOGGED); } @Override @@ -36,6 +44,26 @@ public class RadioReceiverBlock extends HorizontalFacingBlock { @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos()); + + return super.getPlacementState(ctx) + .with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()) + .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); + } + + 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); + } + + static { + WATERLOGGED = Properties.WATERLOGGED; } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java index 3580d9b..391dfe0 100644 --- a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java @@ -3,6 +3,7 @@ package su.a71.new_soviet.blocks; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; @@ -13,6 +14,8 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -35,10 +38,20 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide public static final BooleanProperty BROKEN; public static final BooleanProperty ON; public static final BooleanProperty WATERLOGGED; - + public static final BooleanProperty INVERTED; public TVBlock(AbstractBlock.Settings settings) { - super(settings.sounds(BlockSoundGroup.METAL).pistonBehavior(PistonBehavior.BLOCK).strength(1f, 2f)); + super(settings.sounds(BlockSoundGroup.METAL).pistonBehavior(PistonBehavior.BLOCK).strength(1f, 2f) + .luminance((BlockState state) -> { + if (state.get(BROKEN)) { + return 0; + } + if (state.get(INVERTED)) { + return state.get(ON) ? 0 : 5; + } else { + return state.get(ON) ? 5 : 0; + } + })); setDefaultState(getDefaultState() .with(Properties.HORIZONTAL_FACING, Direction.NORTH) .with(WATERLOGGED, false) @@ -47,7 +60,7 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(Properties.HORIZONTAL_FACING, WATERLOGGED, ON, BROKEN); + builder.add(Properties.HORIZONTAL_FACING, WATERLOGGED, ON, BROKEN, INVERTED); } @Override @@ -68,9 +81,20 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide .with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()) .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER) .with(ON, ctx.getWorld().isReceivingRedstonePower(ctx.getBlockPos())) + .with(INVERTED, false) .with(BROKEN, false); } + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (!world.isClient) { + world.setBlockState(pos, state.cycle(INVERTED), 2); + } + float f = state.get(ON) ? 1f : 0.9f; + world.playSound(null, pos, NSE_Sounds.SWITCH_PRESS, SoundCategory.BLOCKS, 0.6f, f); + return ActionResult.SUCCESS; + } + @Override public void onProjectileHit(World world, BlockState state, BlockHitResult hit, ProjectileEntity projectile) { if (!state.get(BROKEN)) { @@ -121,5 +145,6 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide ON = RedstoneTorchBlock.LIT; WATERLOGGED = Properties.WATERLOGGED; BROKEN = Properties.CRACKED; + INVERTED = Properties.INVERTED; } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java index b055503..634bca7 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -4,7 +4,12 @@ package su.a71.new_soviet.datagen; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; import net.minecraft.block.Blocks; +import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.provider.number.ConstantLootNumberProvider; import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.registration.NSE_Custom; @@ -13,6 +18,12 @@ public class BlockLootTables extends FabricBlockLootTableProvider { super(dataOutput); } + public static LootTable.Builder dropSilkAndNot(ItemConvertible drop, ItemConvertible drop_silk) { + return LootTable.builder() + .pool(LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0F)).with(ItemEntry.builder(drop))) + .pool(LootPool.builder().conditionally(WITH_SILK_TOUCH).rolls(ConstantLootNumberProvider.create(1.0F)).with(ItemEntry.builder(drop_silk))); + } + @Override public void generate() { // Drops for building blocks @@ -430,11 +441,10 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.CYAN_LINOLEUM_STAIRS); addDrop(NSE_Blocks.METAL_PLATING_SLAB); addDrop(NSE_Blocks.METAL_PLATING_STAIRS); - addDrop(NSE_Blocks.BARBED_WIRE, Items.IRON_NUGGET); - addDrop(NSE_Blocks.DIRT_ROAD, Blocks.DIRT); + + addDrop(NSE_Blocks.BARBED_WIRE, dropSilkAndNot(Items.IRON_NUGGET, NSE_Blocks.BARBED_WIRE)); + addDrop(NSE_Blocks.DIRT_ROAD, dropSilkAndNot(Blocks.DIRT, NSE_Blocks.DIRT_ROAD)); addDropWithSilkTouch(NSE_Custom.LIGHT_BULB_LAMP); - addDropWithSilkTouch(NSE_Blocks.BARBED_WIRE); -// addDropWithSilkTouch(NSE_Blocks.DIRT_ROAD); } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/black_checker.json b/src/main/resources/assets/new_soviet/blockstates/black_checker.json index 75a59b5..399b379 100644 --- a/src/main/resources/assets/new_soviet/blockstates/black_checker.json +++ b/src/main/resources/assets/new_soviet/blockstates/black_checker.json @@ -1,16 +1,16 @@ { "variants": { "checkers=1": { - "model": "new_soviet:block/black_checker" + "model": "new_soviet:block/checkers/black_checker" }, "checkers=2": { - "model": "new_soviet:block/black_checker2" + "model": "new_soviet:block/checkers/black_checker2" }, "checkers=3": { - "model": "new_soviet:block/black_checker3" + "model": "new_soviet:block/checkers/black_checker3" }, "checkers=4": { - "model": "new_soviet:block/black_checker4" + "model": "new_soviet:block/checkers/black_checker4" } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/brown_tv.json b/src/main/resources/assets/new_soviet/blockstates/brown_tv.json index 2887be5..46fd4c8 100644 --- a/src/main/resources/assets/new_soviet/blockstates/brown_tv.json +++ b/src/main/resources/assets/new_soviet/blockstates/brown_tv.json @@ -1,11 +1,17 @@ { "variants": { - "facing=north,lit=false,cracked=false": { + "facing=north,lit=false,cracked=false,inverted=false": { "model": "new_soviet:block/tv/brown_tv", "uvlock": true }, - "facing=north,lit=true,cracked=false": { + "facing=north,lit=true,cracked=false,inverted=false": { "model": "new_soviet:block/tv/brown_tv_on", "uvlock": true }, + "facing=north,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv_on", "uvlock": true + }, + "facing=north,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv", "uvlock": true + }, "facing=north,lit=false,cracked=true": [{ "model": "new_soviet:block/tv/brown_tv_broken1", "uvlock": true }, @@ -16,55 +22,113 @@ "model": "new_soviet:block/tv/brown_tv_broken3", "uvlock": true } ], + "facing=north,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/brown_tv_broken1", "uvlock": true + }, + { + "model": "new_soviet:block/tv/brown_tv_broken2", "uvlock": true + }, + { + "model": "new_soviet:block/tv/brown_tv_broken3", "uvlock": true + } + ], - "facing=east,lit=false,cracked=false": { + "facing=east,lit=false,cracked=false,inverted=false": { "model": "new_soviet:block/tv/brown_tv", "y": 90, "uvlock": false }, - "facing=east,lit=true,cracked=false": { + "facing=east,lit=true,cracked=false,inverted=false": { "model": "new_soviet:block/tv/brown_tv_on", "y": 90, "uvlock": false }, - "facing=east,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/brown_tv_broken1","y": 90, "uvlock": false + "facing=east,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv_on", "y": 90, "uvlock": false }, - { - "model": "new_soviet:block/tv/brown_tv_broken2","y": 90, "uvlock": false + "facing=east,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv", "y": 90, "uvlock": false + }, + "facing=east,lit=false,cracked=true": [{ + "model": "new_soviet:block/tv/brown_tv_broken1", "y": 90, "uvlock": false }, { - "model": "new_soviet:block/tv/brown_tv_broken3","y": 90, "uvlock": false + "model": "new_soviet:block/tv/brown_tv_broken2", "y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken3", "y": 90, "uvlock": false + } + ], + "facing=east,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/brown_tv_broken1", "y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken2", "y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken3", "y": 90, "uvlock": false } ], - "facing=south,lit=false,cracked=false": { - "model": "new_soviet:block/tv/brown_tv", "y": 180, "uvlock": false + "facing=south,lit=false,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/brown_tv", "y": 180, "uvlock": false }, - "facing=south,lit=true,cracked=false": { - "model": "new_soviet:block/tv/brown_tv_on", "y": 180, "uvlock": false + "facing=south,lit=true,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/brown_tv_on", "y": 180, "uvlock": false + }, + "facing=south,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv_on", "y": 180, "uvlock": false + }, + "facing=south,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv", "y": 180, "uvlock": false }, "facing=south,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/brown_tv_broken1","y": 180, "uvlock": false - }, - { - "model": "new_soviet:block/tv/brown_tv_broken2","y": 180, "uvlock": false + "model": "new_soviet:block/tv/brown_tv_broken1", "y": 180, "uvlock": false }, { - "model": "new_soviet:block/tv/brown_tv_broken3","y": 180, "uvlock": false + "model": "new_soviet:block/tv/brown_tv_broken2", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken3", "y": 180, "uvlock": false + } + ], + "facing=south,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/brown_tv_broken1", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken2", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken3", "y": 180, "uvlock": false } ], - "facing=west,lit=false,cracked=false": { - "model": "new_soviet:block/tv/brown_tv", "y": 270, "uvlock": false + "facing=west,lit=false,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/brown_tv", "y": 270, "uvlock": false }, - "facing=west,lit=true,cracked=false": { - "model": "new_soviet:block/tv/brown_tv_on", "y": 270, "uvlock": false + "facing=west,lit=true,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/brown_tv_on", "y": 270, "uvlock": false + }, + "facing=west,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv_on", "y": 270, "uvlock": false + }, + "facing=west,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/brown_tv", "y": 270, "uvlock": false }, "facing=west,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/brown_tv_broken1","y": 270, "uvlock": false - }, - { - "model": "new_soviet:block/tv/brown_tv_broken2","y": 270, "uvlock": false + "model": "new_soviet:block/tv/brown_tv_broken1", "y": 270, "uvlock": false }, { - "model": "new_soviet:block/tv/brown_tv_broken3","y": 270, "uvlock": false + "model": "new_soviet:block/tv/brown_tv_broken2", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken3", "y": 270, "uvlock": false + } + ], + "facing=west,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/brown_tv_broken1", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken2", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/brown_tv_broken3", "y": 270, "uvlock": false } ] } diff --git a/src/main/resources/assets/new_soviet/blockstates/red_tv.json b/src/main/resources/assets/new_soviet/blockstates/red_tv.json index 4bb35f0..52e86f2 100644 --- a/src/main/resources/assets/new_soviet/blockstates/red_tv.json +++ b/src/main/resources/assets/new_soviet/blockstates/red_tv.json @@ -1,11 +1,17 @@ { "variants": { - "facing=north,lit=false,cracked=false": { + "facing=north,lit=false,cracked=false,inverted=false": { "model": "new_soviet:block/tv/red_tv", "uvlock": true }, - "facing=north,lit=true,cracked=false": { + "facing=north,lit=true,cracked=false,inverted=false": { "model": "new_soviet:block/tv/red_tv_on", "uvlock": true }, + "facing=north,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv_on", "uvlock": true + }, + "facing=north,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv", "uvlock": true + }, "facing=north,lit=false,cracked=true": [{ "model": "new_soviet:block/tv/red_tv_broken1", "uvlock": true }, @@ -16,15 +22,41 @@ "model": "new_soviet:block/tv/red_tv_broken3", "uvlock": true } ], + "facing=north,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/red_tv_broken1", "uvlock": true + }, + { + "model": "new_soviet:block/tv/red_tv_broken2", "uvlock": true + }, + { + "model": "new_soviet:block/tv/red_tv_broken3", "uvlock": true + } + ], - "facing=east,lit=false,cracked=false": { + "facing=east,lit=false,cracked=false,inverted=false": { "model": "new_soviet:block/tv/red_tv", "y": 90, "uvlock": false }, - "facing=east,lit=true,cracked=false": { + "facing=east,lit=true,cracked=false,inverted=false": { "model": "new_soviet:block/tv/red_tv_on", "y": 90, "uvlock": false }, + "facing=east,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv_on", "y": 90, "uvlock": false + }, + "facing=east,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv", "y": 90, "uvlock": false + }, "facing=east,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/red_tv_broken1","y": 90, "uvlock": false + "model": "new_soviet:block/tv/red_tv_broken1", "y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken2","y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken3","y": 90, "uvlock": false + } + ], + "facing=east,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/red_tv_broken1", "y": 90, "uvlock": false }, { "model": "new_soviet:block/tv/red_tv_broken2","y": 90, "uvlock": false @@ -34,37 +66,69 @@ } ], - "facing=south,lit=false,cracked=false": { - "model": "new_soviet:block/tv/red_tv", "y": 180, "uvlock": false + "facing=south,lit=false,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/red_tv", "y": 180, "uvlock": false }, - "facing=south,lit=true,cracked=false": { - "model": "new_soviet:block/tv/red_tv_on", "y": 180, "uvlock": false + "facing=south,lit=true,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/red_tv_on", "y": 180, "uvlock": false + }, + "facing=south,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv_on", "y": 180, "uvlock": false + }, + "facing=south,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv", "y": 180, "uvlock": false }, "facing=south,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/red_tv_broken1","y": 180, "uvlock": false - }, - { - "model": "new_soviet:block/tv/red_tv_broken2","y": 180, "uvlock": false + "model": "new_soviet:block/tv/red_tv_broken1", "y": 180, "uvlock": false }, { - "model": "new_soviet:block/tv/red_tv_broken3","y": 180, "uvlock": false + "model": "new_soviet:block/tv/red_tv_broken2", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken3", "y": 180, "uvlock": false + } + ], + "facing=south,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/red_tv_broken1", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken2", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken3", "y": 180, "uvlock": false } ], - "facing=west,lit=false,cracked=false": { - "model": "new_soviet:block/tv/red_tv", "y": 270, "uvlock": false + "facing=west,lit=false,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/red_tv", "y": 270, "uvlock": false }, - "facing=west,lit=true,cracked=false": { - "model": "new_soviet:block/tv/red_tv_on", "y": 270, "uvlock": false + "facing=west,lit=true,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/red_tv_on", "y": 270, "uvlock": false + }, + "facing=west,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv_on", "y": 270, "uvlock": false + }, + "facing=west,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/red_tv", "y": 270, "uvlock": false }, "facing=west,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/red_tv_broken1","y": 270, "uvlock": false - }, - { - "model": "new_soviet:block/tv/red_tv_broken2","y": 270, "uvlock": false + "model": "new_soviet:block/tv/red_tv_broken1", "y": 270, "uvlock": false }, { - "model": "new_soviet:block/tv/red_tv_broken3","y": 270, "uvlock": false + "model": "new_soviet:block/tv/red_tv_broken2", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken3", "y": 270, "uvlock": false + } + ], + "facing=west,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/red_tv_broken1", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken2", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/red_tv_broken3", "y": 270, "uvlock": false } ] } diff --git a/src/main/resources/assets/new_soviet/blockstates/tv.json b/src/main/resources/assets/new_soviet/blockstates/tv.json index d51dd67..e3bbe8f 100644 --- a/src/main/resources/assets/new_soviet/blockstates/tv.json +++ b/src/main/resources/assets/new_soviet/blockstates/tv.json @@ -1,11 +1,17 @@ { "variants": { - "facing=north,lit=false,cracked=false": { + "facing=north,lit=false,cracked=false,inverted=false": { "model": "new_soviet:block/tv/tv", "uvlock": true }, - "facing=north,lit=true,cracked=false": { + "facing=north,lit=true,cracked=false,inverted=false": { "model": "new_soviet:block/tv/tv_on", "uvlock": true }, + "facing=north,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv_on", "uvlock": true + }, + "facing=north,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv", "uvlock": true + }, "facing=north,lit=false,cracked=true": [{ "model": "new_soviet:block/tv/tv_broken1", "uvlock": true }, @@ -16,55 +22,113 @@ "model": "new_soviet:block/tv/tv_broken3", "uvlock": true } ], + "facing=north,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/tv_broken1", "uvlock": true + }, + { + "model": "new_soviet:block/tv/tv_broken2", "uvlock": true + }, + { + "model": "new_soviet:block/tv/tv_broken3", "uvlock": true + } + ], - "facing=east,lit=false,cracked=false": { + "facing=east,lit=false,cracked=false,inverted=false": { "model": "new_soviet:block/tv/tv", "y": 90, "uvlock": false }, - "facing=east,lit=true,cracked=false": { + "facing=east,lit=true,cracked=false,inverted=false": { "model": "new_soviet:block/tv/tv_on", "y": 90, "uvlock": false }, - "facing=east,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/tv_broken1","y": 90, "uvlock": false + "facing=east,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv_on", "y": 90, "uvlock": false }, - { - "model": "new_soviet:block/tv/tv_broken2","y": 90, "uvlock": false + "facing=east,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv", "y": 90, "uvlock": false + }, + "facing=east,lit=false,cracked=true": [{ + "model": "new_soviet:block/tv/tv_broken1", "y": 90, "uvlock": false }, { - "model": "new_soviet:block/tv/tv_broken3","y": 90, "uvlock": false + "model": "new_soviet:block/tv/tv_broken2", "y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken3", "y": 90, "uvlock": false + } + ], + "facing=east,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/tv_broken1", "y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken2", "y": 90, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken3", "y": 90, "uvlock": false } ], - "facing=south,lit=false,cracked=false": { - "model": "new_soviet:block/tv/tv", "y": 180, "uvlock": false + "facing=south,lit=false,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/tv", "y": 180, "uvlock": false }, - "facing=south,lit=true,cracked=false": { - "model": "new_soviet:block/tv/tv_on", "y": 180, "uvlock": false + "facing=south,lit=true,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/tv_on", "y": 180, "uvlock": false + }, + "facing=south,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv_on", "y": 180, "uvlock": false + }, + "facing=south,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv", "y": 180, "uvlock": false }, "facing=south,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/tv_broken1","y": 180, "uvlock": false - }, - { - "model": "new_soviet:block/tv/tv_broken2","y": 180, "uvlock": false + "model": "new_soviet:block/tv/tv_broken1", "y": 180, "uvlock": false }, { - "model": "new_soviet:block/tv/tv_broken3","y": 180, "uvlock": false + "model": "new_soviet:block/tv/tv_broken2", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken3", "y": 180, "uvlock": false + } + ], + "facing=south,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/tv_broken1", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken2", "y": 180, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken3", "y": 180, "uvlock": false } ], - "facing=west,lit=false,cracked=false": { - "model": "new_soviet:block/tv/tv", "y": 270, "uvlock": false + "facing=west,lit=false,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/tv", "y": 270, "uvlock": false }, - "facing=west,lit=true,cracked=false": { - "model": "new_soviet:block/tv/tv_on", "y": 270, "uvlock": false + "facing=west,lit=true,cracked=false,inverted=false": { + "model": "new_soviet:block/tv/tv_on", "y": 270, "uvlock": false + }, + "facing=west,lit=false,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv_on", "y": 270, "uvlock": false + }, + "facing=west,lit=true,cracked=false,inverted=true": { + "model": "new_soviet:block/tv/tv", "y": 270, "uvlock": false }, "facing=west,lit=false,cracked=true": [{ - "model": "new_soviet:block/tv/tv_broken1","y": 270, "uvlock": false - }, - { - "model": "new_soviet:block/tv/tv_broken2","y": 270, "uvlock": false + "model": "new_soviet:block/tv/tv_broken1", "y": 270, "uvlock": false }, { - "model": "new_soviet:block/tv/tv_broken3","y": 270, "uvlock": false + "model": "new_soviet:block/tv/tv_broken2", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken3", "y": 270, "uvlock": false + } + ], + "facing=west,lit=true,cracked=true": [{ + "model": "new_soviet:block/tv/tv_broken1", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken2", "y": 270, "uvlock": false + }, + { + "model": "new_soviet:block/tv/tv_broken3", "y": 270, "uvlock": false } ] } diff --git a/src/main/resources/assets/new_soviet/blockstates/white_checker.json b/src/main/resources/assets/new_soviet/blockstates/white_checker.json index e1a7f20..835b3ca 100644 --- a/src/main/resources/assets/new_soviet/blockstates/white_checker.json +++ b/src/main/resources/assets/new_soviet/blockstates/white_checker.json @@ -1,16 +1,16 @@ { "variants": { "checkers=1": { - "model": "new_soviet:block/white_checker" + "model": "new_soviet:block/checkers/white_checker" }, "checkers=2": { - "model": "new_soviet:block/white_checker2" + "model": "new_soviet:block/checkers/white_checker2" }, "checkers=3": { - "model": "new_soviet:block/white_checker3" + "model": "new_soviet:block/checkers/white_checker3" }, "checkers=4": { - "model": "new_soviet:block/white_checker4" + "model": "new_soviet:block/checkers/white_checker4" } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/beige_concrete_with_bars.json b/src/main/resources/assets/new_soviet/models/block/beige_concrete_with_bars.json index 95f12fe..bfb58ba 100644 --- a/src/main/resources/assets/new_soviet/models/block/beige_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/models/block/beige_concrete_with_bars.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "parent": "block/cube_all", "texture_size": [32, 32], "textures": { 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 index 6a3e03e..ad8d054 100644 --- a/src/main/resources/assets/new_soviet/models/block/caged_lamp.json +++ b/src/main/resources/assets/new_soviet/models/block/caged_lamp.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [48, 48], "textures": { "0": "lamp_post", diff --git a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json index 3687c54..cfed6f9 100644 --- a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json +++ b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json @@ -1,117 +1,145 @@ { - "credit": "Made with Blockbench", - "texture_size": [64, 64], + "credit": "Made by Feulim Temly with Blockbench", + "texture_size": [32, 32], "textures": { - "1": "new_soviet:block/custom/appliances/fan_base", - "2": "new_soviet:block/custom/appliances/fan_static", - "particle": "new_soviet:block/custom/appliances/fan_base_particle" + "0": "new_soviet:block/custom/appliances/ceiling_fan", + "1": "new_soviet:block/custom/appliances/fan_static", + "particle": "new_soviet:block/custom/appliances/ceiling_fan" }, "elements": [ { "name": "root", - "from": [6, 13, 6], - "to": [10, 16, 10], + "from": [4, 1, 4], + "to": [12, 4, 12], "faces": { - "north": {"uv": [1, 4.25, 2, 5], "texture": "#1"}, - "east": {"uv": [0, 4.25, 1, 5], "texture": "#1"}, - "south": {"uv": [3, 4.25, 4, 5], "texture": "#1"}, - "west": {"uv": [2, 4.25, 3, 5], "texture": "#1"}, - "up": {"uv": [2, 4.25, 1, 3.25], "texture": "#1"}, - "down": {"uv": [3, 3.25, 2, 4.25], "texture": "#1"} + "north": {"uv": [4, 4, 8, 5.5], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 5.5], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 5.5], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 5.5], "texture": "#0"}, + "up": {"uv": [8, 4, 4, 0], "texture": "#0"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#0"} } }, { "name": "root", - "from": [7, 7, 7], - "to": [9, 13, 9], + "from": [6.5, 13, 6.5], + "to": [9.5, 16, 9.5], "faces": { - "north": {"uv": [0.5, 0.5, 1, 2], "texture": "#1"}, - "east": {"uv": [0, 0.5, 0.5, 2], "texture": "#1"}, - "south": {"uv": [1.5, 0.5, 2, 2], "texture": "#1"}, - "west": {"uv": [1, 0.5, 1.5, 2], "texture": "#1"}, - "up": {"uv": [1, 0.5, 0.5, 0], "texture": "#1"}, - "down": {"uv": [1.5, 0, 1, 0.5], "texture": "#1"} + "north": {"uv": [1.5, 9.5, 3, 11], "texture": "#0"}, + "east": {"uv": [0, 9.5, 1.5, 11], "texture": "#0"}, + "south": {"uv": [4.5, 9.5, 6, 11], "texture": "#0"}, + "west": {"uv": [3, 9.5, 4.5, 11], "texture": "#0"}, + "up": {"uv": [3, 9.5, 1.5, 8], "texture": "#0"}, + "down": {"uv": [4.5, 8, 3, 9.5], "texture": "#0"} } }, { "name": "root", - "from": [4, 2, 4], - "to": [12, 7, 12], + "from": [6.5, 4, 6.5], + "to": [9.5, 7, 9.5], "faces": { - "north": {"uv": [2, 2, 4, 3.25], "texture": "#1"}, - "east": {"uv": [0, 2, 2, 3.25], "texture": "#1"}, - "south": {"uv": [6, 2, 8, 3.25], "texture": "#1"}, - "west": {"uv": [4, 2, 6, 3.25], "texture": "#1"}, - "up": {"uv": [4, 2, 2, 0], "texture": "#1"}, - "down": {"uv": [6, 0, 4, 2], "texture": "#1"} + "north": {"uv": [7.5, 8, 9, 9.5], "texture": "#0"}, + "east": {"uv": [6, 8, 7.5, 9.5], "texture": "#0"}, + "south": {"uv": [10.5, 8, 12, 9.5], "texture": "#0"}, + "west": {"uv": [9, 8, 10.5, 9.5], "texture": "#0"}, + "up": {"uv": [9, 8, 7.5, 6.5], "texture": "#0"}, + "down": {"uv": [10.5, 6.5, 9, 8], "texture": "#0"} } }, { "name": "root", - "from": [6, 0, 6], - "to": [10, 2, 10], + "from": [5.5, 7, 5.5], + "to": [10.5, 7, 10.5], "faces": { - "north": {"uv": [4, 5, 5, 5.5], "texture": "#1"}, - "east": {"uv": [3, 5, 4, 5.5], "texture": "#1"}, - "south": {"uv": [6, 5, 7, 5.5], "texture": "#1"}, - "west": {"uv": [5, 5, 6, 5.5], "texture": "#1"}, - "up": {"uv": [5, 5, 4, 4], "texture": "#1"}, - "down": {"uv": [6, 4, 5, 5], "texture": "#1"} + "north": {"uv": [2.5, 8, 5, 8], "texture": "#0"}, + "east": {"uv": [0, 8, 2.5, 8], "texture": "#0"}, + "south": {"uv": [7.5, 8, 10, 8], "texture": "#0"}, + "west": {"uv": [5, 8, 7.5, 8], "texture": "#0"}, + "up": {"uv": [5, 8, 2.5, 5.5], "texture": "#0"}, + "down": {"uv": [7.5, 5.5, 5, 8], "texture": "#0"} } }, { "name": "root", - "from": [-8, 1, -8], - "to": [24, 1, 24], + "from": [7.5, 6, 7.5], + "to": [8.5, 13, 8.5], "faces": { - "up": {"uv": [16, 16, 0, 0], "texture": "#2"}, - "down": {"uv": [16, 0, 0, 16], "texture": "#2"} + "north": {"uv": [0.5, 0.5, 1, 4], "texture": "#0"}, + "east": {"uv": [0, 0.5, 0.5, 4], "texture": "#0"}, + "south": {"uv": [1.5, 0.5, 2, 4], "texture": "#0"}, + "west": {"uv": [1, 0.5, 1.5, 4], "texture": "#0"}, + "up": {"uv": [1, 0.5, 0.5, 0], "texture": "#0"}, + "down": {"uv": [1.5, 0, 1, 0.5], "texture": "#0"} + } + }, + { + "name": "root", + "from": [-8, 2.5, -8], + "to": [24, 2.5, 24], + "faces": { + "north": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "east": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "south": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "west": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#1"} } } ], "display": { "thirdperson_righthand": { "rotation": [0, 0, 180], - "scale": [0.4, 0.4, 0.4] + "translation": [0, 1.75, 1], + "scale": [0.25, 0.25, 0.25] }, "thirdperson_lefthand": { "rotation": [0, 0, 180], - "scale": [0.4, 0.4, 0.4] + "translation": [0, 1.75, 1], + "scale": [0.25, 0.25, 0.25] }, "firstperson_righthand": { - "rotation": [-46, 0, 180], - "translation": [1.5, 0, 1.25], - "scale": [0.4, 0.4, 0.4] + "rotation": [0, -90, -145], + "translation": [1.13, 3.2, 1.13], + "scale": [0.5, 0.5, 0.5] }, "firstperson_lefthand": { - "rotation": [-46, 0, 180], - "translation": [1.5, 0, 1.25], - "scale": [0.4, 0.4, 0.4] + "rotation": [0, -90, -145], + "translation": [1.13, 3.2, 1.13], + "scale": [0.5, 0.5, 0.5] }, "ground": { - "scale": [0.4, 0.4, 0.4] + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] }, "gui": { - "rotation": [45, 45, 0], - "translation": [0, 1.75, 0], - "scale": [0.6, 0.6, 0.6] + "rotation": [30, 225, 0], + "translation": [0, 1.5, 0], + "scale": [0.625, 0.625, 0.625] }, "head": { "rotation": [0, 0, 180], - "translation": [0, 2.5, 0] - }, - "fixed": { - "rotation": [90, 0, 0], - "translation": [0, 0, 4.75] + "translation": [0, 5.75, 0], + "scale": [0.75, 0.75, 0.75] } }, "groups": [ { - "name": "root", - "origin": [0, 0, 0], + "name": "group", + "origin": [8, 8, 8], "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4] + "children": [ + 0, + 1, + 2, + 3, + 4, + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [5] + } + ] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json index 4cad0af..fc3ed9e 100644 --- a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json +++ b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json @@ -1,82 +1,111 @@ { - "credit": "Made with Blockbench", - "texture_size": [64, 64], + "credit": "Made by Feulim Temly with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "new_soviet:block/custom/appliances/fan_animated", - "1": "new_soviet:block/custom/appliances/fan_base", - "particle": "new_soviet:block/custom/appliances/fan_base_particle" + "0": "new_soviet:block/custom/appliances/ceiling_fan", + "1": "new_soviet:block/custom/appliances/fan_animated", + "particle": "new_soviet:block/custom/appliances/ceiling_fan" }, "elements": [ { "name": "root", - "from": [6, 13, 6], - "to": [10, 16, 10], + "from": [4, 1, 4], + "to": [12, 4, 12], "faces": { - "north": {"uv": [1, 4.25, 2, 5], "texture": "#1"}, - "east": {"uv": [0, 4.25, 1, 5], "texture": "#1"}, - "south": {"uv": [3, 4.25, 4, 5], "texture": "#1"}, - "west": {"uv": [2, 4.25, 3, 5], "texture": "#1"}, - "up": {"uv": [2, 4.25, 1, 3.25], "texture": "#1"}, - "down": {"uv": [3, 3.25, 2, 4.25], "texture": "#1"} + "north": {"uv": [4, 4, 8, 5.5], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 5.5], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 5.5], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 5.5], "texture": "#0"}, + "up": {"uv": [8, 4, 4, 0], "texture": "#0"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#0"} } }, { "name": "root", - "from": [7, 7, 7], - "to": [9, 13, 9], + "from": [6.5, 13, 6.5], + "to": [9.5, 16, 9.5], "faces": { - "north": {"uv": [0.5, 0.5, 1, 2], "texture": "#1"}, - "east": {"uv": [0, 0.5, 0.5, 2], "texture": "#1"}, - "south": {"uv": [1.5, 0.5, 2, 2], "texture": "#1"}, - "west": {"uv": [1, 0.5, 1.5, 2], "texture": "#1"}, - "up": {"uv": [1, 0.5, 0.5, 0], "texture": "#1"}, - "down": {"uv": [1.5, 0, 1, 0.5], "texture": "#1"} + "north": {"uv": [1.5, 9.5, 3, 11], "texture": "#0"}, + "east": {"uv": [0, 9.5, 1.5, 11], "texture": "#0"}, + "south": {"uv": [4.5, 9.5, 6, 11], "texture": "#0"}, + "west": {"uv": [3, 9.5, 4.5, 11], "texture": "#0"}, + "up": {"uv": [3, 9.5, 1.5, 8], "texture": "#0"}, + "down": {"uv": [4.5, 8, 3, 9.5], "texture": "#0"} } }, { "name": "root", - "from": [4, 2, 4], - "to": [12, 7, 12], + "from": [6.5, 4, 6.5], + "to": [9.5, 7, 9.5], "faces": { - "north": {"uv": [2, 2, 4, 3.25], "texture": "#1"}, - "east": {"uv": [0, 2, 2, 3.25], "texture": "#1"}, - "south": {"uv": [6, 2, 8, 3.25], "texture": "#1"}, - "west": {"uv": [4, 2, 6, 3.25], "texture": "#1"}, - "up": {"uv": [4, 2, 2, 0], "texture": "#1"}, - "down": {"uv": [6, 0, 4, 2], "texture": "#1"} + "north": {"uv": [7.5, 8, 9, 9.5], "texture": "#0"}, + "east": {"uv": [6, 8, 7.5, 9.5], "texture": "#0"}, + "south": {"uv": [10.5, 8, 12, 9.5], "texture": "#0"}, + "west": {"uv": [9, 8, 10.5, 9.5], "texture": "#0"}, + "up": {"uv": [9, 8, 7.5, 6.5], "texture": "#0"}, + "down": {"uv": [10.5, 6.5, 9, 8], "texture": "#0"} } }, { "name": "root", - "from": [6, 0, 6], - "to": [10, 2, 10], + "from": [5.5, 7, 5.5], + "to": [10.5, 7, 10.5], "faces": { - "north": {"uv": [4, 5, 5, 5.5], "texture": "#1"}, - "east": {"uv": [3, 5, 4, 5.5], "texture": "#1"}, - "south": {"uv": [6, 5, 7, 5.5], "texture": "#1"}, - "west": {"uv": [5, 5, 6, 5.5], "texture": "#1"}, - "up": {"uv": [5, 5, 4, 4], "texture": "#1"}, - "down": {"uv": [6, 4, 5, 5], "texture": "#1"} + "north": {"uv": [2.5, 8, 5, 8], "texture": "#0"}, + "east": {"uv": [0, 8, 2.5, 8], "texture": "#0"}, + "south": {"uv": [7.5, 8, 10, 8], "texture": "#0"}, + "west": {"uv": [5, 8, 7.5, 8], "texture": "#0"}, + "up": {"uv": [5, 8, 2.5, 5.5], "texture": "#0"}, + "down": {"uv": [7.5, 5.5, 5, 8], "texture": "#0"} } }, { "name": "root", - "from": [-8, 1, -8], - "to": [24, 1, 24], + "from": [7.5, 6, 7.5], + "to": [8.5, 13, 8.5], "faces": { - "up": {"uv": [16, 16, 0, 0], "texture": "#0"}, - "down": {"uv": [16, 0, 0, 16], "texture": "#0"} + "north": {"uv": [0.5, 0.5, 1, 4], "texture": "#0"}, + "east": {"uv": [0, 0.5, 0.5, 4], "texture": "#0"}, + "south": {"uv": [1.5, 0.5, 2, 4], "texture": "#0"}, + "west": {"uv": [1, 0.5, 1.5, 4], "texture": "#0"}, + "up": {"uv": [1, 0.5, 0.5, 0], "texture": "#0"}, + "down": {"uv": [1.5, 0, 1, 0.5], "texture": "#0"} + } + }, + { + "name": "root", + "from": [-8, 2.5, -8], + "to": [24, 2.5, 24], + "faces": { + "north": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "east": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "south": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "west": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#1"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#1"} } } ], - "display": {}, "groups": [ { - "name": "root", - "origin": [0, 0, 0], + "name": "group", + "origin": [8, 8, 8], "color": 0, "nbt": "{}", - "children": [0, 1, 2, 3, 4] + "children": [ + 0, + 1, + 2, + 3, + 4, + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [5] + } + ] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/ceiling_lamp.json b/src/main/resources/assets/new_soviet/models/block/ceiling_lamp.json index f7a1822..5048ecd 100644 --- a/src/main/resources/assets/new_soviet/models/block/ceiling_lamp.json +++ b/src/main/resources/assets/new_soviet/models/block/ceiling_lamp.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/furniture/ceiling_lamp", "particle": "new_soviet:block/custom/furniture/ceiling_lamp" diff --git a/src/main/resources/assets/new_soviet/models/block/black_checker.json b/src/main/resources/assets/new_soviet/models/block/checkers/black_checker.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/black_checker.json rename to src/main/resources/assets/new_soviet/models/block/checkers/black_checker.json diff --git a/src/main/resources/assets/new_soviet/models/block/black_checker2.json b/src/main/resources/assets/new_soviet/models/block/checkers/black_checker2.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/black_checker2.json rename to src/main/resources/assets/new_soviet/models/block/checkers/black_checker2.json diff --git a/src/main/resources/assets/new_soviet/models/block/black_checker3.json b/src/main/resources/assets/new_soviet/models/block/checkers/black_checker3.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/black_checker3.json rename to src/main/resources/assets/new_soviet/models/block/checkers/black_checker3.json diff --git a/src/main/resources/assets/new_soviet/models/block/black_checker4.json b/src/main/resources/assets/new_soviet/models/block/checkers/black_checker4.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/black_checker4.json rename to src/main/resources/assets/new_soviet/models/block/checkers/black_checker4.json diff --git a/src/main/resources/assets/new_soviet/models/block/white_checker.json b/src/main/resources/assets/new_soviet/models/block/checkers/white_checker.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/white_checker.json rename to src/main/resources/assets/new_soviet/models/block/checkers/white_checker.json diff --git a/src/main/resources/assets/new_soviet/models/block/white_checker2.json b/src/main/resources/assets/new_soviet/models/block/checkers/white_checker2.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/white_checker2.json rename to src/main/resources/assets/new_soviet/models/block/checkers/white_checker2.json diff --git a/src/main/resources/assets/new_soviet/models/block/white_checker3.json b/src/main/resources/assets/new_soviet/models/block/checkers/white_checker3.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/white_checker3.json rename to src/main/resources/assets/new_soviet/models/block/checkers/white_checker3.json diff --git a/src/main/resources/assets/new_soviet/models/block/white_checker4.json b/src/main/resources/assets/new_soviet/models/block/checkers/white_checker4.json similarity index 100% rename from src/main/resources/assets/new_soviet/models/block/white_checker4.json rename to src/main/resources/assets/new_soviet/models/block/checkers/white_checker4.json diff --git a/src/main/resources/assets/new_soviet/models/block/chess/bishop.json b/src/main/resources/assets/new_soviet/models/block/chess/bishop.json index 0b7e971..0d63090 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/bishop.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/bishop.json @@ -1,17 +1,21 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], + "textures": { + "0": "new_soviet:block/games/chess/white/bishop", + "particle": "new_soviet:block/games/chess/white/bishop" + }, "elements": [ { "from": [6, 4, 6], "to": [10, 10, 10], "faces": { - "north": {"uv": [3, 0, 5, 3], "texture": "#missing"}, - "east": {"uv": [3, 0, 5, 3], "texture": "#missing"}, - "south": {"uv": [3, 0, 5, 3], "texture": "#missing"}, - "west": {"uv": [3, 0, 5, 3], "texture": "#missing"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#missing"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#missing"} + "north": {"uv": [3, 0, 5, 3], "texture": "#0"}, + "east": {"uv": [3, 0, 5, 3], "texture": "#0"}, + "south": {"uv": [3, 0, 5, 3], "texture": "#0"}, + "west": {"uv": [3, 0, 5, 3], "texture": "#0"}, + "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, + "down": {"uv": [3, 0, 5, 2], "texture": "#0"} } }, { @@ -19,12 +23,12 @@ "to": [11, 16, 11], "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, "faces": { - "north": {"uv": [10.5, 3, 13.5, 6], "texture": "#missing"}, - "east": {"uv": [10.5, 0, 13.5, 3], "texture": "#missing"}, - "south": {"uv": [5, 0, 8, 3], "texture": "#missing"}, - "west": {"uv": [13.5, 0, 10.5, 3], "texture": "#missing"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#missing"}, - "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#missing"} + "north": {"uv": [10.5, 3, 13.5, 6], "texture": "#0"}, + "east": {"uv": [10.5, 0, 13.5, 3], "texture": "#0"}, + "south": {"uv": [5, 0, 8, 3], "texture": "#0"}, + "west": {"uv": [13.5, 0, 10.5, 3], "texture": "#0"}, + "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, + "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#0"} } }, { @@ -32,36 +36,36 @@ "to": [11, 9, 11], "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 3, 0.5]}, "faces": { - "north": {"uv": [1, 4.5, 4, 5], "texture": "#missing"}, - "east": {"uv": [1, 4.5, 4, 5], "texture": "#missing"}, - "south": {"uv": [1, 4.5, 4, 5], "texture": "#missing"}, - "west": {"uv": [1, 4.5, 4, 5], "texture": "#missing"}, - "up": {"uv": [1, 5, 4, 8], "texture": "#missing"}, - "down": {"uv": [1, 5, 4, 8], "texture": "#missing"} + "north": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, + "up": {"uv": [1, 5, 4, 8], "texture": "#0"}, + "down": {"uv": [1, 5, 4, 8], "texture": "#0"} } }, { "from": [5, 1, 5], "to": [11, 4, 11], "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"} + "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, + "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} } }, { "from": [4, 0, 4], "to": [12, 1, 12], "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#missing"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#missing"} + "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, + "down": {"uv": [8, 12, 4, 16], "texture": "#0"} } }, { @@ -69,12 +73,12 @@ "to": [9, 19, 9], "rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 7]}, "faces": { - "north": {"uv": [3, 3, 4, 4.5], "texture": "#missing"}, - "east": {"uv": [3, 3, 4, 4.5], "texture": "#missing"}, - "south": {"uv": [3, 3, 4, 4.5], "texture": "#missing"}, - "west": {"uv": [3, 3, 4, 4.5], "texture": "#missing"}, - "up": {"uv": [4, 3, 5, 4], "texture": "#missing"}, - "down": {"uv": [4, 3, 5, 4], "texture": "#missing"} + "north": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, + "east": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, + "south": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, + "west": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, + "up": {"uv": [4, 3, 5, 4], "texture": "#0"}, + "down": {"uv": [4, 3, 5, 4], "texture": "#0"} } } ], diff --git a/src/main/resources/assets/new_soviet/models/block/chess/black/bishop.json b/src/main/resources/assets/new_soviet/models/block/chess/black/bishop.json index ad92e68..71f02ca 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/black/bishop.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/black/bishop.json @@ -1,130 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/bishop", "textures": { "0": "new_soviet:block/games/chess/black/bishop", "particle": "new_soviet:block/games/chess/black/bishop" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 10, 10], - "faces": { - "north": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5, 10, 5], - "to": [11, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [10.5, 3, 13.5, 6], "texture": "#0"}, - "east": {"uv": [10.5, 0, 13.5, 3], "texture": "#0"}, - "south": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "west": {"uv": [13.5, 0, 10.5, 3], "texture": "#0"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, - "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 8, 5], - "to": [11, 9, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 3, 0.5]}, - "faces": { - "north": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "east": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "south": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "west": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "up": {"uv": [1, 5, 4, 8], "texture": "#0"}, - "down": {"uv": [1, 5, 4, 8], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 19, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 7]}, - "faces": { - "north": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "east": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "south": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "west": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "up": {"uv": [4, 3, 5, 4], "texture": "#0"}, - "down": {"uv": [4, 3, 5, 4], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5] - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/black/king.json b/src/main/resources/assets/new_soviet/models/block/chess/black/king.json index c16c75d..d65b721 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/black/king.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/black/king.json @@ -1,241 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/king", "textures": { "0": "new_soviet:block/games/chess/black/king", "particle": "new_soviet:block/games/chess/black/king" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 13, 10], - "faces": { - "north": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 13, 5], - "to": [11, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0.5]}, - "faces": { - "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#0"}, - "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [8, 19, 5], - "to": [8, 21, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "east": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "south": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "west": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "up": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "down": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"} - } - }, - { - "from": [8, 16, 6], - "to": [8, 17, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "east": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "south": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "west": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "up": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "down": {"uv": [8, 6, 10, 6.5], "texture": "#0"} - } - }, - { - "from": [8, 17, 7], - "to": [8, 19, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "east": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "south": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "west": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "up": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "down": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"} - } - }, - { - "from": [8, 21, 7], - "to": [8, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "east": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "south": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "west": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "up": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "down": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"} - } - }, - { - "from": [6, 16, 8], - "to": [10, 17, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "east": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "south": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "west": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "up": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "down": {"uv": [8, 6, 10, 6.5], "texture": "#0"} - } - }, - { - "from": [7, 17, 8], - "to": [9, 19, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "east": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "south": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "west": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "up": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "down": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"} - } - }, - { - "from": [7, 21, 8], - "to": [9, 23, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "east": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "south": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "west": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "up": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "down": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"} - } - }, - { - "from": [5, 19, 8], - "to": [11, 21, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "east": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "south": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "west": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "up": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "down": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5] - }, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13 - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/black/knight.json b/src/main/resources/assets/new_soviet/models/block/chess/black/knight.json index 637ad67..006e482 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/black/knight.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/black/knight.json @@ -1,142 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/knight", "textures": { "0": "new_soviet:block/games/chess/black/knight", "particle": "new_soviet:block/games/chess/black/knight" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 12, 10], - "faces": { - "north": {"uv": [3, 0, 5, 4], "texture": "#0"}, - "east": {"uv": [5, 0, 3, 4], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 4], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 4], "texture": "#0"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, - "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 11, 13.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [0, 1, 0]}, - "faces": { - "north": {"uv": [9, 2, 11.5, 4], "texture": "#0"}, - "east": {"uv": [9, 0, 5, 2], "texture": "#0"}, - "south": {"uv": [8.5, 0, 9, 2], "texture": "#0"}, - "west": {"uv": [5, 0, 9, 2], "texture": "#0"}, - "up": {"uv": [7.5, 4, 11.5, 6.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [9, 1.5, 5, 2], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [7.5, 8, 6], - "to": [8.5, 17, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [13.5, 3, 14, 7.5], "texture": "#0"}, - "east": {"uv": [16, 3, 13.5, 7.5], "texture": "#0"}, - "south": {"uv": [15.5, 3, 16, 7.5], "texture": "#0"}, - "west": {"uv": [13.5, 3, 16, 7.5], "texture": "#0"}, - "up": {"uv": [13.5, 3, 16, 3.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [15.5, 3, 16, 5.5], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"}, - "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "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/chess/black/pawn.json b/src/main/resources/assets/new_soviet/models/block/chess/black/pawn.json index 3566af9..974f75d 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/black/pawn.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/black/pawn.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/pawn", "textures": { "0": "new_soviet:block/games/chess/black/pawn", "particle": "new_soviet:block/games/chess/black/pawn" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 9, 10], - "faces": { - "north": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5, 8, 5], - "to": [11, 14, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 0]}, - "faces": { - "north": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "east": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "south": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "west": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, - "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "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/chess/black/queen.json b/src/main/resources/assets/new_soviet/models/block/chess/black/queen.json index 5742ab3..44b987d 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/black/queen.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/black/queen.json @@ -1,185 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/queen", "textures": { "0": "new_soviet:block/games/chess/black/queen", "particle": "new_soviet:block/games/chess/black/queen" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 13, 10], - "faces": { - "north": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 13, 5], - "to": [11, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0.5]}, - "faces": { - "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#0"}, - "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [8, 16, 5], - "to": [8, 19, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "east": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "west": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#0"} - } - }, - { - "from": [8, 19, 6], - "to": [8, 20, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "east": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "south": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "west": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "up": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "down": {"uv": [8, 3, 10, 3.5], "texture": "#0"} - } - }, - { - "from": [5, 16, 8], - "to": [11, 19, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "south": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6, 19, 8], - "to": [10, 20, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "east": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "south": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "west": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "up": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "down": {"uv": [8, 3, 10, 3.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5] - }, - 6, - 7, - 8, - 9 - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/black/rook.json b/src/main/resources/assets/new_soviet/models/block/chess/black/rook.json index 6447de6..cbe1662 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/black/rook.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/black/rook.json @@ -1,131 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/rook", "textures": { "0": "new_soviet:block/games/chess/black/rook", "particle": "new_soviet:block/games/chess/black/rook" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 10, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -2, 0]}, - "faces": { - "north": {"uv": [3, 1, 5, 4], "texture": "#0"}, - "east": {"uv": [5, 1, 3, 4], "texture": "#0"}, - "south": {"uv": [3, 1, 5, 4], "texture": "#0"}, - "west": {"uv": [3, 1, 5, 4], "texture": "#0"}, - "up": {"uv": [3, 0.5, 5, 2.5], "texture": "#0"}, - "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"}, - "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"} - } - }, - { - "from": [5, 10, 5], - "to": [11, 15, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 9]}, - "faces": { - "north": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "east": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "south": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "west": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, - "down": {"uv": [8, 0, 11, 3], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4] - }, - 5 - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/king.json b/src/main/resources/assets/new_soviet/models/block/chess/king.json index c5d265d..cf450d9 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/king.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/king.json @@ -1,29 +1,33 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], + "textures": { + "0": "new_soviet:block/games/chess/white/king", + "particle": "new_soviet:block/games/chess/white/king" + }, "elements": [ { "from": [6, 4, 6], "to": [10, 13, 10], "faces": { - "north": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "east": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "south": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "west": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#missing"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#missing"} + "north": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "east": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "south": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "west": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#0"}, + "down": {"uv": [3, 0, 5, 2], "texture": "#0"} } }, { "from": [5.5, 5, 5.5], "to": [10.5, 6, 10.5], "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"} + "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, + "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} } }, { @@ -31,12 +35,12 @@ "to": [10.5, 8, 10.5], "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#missing"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#missing"} + "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, + "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} } }, { @@ -44,62 +48,140 @@ "to": [11, 16, 11], "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0.5]}, "faces": { - "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#missing"}, - "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#missing"} + "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#0"}, + "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#0"} } }, { "from": [5, 1, 5], "to": [11, 4, 11], "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"} + "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, + "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} } }, { "from": [4, 0, 4], "to": [12, 1, 12], "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#missing"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#missing"} + "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, + "down": {"uv": [8, 12, 4, 16], "texture": "#0"} } }, { - "from": [8, 16, 5], - "to": [8, 23, 11], + "from": [8, 16, 6], + "to": [8, 17, 10], "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, "faces": { - "north": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "east": {"uv": [7.5, 3, 10.5, 6.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "west": {"uv": [7.5, 3, 10.5, 6.5], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "north": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "east": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "south": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "west": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 6.5], "texture": "#0"} } }, { - "from": [5, 16, 8], - "to": [11, 23, 8], + "from": [8, 17, 7], + "to": [8, 19, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, + "faces": { + "north": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "east": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "south": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "west": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "up": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "down": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"} + } + }, + { + "from": [8, 21, 7], + "to": [8, 23, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, + "faces": { + "north": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "east": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "south": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "west": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "up": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "down": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"} + } + }, + { + "from": [8, 19, 5], + "to": [8, 21, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, + "faces": { + "north": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "east": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "south": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "west": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "up": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "down": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"} + } + }, + { + "from": [5, 19, 8], + "to": [11, 21, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, "faces": { - "north": {"uv": [7.5, 3, 10.5, 6.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "south": {"uv": [7.5, 3, 10.5, 6.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#missing"} + "north": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "east": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "south": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "west": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "up": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, + "down": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"} + } + }, + { + "from": [7, 21, 8], + "to": [9, 23, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, + "faces": { + "north": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "east": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "south": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "west": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "up": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, + "down": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"} + } + }, + { + "from": [7, 17, 8], + "to": [9, 19, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, + "faces": { + "north": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "east": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "south": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "west": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "up": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, + "down": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"} + } + }, + { + "from": [6, 16, 8], + "to": [10, 17, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, + "faces": { + "north": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "east": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "south": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "west": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 6.5], "texture": "#0"} } } ], @@ -148,6 +230,12 @@ "children": [0, 1, 2, 3, 4, 5] }, 6, - 7 + 7, + 8, + 9, + 10, + 11, + 12, + 13 ] } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/knight.json b/src/main/resources/assets/new_soviet/models/block/chess/knight.json index 2eba977..7514819 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/knight.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/knight.json @@ -1,17 +1,21 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], + "textures": { + "0": "new_soviet:block/games/chess/white/knight", + "particle": "new_soviet:block/games/chess/white/knight" + }, "elements": [ { "from": [6, 4, 6], "to": [10, 12, 10], "faces": { - "north": {"uv": [3, 0, 5, 4], "texture": "#missing"}, - "east": {"uv": [5, 0, 3, 4], "texture": "#missing"}, - "south": {"uv": [3, 0, 5, 4], "texture": "#missing"}, - "west": {"uv": [3, 0, 5, 4], "texture": "#missing"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#missing"}, - "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#missing"} + "north": {"uv": [3, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [5, 0, 3, 4], "texture": "#0"}, + "south": {"uv": [3, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [3, 0, 5, 4], "texture": "#0"}, + "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, + "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#0"} } }, { @@ -19,12 +23,12 @@ "to": [10.5, 11, 13.5], "rotation": {"angle": -22.5, "axis": "x", "origin": [0, 1, 0]}, "faces": { - "north": {"uv": [9, 2, 11.5, 4], "texture": "#missing"}, - "east": {"uv": [9, 0, 5, 2], "texture": "#missing"}, - "south": {"uv": [8.5, 0, 9, 2], "texture": "#missing"}, - "west": {"uv": [5, 0, 9, 2], "texture": "#missing"}, - "up": {"uv": [7.5, 4, 11.5, 6.5], "rotation": 90, "texture": "#missing"}, - "down": {"uv": [9, 1.5, 5, 2], "rotation": 90, "texture": "#missing"} + "north": {"uv": [9, 2, 11.5, 4], "texture": "#0"}, + "east": {"uv": [9, 0, 5, 2], "texture": "#0"}, + "south": {"uv": [8.5, 0, 9, 2], "texture": "#0"}, + "west": {"uv": [5, 0, 9, 2], "texture": "#0"}, + "up": {"uv": [7.5, 4, 11.5, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 1.5, 5, 2], "rotation": 90, "texture": "#0"} } }, { @@ -32,48 +36,48 @@ "to": [8.5, 17, 11], "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, "faces": { - "north": {"uv": [13.5, 3, 14, 7.5], "texture": "#missing"}, - "east": {"uv": [16, 3, 13.5, 7.5], "texture": "#missing"}, - "south": {"uv": [15.5, 3, 16, 7.5], "texture": "#missing"}, - "west": {"uv": [13.5, 3, 16, 7.5], "texture": "#missing"}, - "up": {"uv": [13.5, 3, 16, 3.5], "rotation": 90, "texture": "#missing"}, - "down": {"uv": [15.5, 3, 16, 5.5], "texture": "#missing"} + "north": {"uv": [13.5, 3, 14, 7.5], "texture": "#0"}, + "east": {"uv": [16, 3, 13.5, 7.5], "texture": "#0"}, + "south": {"uv": [15.5, 3, 16, 7.5], "texture": "#0"}, + "west": {"uv": [13.5, 3, 16, 7.5], "texture": "#0"}, + "up": {"uv": [13.5, 3, 16, 3.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [15.5, 3, 16, 5.5], "texture": "#0"} } }, { "from": [5, 1, 5], "to": [11, 4, 11], "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"} + "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, + "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} } }, { "from": [4, 0, 4], "to": [12, 1, 12], "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#missing"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#missing"} + "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, + "down": {"uv": [8, 12, 4, 16], "texture": "#0"} } }, { "from": [5.5, 5, 5.5], "to": [10.5, 6, 10.5], "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"} + "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, + "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} } }, { @@ -81,12 +85,12 @@ "to": [10.5, 8, 10.5], "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, "faces": { - "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#missing"}, - "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#missing"} + "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"}, + "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"} } } ], diff --git a/src/main/resources/assets/new_soviet/models/block/chess/pawn.json b/src/main/resources/assets/new_soviet/models/block/chess/pawn.json index b39c20f..c3ece34 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/pawn.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/pawn.json @@ -1,17 +1,21 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], + "textures": { + "0": "new_soviet:block/games/chess/white/pawn", + "particle": "new_soviet:block/games/chess/white/pawn" + }, "elements": [ { "from": [6, 4, 6], "to": [10, 9, 10], "faces": { - "north": {"uv": [3, 0, 5, 2.5], "texture": "#missing"}, - "east": {"uv": [3, 0, 5, 2.5], "texture": "#missing"}, - "south": {"uv": [3, 0, 5, 2.5], "texture": "#missing"}, - "west": {"uv": [3, 0, 5, 2.5], "texture": "#missing"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#missing"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#missing"} + "north": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, + "east": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, + "south": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, + "west": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, + "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, + "down": {"uv": [3, 0, 5, 2], "texture": "#0"} } }, { @@ -19,48 +23,48 @@ "to": [11, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 0]}, "faces": { - "north": {"uv": [5, 0, 8, 3], "texture": "#missing"}, - "east": {"uv": [5, 0, 8, 3], "texture": "#missing"}, - "south": {"uv": [5, 0, 8, 3], "texture": "#missing"}, - "west": {"uv": [5, 0, 8, 3], "texture": "#missing"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#missing"}, - "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#missing"} + "north": {"uv": [5, 0, 8, 3], "texture": "#0"}, + "east": {"uv": [5, 0, 8, 3], "texture": "#0"}, + "south": {"uv": [5, 0, 8, 3], "texture": "#0"}, + "west": {"uv": [5, 0, 8, 3], "texture": "#0"}, + "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, + "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#0"} } }, { "from": [5.5, 5, 5.5], "to": [10.5, 6, 10.5], "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#missing"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#missing"} + "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, + "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} } }, { "from": [5, 1, 5], "to": [11, 4, 11], "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"} + "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, + "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} } }, { "from": [4, 0, 4], "to": [12, 1, 12], "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#missing"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#missing"} + "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, + "down": {"uv": [8, 12, 4, 16], "texture": "#0"} } } ], diff --git a/src/main/resources/assets/new_soviet/models/block/chess/queen.json b/src/main/resources/assets/new_soviet/models/block/chess/queen.json index 47f9e00..1f43ed7 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/queen.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/queen.json @@ -1,29 +1,33 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], + "textures": { + "0": "new_soviet:block/games/chess/white/queen", + "particle": "new_soviet:block/games/chess/white/queen" + }, "elements": [ { "from": [6, 4, 6], "to": [10, 13, 10], "faces": { - "north": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "east": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "south": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "west": {"uv": [3, 0, 5, 4.5], "texture": "#missing"}, - "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#missing"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#missing"} + "north": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "east": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "south": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "west": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, + "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#0"}, + "down": {"uv": [3, 0, 5, 2], "texture": "#0"} } }, { "from": [5.5, 5, 5.5], "to": [10.5, 6, 10.5], "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"} + "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, + "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} } }, { @@ -31,12 +35,12 @@ "to": [10.5, 8, 10.5], "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#missing"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#missing"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#missing"} + "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, + "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, + "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} } }, { @@ -44,62 +48,88 @@ "to": [11, 16, 11], "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0.5]}, "faces": { - "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#missing"}, - "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#missing"}, - "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#missing"} + "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, + "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#0"}, + "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#0"} } }, { "from": [5, 1, 5], "to": [11, 4, 11], "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"} + "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, + "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} } }, { "from": [4, 0, 4], "to": [12, 1, 12], "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#missing"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#missing"} + "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, + "down": {"uv": [8, 12, 4, 16], "texture": "#0"} } }, { "from": [8, 16, 5], - "to": [8, 20, 11], + "to": [8, 19, 11], "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, "faces": { - "north": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "east": {"uv": [7.5, 3, 10.5, 5], "texture": "#missing"}, - "south": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "west": {"uv": [7.5, 3, 10.5, 5], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#0"} + } + }, + { + "from": [8, 19, 6], + "to": [8, 20, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#0"} } }, { "from": [5, 16, 8], - "to": [11, 20, 8], + "to": [11, 19, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, "faces": { - "north": {"uv": [7.5, 3, 10.5, 5], "texture": "#missing"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "south": {"uv": [7.5, 3, 10.5, 5], "texture": "#missing"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#missing"} + "north": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "south": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [6, 19, 8], + "to": [10, 20, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, + "faces": { + "north": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "south": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#0"} } } ], @@ -148,6 +178,8 @@ "children": [0, 1, 2, 3, 4, 5] }, 6, - 7 + 7, + 8, + 9 ] } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/rook.json b/src/main/resources/assets/new_soviet/models/block/chess/rook.json index 0393b46..7355c4e 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/rook.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/rook.json @@ -1,54 +1,58 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], + "textures": { + "0": "new_soviet:block/games/chess/white/rook", + "particle": "new_soviet:block/games/chess/white/rook" + }, "elements": [ { "from": [6, 4, 6], "to": [10, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [0, -2, 0]}, "faces": { - "north": {"uv": [3, 1, 5, 4], "texture": "#missing"}, - "east": {"uv": [5, 1, 3, 4], "texture": "#missing"}, - "south": {"uv": [3, 1, 5, 4], "texture": "#missing"}, - "west": {"uv": [3, 1, 5, 4], "texture": "#missing"}, - "up": {"uv": [3, 0.5, 5, 2.5], "texture": "#missing"}, - "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#missing"} + "north": {"uv": [3, 1, 5, 4], "texture": "#0"}, + "east": {"uv": [5, 1, 3, 4], "texture": "#0"}, + "south": {"uv": [3, 1, 5, 4], "texture": "#0"}, + "west": {"uv": [3, 1, 5, 4], "texture": "#0"}, + "up": {"uv": [3, 0.5, 5, 2.5], "texture": "#0"}, + "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#0"} } }, { "from": [5, 1, 5], "to": [11, 4, 11], "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#missing"} + "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, + "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, + "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} } }, { "from": [4, 0, 4], "to": [12, 1, 12], "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#missing"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#missing"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#missing"} + "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, + "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, + "down": {"uv": [8, 12, 4, 16], "texture": "#0"} } }, { "from": [5.5, 5, 5.5], "to": [10.5, 6, 10.5], "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#missing"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#missing"} + "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, + "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, + "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} } }, { @@ -56,12 +60,12 @@ "to": [10.5, 8, 10.5], "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, "faces": { - "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#missing"}, - "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#missing"}, - "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#missing"} + "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, + "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"}, + "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"} } }, { @@ -69,12 +73,12 @@ "to": [11, 15, 11], "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 9]}, "faces": { - "north": {"uv": [5, 0, 8, 2.5], "texture": "#missing"}, - "east": {"uv": [5, 0, 8, 2.5], "texture": "#missing"}, - "south": {"uv": [5, 0, 8, 2.5], "texture": "#missing"}, - "west": {"uv": [5, 0, 8, 2.5], "texture": "#missing"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#missing"}, - "down": {"uv": [8, 0, 11, 3], "texture": "#missing"} + "north": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, + "east": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, + "south": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, + "west": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, + "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, + "down": {"uv": [8, 0, 11, 3], "texture": "#0"} } } ], diff --git a/src/main/resources/assets/new_soviet/models/block/chess/white/bishop.json b/src/main/resources/assets/new_soviet/models/block/chess/white/bishop.json index 818723c..16672c3 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/white/bishop.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/white/bishop.json @@ -1,130 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/bishop", "textures": { "0": "new_soviet:block/games/chess/white/bishop", "particle": "new_soviet:block/games/chess/white/bishop" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 10, 10], - "faces": { - "north": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 3], "texture": "#0"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5, 10, 5], - "to": [11, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [10.5, 3, 13.5, 6], "texture": "#0"}, - "east": {"uv": [10.5, 0, 13.5, 3], "texture": "#0"}, - "south": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "west": {"uv": [13.5, 0, 10.5, 3], "texture": "#0"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, - "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 8, 5], - "to": [11, 9, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 3, 0.5]}, - "faces": { - "north": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "east": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "south": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "west": {"uv": [1, 4.5, 4, 5], "texture": "#0"}, - "up": {"uv": [1, 5, 4, 8], "texture": "#0"}, - "down": {"uv": [1, 5, 4, 8], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 19, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 7]}, - "faces": { - "north": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "east": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "south": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "west": {"uv": [3, 3, 4, 4.5], "texture": "#0"}, - "up": {"uv": [4, 3, 5, 4], "texture": "#0"}, - "down": {"uv": [4, 3, 5, 4], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5] - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/white/king.json b/src/main/resources/assets/new_soviet/models/block/chess/white/king.json index dbe65db..6108eab 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/white/king.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/white/king.json @@ -1,241 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/king", "textures": { "0": "new_soviet:block/games/chess/white/king", "particle": "new_soviet:block/games/chess/white/king" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 13, 10], - "faces": { - "north": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 13, 5], - "to": [11, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0.5]}, - "faces": { - "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#0"}, - "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [8, 16, 6], - "to": [8, 17, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "east": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "south": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "west": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "up": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "down": {"uv": [8, 6, 10, 6.5], "texture": "#0"} - } - }, - { - "from": [8, 17, 7], - "to": [8, 19, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "east": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "south": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "west": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "up": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "down": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"} - } - }, - { - "from": [8, 21, 7], - "to": [8, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "east": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "south": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "west": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "up": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "down": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"} - } - }, - { - "from": [8, 19, 5], - "to": [8, 21, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "east": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "south": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "west": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "up": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "down": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"} - } - }, - { - "from": [5, 19, 8], - "to": [11, 21, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "east": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "south": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "west": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "up": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"}, - "down": {"uv": [7.5, 4, 10.5, 5], "texture": "#0"} - } - }, - { - "from": [7, 21, 8], - "to": [9, 23, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "east": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "south": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "west": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "up": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"}, - "down": {"uv": [8.5, 3, 9.5, 4], "texture": "#0"} - } - }, - { - "from": [7, 17, 8], - "to": [9, 19, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "east": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "south": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "west": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "up": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"}, - "down": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"} - } - }, - { - "from": [6, 16, 8], - "to": [10, 17, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "east": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "south": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "west": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "up": {"uv": [8, 6, 10, 6.5], "texture": "#0"}, - "down": {"uv": [8, 6, 10, 6.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5] - }, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13 - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/white/knight.json b/src/main/resources/assets/new_soviet/models/block/chess/white/knight.json index ac09fcc..1a20b83 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/white/knight.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/white/knight.json @@ -1,142 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/knight", "textures": { "0": "new_soviet:block/games/chess/white/knight", "particle": "new_soviet:block/games/chess/white/knight" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 12, 10], - "faces": { - "north": {"uv": [3, 0, 5, 4], "texture": "#0"}, - "east": {"uv": [5, 0, 3, 4], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 4], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 4], "texture": "#0"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, - "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 11, 13.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [0, 1, 0]}, - "faces": { - "north": {"uv": [9, 2, 11.5, 4], "texture": "#0"}, - "east": {"uv": [9, 0, 5, 2], "texture": "#0"}, - "south": {"uv": [8.5, 0, 9, 2], "texture": "#0"}, - "west": {"uv": [5, 0, 9, 2], "texture": "#0"}, - "up": {"uv": [7.5, 4, 11.5, 6.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [9, 1.5, 5, 2], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [7.5, 8, 6], - "to": [8.5, 17, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [13.5, 3, 14, 7.5], "texture": "#0"}, - "east": {"uv": [16, 3, 13.5, 7.5], "texture": "#0"}, - "south": {"uv": [15.5, 3, 16, 7.5], "texture": "#0"}, - "west": {"uv": [13.5, 3, 16, 7.5], "texture": "#0"}, - "up": {"uv": [13.5, 3, 16, 3.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [15.5, 3, 16, 5.5], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"}, - "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "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/chess/white/pawn.json b/src/main/resources/assets/new_soviet/models/block/chess/white/pawn.json index 6ca9dcc..9d78718 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/white/pawn.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/white/pawn.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/pawn", "textures": { "0": "new_soviet:block/games/chess/white/pawn", "particle": "new_soviet:block/games/chess/white/pawn" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 9, 10], - "faces": { - "north": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 2.5], "texture": "#0"}, - "up": {"uv": [3, 0, 5, 2], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5, 8, 5], - "to": [11, 14, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 0]}, - "faces": { - "north": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "east": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "south": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "west": {"uv": [5, 0, 8, 3], "texture": "#0"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, - "down": {"uv": [5, 2.5, 5.5, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "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/chess/white/queen.json b/src/main/resources/assets/new_soviet/models/block/chess/white/queen.json index 2c0455c..76e17b2 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/white/queen.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/white/queen.json @@ -1,185 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/queen", "textures": { "0": "new_soviet:block/games/chess/white/queen", "particle": "new_soviet:block/games/chess/white/queen" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 13, 10], - "faces": { - "north": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "east": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "south": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "west": {"uv": [3, 0, 5, 4.5], "texture": "#0"}, - "up": {"uv": [3, 4.5, 5, 6.5], "texture": "#0"}, - "down": {"uv": [3, 0, 5, 2], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "east": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "south": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#0"}, - "up": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"}, - "down": {"uv": [8, 0.5, 10.5, 3], "texture": "#0"} - } - }, - { - "from": [5, 13, 5], - "to": [11, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0.5]}, - "faces": { - "north": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "east": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "south": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "west": {"uv": [10.5, 0, 13.5, 1.5], "texture": "#0"}, - "up": {"uv": [10.5, 4.5, 13.5, 7.5], "texture": "#0"}, - "down": {"uv": [10.5, 1.5, 13.5, 4.5], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [8, 16, 5], - "to": [8, 19, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "east": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "west": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#0"} - } - }, - { - "from": [8, 19, 6], - "to": [8, 20, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 16, 5]}, - "faces": { - "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "east": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "west": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#0"} - } - }, - { - "from": [5, 16, 8], - "to": [11, 19, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "south": {"uv": [7.5, 3.5, 10.5, 5], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6, 19, 8], - "to": [10, 20, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, - "faces": { - "north": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "south": {"uv": [8, 3, 10, 3.5], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5] - }, - 6, - 7, - 8, - 9 - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chess/white/rook.json b/src/main/resources/assets/new_soviet/models/block/chess/white/rook.json index caa4731..fb8e2b3 100644 --- a/src/main/resources/assets/new_soviet/models/block/chess/white/rook.json +++ b/src/main/resources/assets/new_soviet/models/block/chess/white/rook.json @@ -1,131 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "new_soviet:block/chess/rook", "textures": { "0": "new_soviet:block/games/chess/white/rook", "particle": "new_soviet:block/games/chess/white/rook" - }, - "elements": [ - { - "from": [6, 4, 6], - "to": [10, 10, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -2, 0]}, - "faces": { - "north": {"uv": [3, 1, 5, 4], "texture": "#0"}, - "east": {"uv": [5, 1, 3, 4], "texture": "#0"}, - "south": {"uv": [3, 1, 5, 4], "texture": "#0"}, - "west": {"uv": [3, 1, 5, 4], "texture": "#0"}, - "up": {"uv": [3, 0.5, 5, 2.5], "texture": "#0"}, - "down": {"uv": [4.5, 3.5, 5, 4], "texture": "#0"} - } - }, - { - "from": [5, 1, 5], - "to": [11, 4, 11], - "faces": { - "north": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1.5], "texture": "#0"}, - "up": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"}, - "down": {"uv": [0, 1.5, 3, 4.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 4], - "to": [12, 1, 12], - "faces": { - "north": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "east": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "south": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "west": {"uv": [0, 15.5, 4, 16], "texture": "#0"}, - "up": {"uv": [0, 11.5, 4, 15.5], "texture": "#0"}, - "down": {"uv": [8, 12, 4, 16], "texture": "#0"} - } - }, - { - "from": [5.5, 5, 5.5], - "to": [10.5, 6, 10.5], - "faces": { - "north": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "east": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "south": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "west": {"uv": [13.5, 0, 16, 0.5], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 16, 3], "texture": "#0"} - } - }, - { - "from": [5.5, 7, 5.5], - "to": [10.5, 8, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "east": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "south": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "west": {"uv": [0, 5.5, 2.5, 6], "texture": "#0"}, - "up": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"}, - "down": {"uv": [0, 6, 2.5, 8.5], "texture": "#0"} - } - }, - { - "from": [5, 10, 5], - "to": [11, 15, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 9]}, - "faces": { - "north": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "east": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "south": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "west": {"uv": [5, 0, 8, 2.5], "texture": "#0"}, - "up": {"uv": [5, 3, 8, 6], "texture": "#0"}, - "down": {"uv": [8, 0, 11, 3], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [50, 30, 0], - "translation": [0, 1.25, 1], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-15, 10, 0], - "translation": [-1, 5.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.6, 0.6, 0.6] - }, - "gui": { - "rotation": [0, 150, 0], - "translation": [0, -1.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4] - }, - 5 - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json index 5ce596b..2c128d9 100644 --- a/src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "parent": "block/block", "ambientocclusion": false, "textures": { diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json index 2e58ef1..38341f2 100644 --- a/src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "1": "new_soviet:block/industrial/po_2_wall/po2_pillar", "particle": "new_soviet:block/industrial/po_2_wall/po2" diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json index 635353f..fbda078 100644 --- a/src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/industrial/po_2_wall/po2", "1": "new_soviet:block/industrial/po_2_wall/po2_side", diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json index 63f3187..b351ea3 100644 --- a/src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/industrial/po_2_wall/po2", "1": "new_soviet:block/industrial/po_2_wall/po2_side", diff --git a/src/main/resources/assets/new_soviet/models/block/crate.json b/src/main/resources/assets/new_soviet/models/block/crate.json index d78b9d6..7bbe1ef 100644 --- a/src/main/resources/assets/new_soviet/models/block/crate.json +++ b/src/main/resources/assets/new_soviet/models/block/crate.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "1": "new_soviet:block/industrial/crate_1", "2": "new_soviet:block/industrial/crate_2", diff --git a/src/main/resources/assets/new_soviet/models/block/golden_table_lamp.json b/src/main/resources/assets/new_soviet/models/block/golden_table_lamp.json index f9ce546..15f292a 100644 --- a/src/main/resources/assets/new_soviet/models/block/golden_table_lamp.json +++ b/src/main/resources/assets/new_soviet/models/block/golden_table_lamp.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], "textures": { "0": "new_soviet:block/custom/furniture/golden_table_lamp", diff --git a/src/main/resources/assets/new_soviet/models/block/handrail/handrail.json b/src/main/resources/assets/new_soviet/models/block/handrail/handrail.json index cf839ad..bff7b84 100644 --- a/src/main/resources/assets/new_soviet/models/block/handrail/handrail.json +++ b/src/main/resources/assets/new_soviet/models/block/handrail/handrail.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [64, 64], "textures": { "0": "new_soviet:block/custom/handrail", diff --git a/src/main/resources/assets/new_soviet/models/block/handrail/handrail_left.json b/src/main/resources/assets/new_soviet/models/block/handrail/handrail_left.json index bb17a8a..4ec50bb 100644 --- a/src/main/resources/assets/new_soviet/models/block/handrail/handrail_left.json +++ b/src/main/resources/assets/new_soviet/models/block/handrail/handrail_left.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [64, 64], "textures": { "0": "new_soviet:block/custom/handrail", diff --git a/src/main/resources/assets/new_soviet/models/block/handrail/handrail_right.json b/src/main/resources/assets/new_soviet/models/block/handrail/handrail_right.json index c89000c..71a8a7f 100644 --- a/src/main/resources/assets/new_soviet/models/block/handrail/handrail_right.json +++ b/src/main/resources/assets/new_soviet/models/block/handrail/handrail_right.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [64, 64], "textures": { "0": "new_soviet:block/custom/handrail", 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 index a768424..85b8c89 100644 --- a/src/main/resources/assets/new_soviet/models/block/lamp_post.json +++ b/src/main/resources/assets/new_soviet/models/block/lamp_post.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [48, 48], "textures": { "0": "new_soviet:block/lamp_post/lamp_post", 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 index 628c311..313ea6c 100644 --- 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 @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [48, 48], "textures": { "1": "new_soviet:block/lamp_post/lamp_post_2", 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 index 65422cf..fbee71e 100644 --- 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 @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [80, 80], "textures": { "1": "new_soviet:block/lamp_post/lamp_post", 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 index 36f9c8b..b369491 100644 --- 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 @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [48, 48], "textures": { "0": "new_soviet:block/lamp_post/lamp_post_4", 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..6b81995 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 @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [48, 48], "textures": { "0": "new_soviet:block/lamp_post/lamp_post", 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..4ba754d 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 @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [48, 48], "textures": { "0": "new_soviet:block/lamp_post/lamp_post", diff --git a/src/main/resources/assets/new_soviet/models/block/landmine.json b/src/main/resources/assets/new_soviet/models/block/landmine.json index b124832..0b23b2e 100644 --- a/src/main/resources/assets/new_soviet/models/block/landmine.json +++ b/src/main/resources/assets/new_soviet/models/block/landmine.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], "textures": { "0": "new_soviet:block/combat/ap_mine", diff --git a/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json b/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json index 80b3a3a..630d8ba 100644 --- a/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json +++ b/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/furniture/light_bulb_off", "particle": "new_soviet:block/custom/furniture/light_bulb_off" diff --git a/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json b/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json index b2eacc2..79bd3ce 100644 --- a/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json +++ b/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/furniture/light_bulb_on", "particle": "new_soviet:block/custom/furniture/light_bulb_on" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_1.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_1.json index 0748dc0..25f6fbc 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_1.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_1.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_2.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_2.json index c4e0d78..f0bf9e3 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_2.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_2.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_3.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_3.json index 41b1ea5..ea500db 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_3.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_3.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_4.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_4.json index a228403..cf97dc4 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_4.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_4.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_5.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_5.json index 6156664..1f6b04f 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_5.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_5.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_6.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_6.json index 70f5dd0..4739a1a 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_6.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_6.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_7.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_7.json index 7947b03..232b0de 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_7.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_7.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_8.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_8.json index 6dc25d2..19f3d11 100644 --- a/src/main/resources/assets/new_soviet/models/block/purple_goo_8.json +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_8.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/purple_goo/purple_goo", "particle": "new_soviet:block/purple_goo/purple_goo" diff --git a/src/main/resources/assets/new_soviet/models/block/radio_receiver.json b/src/main/resources/assets/new_soviet/models/block/radio_receiver.json index 60ce66f..c9ba0c6 100644 --- a/src/main/resources/assets/new_soviet/models/block/radio_receiver.json +++ b/src/main/resources/assets/new_soviet/models/block/radio_receiver.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], "textures": { "0": "new_soviet:block/custom/electronics/radio", diff --git a/src/main/resources/assets/new_soviet/models/block/siren.json b/src/main/resources/assets/new_soviet/models/block/siren.json index aea0420..71e80be 100644 --- a/src/main/resources/assets/new_soviet/models/block/siren.json +++ b/src/main/resources/assets/new_soviet/models/block/siren.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [32, 32], "textures": { "0": "new_soviet:block/custom/electronics/siren", diff --git a/src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json b/src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json index c4532e0..bc3fdd2 100644 --- a/src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json +++ b/src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/switches/switch_type_1", "particle": "new_soviet:block/custom/switches/switch_type_1" diff --git a/src/main/resources/assets/new_soviet/models/block/switch_type_1_on.json b/src/main/resources/assets/new_soviet/models/block/switch_type_1_on.json index 1ec0852..2b07225 100644 --- a/src/main/resources/assets/new_soviet/models/block/switch_type_1_on.json +++ b/src/main/resources/assets/new_soviet/models/block/switch_type_1_on.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/switches/switch_type_1", "particle": "new_soviet:block/custom/switches/switch_type_1" diff --git a/src/main/resources/assets/new_soviet/models/block/switch_type_2_off.json b/src/main/resources/assets/new_soviet/models/block/switch_type_2_off.json index 29cc1cf..c2946d7 100644 --- a/src/main/resources/assets/new_soviet/models/block/switch_type_2_off.json +++ b/src/main/resources/assets/new_soviet/models/block/switch_type_2_off.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/switches/switch_type_2", "particle": "new_soviet:block/custom/switches/switch_type_2" diff --git a/src/main/resources/assets/new_soviet/models/block/switch_type_2_off_fix.json b/src/main/resources/assets/new_soviet/models/block/switch_type_2_off_fix.json index 5048e43..3850ed9 100644 --- a/src/main/resources/assets/new_soviet/models/block/switch_type_2_off_fix.json +++ b/src/main/resources/assets/new_soviet/models/block/switch_type_2_off_fix.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/switches/switch_type_2", "particle": "new_soviet:block/custom/switches/switch_type_2" diff --git a/src/main/resources/assets/new_soviet/models/block/switch_type_2_on.json b/src/main/resources/assets/new_soviet/models/block/switch_type_2_on.json index 5dbfcbd..7010e53 100644 --- a/src/main/resources/assets/new_soviet/models/block/switch_type_2_on.json +++ b/src/main/resources/assets/new_soviet/models/block/switch_type_2_on.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "textures": { "0": "new_soviet:block/custom/switches/switch_type_2", "particle": "new_soviet:block/custom/switches/switch_type_2" diff --git a/src/main/resources/assets/new_soviet/models/block/table_lamp.json b/src/main/resources/assets/new_soviet/models/block/table_lamp.json index e2ec72a..69b6f14 100644 --- a/src/main/resources/assets/new_soviet/models/block/table_lamp.json +++ b/src/main/resources/assets/new_soviet/models/block/table_lamp.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "parent": "minecraft:block/cube_all", "texture_size": [64, 64], "textures": { diff --git a/src/main/resources/assets/new_soviet/models/block/tv/tv.json b/src/main/resources/assets/new_soviet/models/block/tv/tv.json index e20ded9..448c4e5 100644 --- a/src/main/resources/assets/new_soviet/models/block/tv/tv.json +++ b/src/main/resources/assets/new_soviet/models/block/tv/tv.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [64, 64], "textures": { "0": "new_soviet:block/custom/electronics/tv/orange_tv", diff --git a/src/main/resources/assets/new_soviet/models/block/vintage_lamp.json b/src/main/resources/assets/new_soviet/models/block/vintage_lamp.json index 41ba3d8..c9e05d9 100644 --- a/src/main/resources/assets/new_soviet/models/block/vintage_lamp.json +++ b/src/main/resources/assets/new_soviet/models/block/vintage_lamp.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Feulim Temly with Blockbench", "texture_size": [64, 64], "textures": { "1": "new_soviet:block/custom/furniture/vintage_lamp", diff --git a/src/main/resources/assets/new_soviet/models/item/black_bishop.json b/src/main/resources/assets/new_soviet/models/item/black_bishop.json index a0ab399..f5c0096 100644 --- a/src/main/resources/assets/new_soviet/models/item/black_bishop.json +++ b/src/main/resources/assets/new_soviet/models/item/black_bishop.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/black/bishop" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/black_checker.json b/src/main/resources/assets/new_soviet/models/item/black_checker.json index 05c628b..f9ed8ac 100644 --- a/src/main/resources/assets/new_soviet/models/item/black_checker.json +++ b/src/main/resources/assets/new_soviet/models/item/black_checker.json @@ -1,8 +1,7 @@ { - "credit": "Karoter2", + "credit": "Feulim Temly", "parent": "item/generated", "textures": { "layer0": "new_soviet:item/black_checker" } -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/black_king.json b/src/main/resources/assets/new_soviet/models/item/black_king.json index c495d98..50e1bfc 100644 --- a/src/main/resources/assets/new_soviet/models/item/black_king.json +++ b/src/main/resources/assets/new_soviet/models/item/black_king.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/black/king" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/black_knight.json b/src/main/resources/assets/new_soviet/models/item/black_knight.json index b4eb70e..6446521 100644 --- a/src/main/resources/assets/new_soviet/models/item/black_knight.json +++ b/src/main/resources/assets/new_soviet/models/item/black_knight.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/black/knight" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/black_pawn.json b/src/main/resources/assets/new_soviet/models/item/black_pawn.json index feddc88..7108483 100644 --- a/src/main/resources/assets/new_soviet/models/item/black_pawn.json +++ b/src/main/resources/assets/new_soviet/models/item/black_pawn.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/black/pawn" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/black_queen.json b/src/main/resources/assets/new_soviet/models/item/black_queen.json index 0a59c73..8118375 100644 --- a/src/main/resources/assets/new_soviet/models/item/black_queen.json +++ b/src/main/resources/assets/new_soviet/models/item/black_queen.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/black/queen" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/black_rook.json b/src/main/resources/assets/new_soviet/models/item/black_rook.json index 9a99a6b..ab4d40e 100644 --- a/src/main/resources/assets/new_soviet/models/item/black_rook.json +++ b/src/main/resources/assets/new_soviet/models/item/black_rook.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/black/rook" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/brown_tv.json b/src/main/resources/assets/new_soviet/models/item/brown_tv.json index 31ea3ac..c405c3b 100644 --- a/src/main/resources/assets/new_soviet/models/item/brown_tv.json +++ b/src/main/resources/assets/new_soviet/models/item/brown_tv.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/tv/brown_tv" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/ceiling_fan.json b/src/main/resources/assets/new_soviet/models/item/ceiling_fan.json index ade42ea..0320323 100644 --- a/src/main/resources/assets/new_soviet/models/item/ceiling_fan.json +++ b/src/main/resources/assets/new_soviet/models/item/ceiling_fan.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/ceiling_fan_off" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cigarette.json b/src/main/resources/assets/new_soviet/models/item/cigarette.json index 615d13c..a25de1c 100644 --- a/src/main/resources/assets/new_soviet/models/item/cigarette.json +++ b/src/main/resources/assets/new_soviet/models/item/cigarette.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly with BlockBench", "textures": { "1": "new_soviet:item/cigarette", "particle": "new_soviet:item/cigarette" diff --git a/src/main/resources/assets/new_soviet/models/item/cigarette_butt.json b/src/main/resources/assets/new_soviet/models/item/cigarette_butt.json index 47b9345..21c80eb 100644 --- a/src/main/resources/assets/new_soviet/models/item/cigarette_butt.json +++ b/src/main/resources/assets/new_soviet/models/item/cigarette_butt.json @@ -1,5 +1,5 @@ { - "credit": "Karoter2", + "credit": "Feulim Temly", "parent": "item/generated", "textures": { "layer0": "new_soviet:item/cigarette_butt" diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json index 09288d9..18f7e84 100644 --- a/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json +++ b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/cracked_light_blue_bricks_slab" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json index db60f9f..7144d55 100644 --- a/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json +++ b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/cracked_light_blue_bricks_stairs" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/dark_switch.json b/src/main/resources/assets/new_soviet/models/item/dark_switch.json index 58a98c6..2910c13 100644 --- a/src/main/resources/assets/new_soviet/models/item/dark_switch.json +++ b/src/main/resources/assets/new_soviet/models/item/dark_switch.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/switch_type_2_off" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/dice_d4.json b/src/main/resources/assets/new_soviet/models/item/dice_d4.json index a1a126f..fd0659b 100644 --- a/src/main/resources/assets/new_soviet/models/item/dice_d4.json +++ b/src/main/resources/assets/new_soviet/models/item/dice_d4.json @@ -3,5 +3,4 @@ "textures": { "layer0": "new_soviet:item/dice/dice_d4" } -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/dice_d6.json b/src/main/resources/assets/new_soviet/models/item/dice_d6.json index 02d134f..d0feb04 100644 --- a/src/main/resources/assets/new_soviet/models/item/dice_d6.json +++ b/src/main/resources/assets/new_soviet/models/item/dice_d6.json @@ -3,5 +3,4 @@ "textures": { "layer0": "new_soviet:item/dice/dice_d6" } -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/handrail.json b/src/main/resources/assets/new_soviet/models/item/handrail.json index fffff85..5744505 100644 --- a/src/main/resources/assets/new_soviet/models/item/handrail.json +++ b/src/main/resources/assets/new_soviet/models/item/handrail.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/handrail/handrail" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/meat.json b/src/main/resources/assets/new_soviet/models/item/meat.json index 2e688b8..7b266e4 100644 --- a/src/main/resources/assets/new_soviet/models/item/meat.json +++ b/src/main/resources/assets/new_soviet/models/item/meat.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/meat_1" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/meat_eye.json b/src/main/resources/assets/new_soviet/models/item/meat_eye.json index 828c77f..cddaf00 100644 --- a/src/main/resources/assets/new_soviet/models/item/meat_eye.json +++ b/src/main/resources/assets/new_soviet/models/item/meat_eye.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/meat_eye" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/meat_teeth.json b/src/main/resources/assets/new_soviet/models/item/meat_teeth.json index 1c5144a..64d459b 100644 --- a/src/main/resources/assets/new_soviet/models/item/meat_teeth.json +++ b/src/main/resources/assets/new_soviet/models/item/meat_teeth.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/meat_teeth" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/purple_goo.json b/src/main/resources/assets/new_soviet/models/item/purple_goo.json index 6d12260..4f08260 100644 --- a/src/main/resources/assets/new_soviet/models/item/purple_goo.json +++ b/src/main/resources/assets/new_soviet/models/item/purple_goo.json @@ -3,5 +3,4 @@ "textures": { "layer0": "new_soviet:item/purple_goo_item" } -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/rake.json b/src/main/resources/assets/new_soviet/models/item/rake.json index caad4ea..16995fc 100644 --- a/src/main/resources/assets/new_soviet/models/item/rake.json +++ b/src/main/resources/assets/new_soviet/models/item/rake.json @@ -1,5 +1,5 @@ { - "credit": "Made by Feulim (karoter2)", + "credit": "Made by Feulim Temly", "texture_size": [64, 64], "textures": { "0": "new_soviet:item/rake", diff --git a/src/main/resources/assets/new_soviet/models/item/red_tv.json b/src/main/resources/assets/new_soviet/models/item/red_tv.json index bb1582a..8d3cc3e 100644 --- a/src/main/resources/assets/new_soviet/models/item/red_tv.json +++ b/src/main/resources/assets/new_soviet/models/item/red_tv.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/tv/red_tv" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/siren.json b/src/main/resources/assets/new_soviet/models/item/siren.json index 7d19f7b..496b6e3 100644 --- a/src/main/resources/assets/new_soviet/models/item/siren.json +++ b/src/main/resources/assets/new_soviet/models/item/siren.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/siren" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/tv.json b/src/main/resources/assets/new_soviet/models/item/tv.json index ef12a65..30bfba3 100644 --- a/src/main/resources/assets/new_soviet/models/item/tv.json +++ b/src/main/resources/assets/new_soviet/models/item/tv.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/tv/tv" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/vintage_lamp.json b/src/main/resources/assets/new_soviet/models/item/vintage_lamp.json index 032aa6c..eae7846 100644 --- a/src/main/resources/assets/new_soviet/models/item/vintage_lamp.json +++ b/src/main/resources/assets/new_soviet/models/item/vintage_lamp.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/vintage_lamp" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_bishop.json b/src/main/resources/assets/new_soviet/models/item/white_bishop.json index e822abe..a896f40 100644 --- a/src/main/resources/assets/new_soviet/models/item/white_bishop.json +++ b/src/main/resources/assets/new_soviet/models/item/white_bishop.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/white/bishop" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_checker.json b/src/main/resources/assets/new_soviet/models/item/white_checker.json index 0906cc8..36b8fc2 100644 --- a/src/main/resources/assets/new_soviet/models/item/white_checker.json +++ b/src/main/resources/assets/new_soviet/models/item/white_checker.json @@ -1,8 +1,7 @@ { - "credit": "Karoter2", + "credit": "Feulim Temly", "parent": "item/generated", "textures": { "layer0": "new_soviet:item/white_checker" } -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_king.json b/src/main/resources/assets/new_soviet/models/item/white_king.json index 7b9420f..fe9f49f 100644 --- a/src/main/resources/assets/new_soviet/models/item/white_king.json +++ b/src/main/resources/assets/new_soviet/models/item/white_king.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/white/king" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_knight.json b/src/main/resources/assets/new_soviet/models/item/white_knight.json index c81af23..f75822c 100644 --- a/src/main/resources/assets/new_soviet/models/item/white_knight.json +++ b/src/main/resources/assets/new_soviet/models/item/white_knight.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/white/knight" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_pawn.json b/src/main/resources/assets/new_soviet/models/item/white_pawn.json index 70d8fbb..21615bf 100644 --- a/src/main/resources/assets/new_soviet/models/item/white_pawn.json +++ b/src/main/resources/assets/new_soviet/models/item/white_pawn.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/white/pawn" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_queen.json b/src/main/resources/assets/new_soviet/models/item/white_queen.json index 43a602d..2d8d76e 100644 --- a/src/main/resources/assets/new_soviet/models/item/white_queen.json +++ b/src/main/resources/assets/new_soviet/models/item/white_queen.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/white/queen" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_rook.json b/src/main/resources/assets/new_soviet/models/item/white_rook.json index 5563727..f506f2f 100644 --- a/src/main/resources/assets/new_soviet/models/item/white_rook.json +++ b/src/main/resources/assets/new_soviet/models/item/white_rook.json @@ -1,4 +1,3 @@ { "parent": "new_soviet:block/chess/white/rook" -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/bathroom.json b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/bathroom.json deleted file mode 100644 index ed98c65..0000000 --- a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/bathroom.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [96, 96], - "textures": { - "0": "bathroom", - "1": "gp/block/block_five/sink", - "particle": "bathroom" - }, - "elements": [ - { - "from": [-15, 1, 1], - "to": [15, 10, 15], - "faces": { - "north": {"uv": [2.33333, 5.66667, 7.33333, 7.16667], "texture": "#0"}, - "east": {"uv": [0, 5.66667, 2.33333, 7.16667], "texture": "#0"}, - "south": {"uv": [9.66667, 5.66667, 14.66667, 7.16667], "texture": "#0"}, - "west": {"uv": [7.33333, 5.66667, 9.66667, 7.16667], "texture": "#0"}, - "up": {"uv": [7.33333, 5.66667, 2.33333, 3.33333], "texture": "#0"}, - "down": {"uv": [12.33333, 3.33333, 7.33333, 5.66667], "texture": "#0"} - } - }, - { - "from": [10, 0, 1], - "to": [13, 1, 5], - "faces": { - "north": {"uv": [0.66667, 0.66667, 1.16667, 0.83333], "texture": "#0"}, - "east": {"uv": [0, 0.66667, 0.66667, 0.83333], "texture": "#0"}, - "south": {"uv": [1.83333, 0.66667, 2.33333, 0.83333], "texture": "#0"}, - "west": {"uv": [1.16667, 0.66667, 1.83333, 0.83333], "texture": "#0"}, - "up": {"uv": [1.16667, 0.66667, 0.66667, 0], "texture": "#0"}, - "down": {"uv": [1.66667, 0, 1.16667, 0.66667], "texture": "#0"} - } - }, - { - "from": [10, 0, 11], - "to": [13, 1, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, - "faces": { - "north": {"uv": [0.66667, 0.66667, 1.16667, 0.83333], "texture": "#0"}, - "east": {"uv": [0, 0.66667, 0.66667, 0.83333], "texture": "#0"}, - "south": {"uv": [1.83333, 0.66667, 2.33333, 0.83333], "texture": "#0"}, - "west": {"uv": [1.16667, 0.66667, 1.83333, 0.83333], "texture": "#0"}, - "up": {"uv": [1.16667, 0.66667, 0.66667, 0], "texture": "#0"}, - "down": {"uv": [1.66667, 0, 1.16667, 0.66667], "texture": "#0"} - } - }, - { - "from": [-13, 0, 1], - "to": [-10, 1, 5], - "shade": false, - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [1.16667, 0.66667, 0.66667, 0.83333], "texture": "#0"}, - "east": {"uv": [1.83333, 0.66667, 1.16667, 0.83333], "texture": "#0"}, - "south": {"uv": [2.33333, 0.66667, 1.83333, 0.83333], "texture": "#0"}, - "west": {"uv": [0.66667, 0.66667, 0, 0.83333], "texture": "#0"}, - "up": {"uv": [0.66667, 0.66667, 1.16667, 0], "texture": "#0"}, - "down": {"uv": [1.16667, 0, 1.66667, 0.66667], "texture": "#0"} - } - }, - { - "from": [-13, 0, 11], - "to": [-10, 1, 15], - "shade": false, - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [1.16667, 0.66667, 0.66667, 0.83333], "texture": "#0"}, - "east": {"uv": [1.83333, 0.66667, 1.16667, 0.83333], "texture": "#0"}, - "south": {"uv": [2.33333, 0.66667, 1.83333, 0.83333], "texture": "#0"}, - "west": {"uv": [0.66667, 0.66667, 0, 0.83333], "texture": "#0"}, - "up": {"uv": [0.66667, 0.66667, 1.16667, 0], "texture": "#0"}, - "down": {"uv": [1.16667, 0, 1.66667, 0.66667], "texture": "#0"} - } - }, - { - "from": [-16, 10, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [2.66667, 2.66667, 8, 3.33333], "texture": "#0"}, - "east": {"uv": [0, 2.66667, 2.66667, 3.33333], "texture": "#0"}, - "south": {"uv": [10.66667, 2.66667, 16, 3.33333], "texture": "#0"}, - "west": {"uv": [8, 2.66667, 10.66667, 3.33333], "texture": "#0"}, - "up": {"uv": [8, 2.66667, 2.66667, 0], "texture": "#0"}, - "down": {"uv": [13.33333, 0, 8, 2.66667], "texture": "#0"} - } - }, - { - "from": [-14, 3, 14], - "to": [14, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, - "faces": { - "north": {"uv": [13.33333, 9.16667, 8.66667, 11], "texture": "#0"}, - "east": {"uv": [2, 9.16667, 0, 11], "texture": "#0"}, - "south": {"uv": [6.66667, 9.16667, 2, 11], "texture": "#0"}, - "west": {"uv": [8.66667, 9.16667, 6.66667, 11], "texture": "#0"}, - "up": {"uv": [6.66667, 7.16667, 2, 9.16667], "texture": "#0"}, - "down": {"uv": [11.33333, 9.16667, 6.66667, 7.16667], "texture": "#0"} - } - }, - { - "from": [-16, 14, 7], - "to": [-14, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [5.75, 18.75, 6]}, - "faces": { - "north": {"uv": [1, 0.5, 1.5, 2], "texture": "#1"}, - "east": {"uv": [0.5, 0.5, 1, 2], "texture": "#1"}, - "south": {"uv": [0, 0.5, 0.5, 2], "texture": "#1"}, - "west": {"uv": [1.5, 0.5, 2, 2], "texture": "#1"}, - "up": {"uv": [1, 0.5, 0.5, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [1.5, 0, 1, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-16, 14, 5], - "to": [-14, 16, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [5.75, 18.75, 6]}, - "faces": { - "north": {"uv": [1, 5.25, 1.5, 5.75], "texture": "#1"}, - "east": {"uv": [0.5, 5.25, 1, 5.75], "texture": "#1"}, - "south": {"uv": [0, 5.25, 0.5, 5.75], "texture": "#1"}, - "west": {"uv": [1.5, 5.25, 2, 5.75], "texture": "#1"}, - "up": {"uv": [1, 5.25, 0.5, 4.75], "rotation": 90, "texture": "#1"}, - "down": {"uv": [1.5, 4.75, 1, 5.25], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-16, 14, 9], - "to": [-14, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [5.75, 18.75, 6]}, - "faces": { - "north": {"uv": [1, 2.5, 1.5, 3], "texture": "#1"}, - "east": {"uv": [0.5, 2.5, 1, 3], "texture": "#1"}, - "south": {"uv": [0, 2.5, 0.5, 3], "texture": "#1"}, - "west": {"uv": [1.5, 2.5, 2, 3], "texture": "#1"}, - "up": {"uv": [1, 2.5, 0.5, 2], "rotation": 90, "texture": "#1"}, - "down": {"uv": [1.5, 2, 1, 2.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-14, 19, 7], - "to": [-9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [5.75, 18.75, 6]}, - "faces": { - "north": {"uv": [8.75, 9.25, 10, 9.5], "texture": "#1"}, - "east": {"uv": [8.25, 9.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [7, 9.25, 8.25, 9.5], "texture": "#1"}, - "west": {"uv": [10, 9.25, 10.5, 9.5], "texture": "#1"}, - "up": {"uv": [8.75, 9.25, 8.25, 8], "rotation": 90, "texture": "#1"}, - "down": {"uv": [9.25, 9.25, 8.75, 8], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-13.9, 11, 7], - "to": [-13.9, 13, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [5.75, 18.75, 6]}, - "faces": { - "north": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "east": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "south": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "west": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "up": {"uv": [0.5, 5.75, 0, 6.25], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0.5, 5.75, 0, 6.25], "rotation": 270, "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [-3, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [1.25, 6.25, -1.75], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [-2.25, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [-2.5, -1.75, 0], - "scale": [0.4, 0.4, 0.4] - }, - "head": { - "rotation": [90, 90, 0], - "translation": [-4.5, 21, 14] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -16], - "scale": [2, 2, 2] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/bathroom.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/bathroom.png deleted file mode 100644 index 2e51314bfab01b323d8516c84ef50bbbf4a4f731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2135 zcmV-d2&ngoP)-m8bpv>`~Z>Y&5NFl zf=3UYBp4Bvj2ECjObVTl-Lr?WjX-8<+QXb-cm_jPque@svJ^l1GqTVGx8byrP& zyn3|;1kRs2=^i;;1_0Ro0VsTGulX_v>Vi}SK#0Dw-r8=4=dOsC!T#aEv? z?Tc4xa{vIx>IKp`JU>nuS-k-8#>byXze`+7vc&4*y!WC!tl~lE@1c@q1NL?s&cOBJ z0Kgm6-fnww5xYMa2KMDqT&$1cN2`aT-mmZk8h~ET?hkxn71hOgJm~D;=G~1{Js~M; zCstklOG(=klk&l+Svk zU;Xl%A(qRNB6o@;l=z1ng{b)EV0D$hp4gg@U*Yhb!J>iviuTO0Gsu~*NOv*f8 zHZk*bPo8OJKL@Nn`E29|9hWEAIN(DNp<3z4cA`U^|E&%-TdkX+y z?mh$n{Aups^X9Lxdz1IW;hQGu?vs5;ng?Vb*IO+q@*Jy&rQ^rOp>im`2Key$`^Mm( zNACRxUF?{BSeApX<)C%{A#AIMYj3|;xSca!b`rc{#En#xNh4rl$aoSCtb)pqm5g_; zUUL8HbYbt<-l2O@jsW>SVCncVZ-`lff4JdcF%JM{_lFm8r9|n}`*WECM6O-GQMjJY z;XN`eOdnXxBd9S06R*|7tg!INimBTN0RCO9m=+c%BOA|eZEZ{ElB{h&gz?!&@3~@6 z2@5AF8x~GlC&h^*`ijpaea|%Sdik}tLPwJs)jC-g=4q9BJ#?ENRtJBc|Bb4PER;$0 z<$J0qy@t4Hw zk?GR9w;8JeW=Js^d^Z_o)EcD@afdDIU9y)*tFNqX3aj=9{6j~{Pl9I)5-3mYLdv3{o2Ch#MPDO$2lLCF$2Wgl&F?*vT&R_MAL7S5iE_YsOPv&J~_g! zI*I(aE2x!T~uCt2~qB-`trI}^~rYFKHU@@CeC-^ z801o@at8#0ellVnk))2W@-ml3v92`wCXq|Xe0!qG1Bkr7TUtAJW>{GQ&jL=~-U%wX zarNcT%H)ZVG9dr?zHvsiY8h(=W?y&qyy$<{9Z{Q5vVcqLZJp_fJI$#g;y^p$A@WSPnyt*ev z;Txb*n}aiO11DO9Y)B$hwj5s>I$hhBkvD~J0QxA+^(Go;8(t&GKDg`{k;=+0Z1B3N zY~B>U0hU&lfm^rX4BX*TafEwYgzEm*Bq@9Yw6?Z!@ydnR<^+{Fg5vZnfI#{rHe%i_ zNzt-LsH}}VE$a)}MbmSa)%8-*FJ6yL0bU3w<+az!b+ercEq*vUh@6UgB;FJ$tHre9iyZYldO#dne7 z#FY2lDNfP#OGCghi^3`oF(NN#tZC72R1DdFx&jXV36pH21E}3mMsY=n)DK(Px$nMp)JR9J=WRy}TmFcki%I0OgdWxdalY;V#`!5kqfKsZ)lI#S_XD zDYu~0qtA}9-3B`GEiv}vz3=__BN05Ps%n%{BF}SeUnzyY@26)erFKqdP18g!|8Z4S zBi}GzkWx<0hy(?vGa@L2000cbppkGAFqxa6pxhY`%55kx-}4d(F(jKW^$7sj$-Ndp z2!UZ3pp=^Ig%H!T3lBjwS413QL_OchJpkOy1eKmwg}1{=z*ivrs2CogflE9f^v=alCo+9}%Zn0$^Ur2y2~N zWs=IqjkzL{!@91WG8+QxHMI4t?|V(AO$q-ioI+HV<=q+HMWAil)d$qt0&{?926)+h zAF)tqCFU7-U5Cs0iZn~K-WP}Cm}Uts=PLlfxBfW2yZ;ZE8%inUc|N^dK-Y;hOSJ60 z>ys;a(=3^?T@z8;wj*T?{8V6Wz4Xn9sn;}kA?rm6P_KT~*9{vsY}l|Mz5x+R V0F!IOiM{{;002ovPDHLkV1mKj(0c#? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_animated.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_animated.png index 24d455de746b6bab05a9d282ab5608ce9a3b9ef8..d7ca74154f16e763a6e520fdc16aba4a3efcd5cd 100644 GIT binary patch delta 1409 zcmV-{1%CRC3!n>-Fn*kgMs0Uz(5M06fKo_EL7Ma?_x;4# z?jP>x?d@%1On+5Xihs`mBltkk?ybI!`2QjMJJ0jUtj=Mw1g0s9y##z#gHctLs;Vkz z8wTxy7y;H*VZ@XO#APOr+gAL%pg+K3R0MR+XgmfNc zz(2(czO^h5b;Kxv=>O#fJZt`J2q6^ehS*q4AVLVmJ%7C{%hd_Y1gj75&SU8TI=p58 zB~{E>Slk8ZJcbyt%7C&g6JD$meJNzS7=Vr;$Av;S-pPQnEEABEwX-0lRPZPMu6HEV z`GQNwZQD-hA2-6;04SlnV;eQ+!K-PSSts`51t0I9bpLQ?6(vwDb3=93#RufQpZTcu zQe3BGx_^{wiXp+gfU{(LW~vkC#O&47jB^1_&H2*gdA?dj_W~!WF?1s%c*8MRG2oPp zxJCeA{b7i%n7Crr2Y9sNPBjuyCQOCU^b4zX%?Nd$O)0T$O=kn7l!}NhWEvh&Y@M&A z>bFE+)2&N%ycDx-C+z*M>&}LF=!TPAz}e2>aDNy(wsp=&3t#cclsD)EqsHH&C=%Dw ziz{J42&r_05UOokC4^8?N(G-{xu{ zbNqlaW>>1_<=K4XTpQr@oXC$IdFcaa*ni{)rX&3;HiIruga{U1J^&|#T*vY8{yBc{ z_);qT~;4%PPS~iwscxf1hRh^?V{eMi^ zxg^`OD4oS#W%(6X{7m>rG@Gbocy`(Qn_cHi({z@QZf1a#QbDG5rE*aX&~I0{sOQlP z5JD(D`MBhfi2@$~pSA)_Jpik-35@qHA8Twqw8j`_U-T_fTbS(cK~CYM+M&ZeVX zV&T&}7jXEtB_cW=kF$~0Tc+ayhiLvT(eZdB&MyI-ad{a~Rh8nZscrw8etNq?ba|%e zyaY&CJXG6)57wM#R^%FaT2 zAIrx)6JDGFee`LX?t81Y@B3)Kur*=v_(lJT)~+|Jal0n=sJ-!{?*se=Q?fAue@z!; P00000NkvXXu0mjf_;0ZY delta 1390 zcmV-!1(Euo3ylkqFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pK zB1uF+RCr$PnmvmYK@dRqL@*Zx5AFmF6f*-6IT1xL6(bG&2_|A}aDlOy_!AVoNK6G$ z)I-!j1Q87sbV1S6&`eg}+|*Lj_HT*-;5^p4^!5YCmSN zrF~E4@$D;>dz?zP0vn&- zw@2OMREk_sGIAkXf$_Uf?NRqQmEs^QwL*~s_`byd#jIXDJ>k`U%%a!@r4%V}VE1zK zDxt~WEGGL79e-=S00K*Vt0Vl}rR%1Af9vXnsauxzE;jEwcI{~vF5&I-hohrsE-x&w zoaz%A9pNZ+_x{u7m{GgRAoTTzkInI^6NejtLg@ZM7szs(i{<*i?t=DX9thIHawwVw z_+0#+%U{m}**?JZ;$Py#8Xqo279gl&nf*u32W3>B1>e5Bnk?>F zZgPXAXsK#}jZe=elb=7@Pn*O#Csi$wDjcdQklU!5NhV}hZEadj6(FH73b*@Zf$bUF zGAU$IDu3pV1*A4WiBv^oQ*v)@Eor|$RlujUSf%|q6FQpqjhazG-_BQh1iqRvM#lxd zz`?HvS5}%=tP0B6n)hBHrYE?>zfv8qUb{2B4yCA$^mi%rPD27of(a#bk&4N+HAnd5hBo>&xF%UxwM1P15LV{KTmtYR%k}M0zy!S;u)?msC zZq49M^<)dge2q0;tgnxF`3e>{*(F&(Mn~GV^aL=y+ZzJiAIgpa3kdP;33V-LR)Eo* zJbSh|)=9|%eiz@nMU2@6x}jO6#nxi70DBE9gGq+)$--(qH74ckLA)@!^9 z_{<*K*}C|C+vm!lf89}7HX;bu&mbWbM?n{GpfJI|~5sMN;a_I34 z=cG+zu@;zukQ>pYkS>bvPYd!Lze#D+n16nx@pVHmy_9OHeFBpOGzjqZ1NbhtNimQN zKG)OH{hUI24Ezp4-y{2`QRSH(G0Z{32z9s24LF4J-x07>&PkA7Nz1X$Dd+eNzYYCP z6Lo>k?JTLG%9wMq>~f7oiJ+P0u^9E9$Pq52DB=Cm6%Mgg&Bb~T(=<#K4%TbD3V+Cw z3OT|BeXYLdz`(#iMRbm{y7A6#*P4n`h-N|rv%-hnU#1qz&nFVGAq(FsGh3o^t63p&SDJur7xT6)snvfjf zm_Aksi+ki5lZ&2N$rgwe90-^H8-Mr$*PYhM77(a}bdLa}G}9H5#7kcq&yE4zBVg3J zE<~^tFbJN-8qxs;#P4&VrogCav>;uUi~r?(ZZ+H+1I%H``2>p3XQgtlgTl?9J$o~OiX3mL==?yWro2MDQWh;hYT*Na*i)W&msRexh z59a~HtmkmY1=15HU8e4YB=L~{C3r1V8=ZC`u8aMfR>)4pAqZSwK>MibUstHbjWe-; wV6j3~1>6x!P=}~)0hB;6f#{ps16@X=U+HNm^@Uy)7ytkO07*qoM6N<$g5SE6+5i9m diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base.png deleted file mode 100644 index 4f0899b0cec072ff747b0206866817aa99a2e0f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmV;m0!safP)Px%Z%IT!RCt{2*uiQOK^VaCf7*crnwVvU1YDAvw1p}}DDDm zwZUd8*_V zOeU;5rDq+Y46x%~e}Y%d)7aiJS<&lHxU(0YXV1QFTZ<*o?TiyQHXso@dqvacRr8Ge z_D#_KyIG{->1@`#73;gbre|KOI4UvQ_R}KEa@RfQ7wyTb_Dbu7jnlIW^PIPj zr)L)|x_{M_Q;Z&S_R$HK|HAuMY4iTQo6mzy1;J13qqfNYPi_Cj@`gJr_vmgVfZx~h z+M@bby;qp|=dETffan5ucFU#+D!Bz-zWtu*%}rW!>s7rss5pv|KPK8MEbqdWWy5ZW zr|vpba{p^?2E+@Sl3Oq{uM49%`#pj#m-VuFbJ)%Fl2Okd-@djGiVxgAU+)m(=N=!O z1M87N>iFo~TxficpC*nQ`D62PWM0N(jXKybOkEV00000NkvXXu0mjfcC1q8 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base_particle.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base_particle.png deleted file mode 100644 index 04fa7939cd524ed6c2c28e8bcf95a72b2984a0ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|LP)Px#*-1n}R5*>LQ!x(0Fbup}NL`{T6CFCUBJmEM!3%f;PvA2wJSRgpE6UQT3^XBe zTq=Q=C};a@pOfZ(Jv1J<_-MpFWEz-Sym-%X zYZh&mf<*_~7BpNHacvaYne-DjY)hNwb~(&4Fm5Jd@?H>}kNfnQ)}F9tajcyN4t)zZ lP8Fft5};_1KV!`&@fT9NhU=cixyt|m002ovPDHLkV1fsiai;(P diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_static.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_static.png index 41751ab83507989577b460b3d63b39bd2d5c545a..22b498c577d918d57702e0d105d6ae5064faa08c 100644 GIT binary patch delta 359 zcmV-t0hs>C1C9fbFn<9^Nkls#H~y3YnVcIRJoC3eGu9(^Td7`N##3pLboy zxX1@kN*&t80NBWB003~#(J?BW{wF%10}7$5W!u(~iGH*LKc*L)vUysH7*RP)|Hi%Tl}etY2S`uU?BZ|KJ$ za9V4Kf0>xE|7u;=@M@Gwk2~j*Vr$wO%d#Xe#+VSlk0lUspyKzkZ=?8`>2IxdlGRsA zmf$EwXD>mVRbX1im|%>d+K}pkGX~Jx=Rnp$5=htiH}$bsb_SZZeiqoi?TP>Z++mak zh=)sT7Xtvc0mJ;90{Bz+g0~*a*+M*J5dGhKLA-0`>Ko|or1%{`L=OM}002ovPDHLk FV1iTbuC4$8 delta 418 zcmV;T0bTx%1IPoAFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG zT}ebiR9HvVm$6C%K@f)bd<0Q2a1pc+>?Mtaq_GWlK7@^=wy>~H=Ob9y+1nT-AYw13 zNI(x1l)S>pzs$&7if}u>81lig|6aJ;+4*O8Nnm(=ye`pX=zn5O`ea78m*sk%2Q+AT zoJ=NtGGE28GU;aCaed33fxlvP1DF+ssH#rI9l-bJR8&=`LRrA9TyY0bOg=19KXbV`V0QR?=u`$H+8<)x6K|4MGC@l5XR`^N(s@8dbGdTUV zCEsnteq(DVUVmK5`1v6m9-n6!u2cJi#a1{1y1Rdh8mpcU29v(Ly+?i2ZN&+dMc-d& zfnK*>>b$>n3uNd66WPf;P`d!0tM6Wxeh#=jKb%7 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fridge.json b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fridge.json deleted file mode 100644 index 4cfe3a6..0000000 --- a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fridge.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "fallout_wastelands:custom/fridge", - "texture_size": [64, 64], - "textures": { - "1": "fridge", - "particle": "fallout_wastelands:blocks/frigde" - }, - "elements": [ - { - "from": [1, 0, 1], - "to": [15, 32, 15], - "faces": { - "north": {"uv": [0, 0, 3.5, 8], "texture": "#1"}, - "east": {"uv": [3.5, 0, 7, 8], "texture": "#1"}, - "south": {"uv": [7, 0, 10.5, 8], "texture": "#1"}, - "west": {"uv": [0, 8, 3.5, 16], "texture": "#1"}, - "up": {"uv": [7, 11.5, 3.5, 8], "texture": "#1"}, - "down": {"uv": [10.5, 8, 7, 11.5], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fridge.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fridge.png deleted file mode 100644 index 32d99783d371f58f43413f0216980dcdb27d96a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2334 zcmV+(3E}pMP)Px-*hxe|RCt`-T0e*z*%|*?OaeYKdoT+#7?n~nQ=|#(7U5tI0!|m=KtOhR%@qrQ z6fP2iLxM|Jfd#v9yMlw&ai}?0F-8wlrxr(9)Ns<5n(lmuJ1^^I-A&fBy!w>-Q^5siZRRto7A{-nX z0D!$uKAY#ceJ+k;+`D%VPo6xn&v!Z<06_X5DfhYxR|0R&ML0RT=< zPr-8%Jef=oh9M@C35udXRaN$$s;Y2saInM_AL2N+?*oAQ_wU%+V$K{HJVTd@6QI@48o~z7z z_)Yme-~Vp6yEbBd2+}mQt4}om=0tK;D4KGT#uyl5ERj-GNGRZnH{S)oN|RP8g5&bp zCJ=CvQ4}EzL+tGAI5!N3LuXZ^C|X*rvMg&SDVYJx)#1^jM+j~MpMJ7y$ImaO06b$~ z0|&qU%}0>98Ua_b4i6qY007KpGXTKZ*_k69z(U7)J|2(lxnv#yjK^af9v%V!zWMe9 zzx(YUmZTwyB7F1h33|OlJbQk$a(*9+APhrX!?bxNZc1tE>75EHkGlidu$AX7D`EbHs6MZO4~ixHdq7k|b?F zlduxNXf4aKYadFI1f$UiNs?I6mGOjzF$QUx+UwE=P!fE0U?Vo5C<;VTWG(mp{=PS? zB_UxL+TaL)W4$F4xcV}-0Oryb+y=h<;?VH|@)^LD4r!;>jR0_?JO(_B1of(Frch*c z5G9}Ey_6iO`_G;q;qnL9`fD5T$KNkP=XE2Hf23g}K|GQn9HV8X1dwRnBfWw&gkcz> z*Xsd*)pL2jwgLTq-|-~tMnFB5hEIw=C(R=zL>fV#-N>@c8{Zpamf`>j+5*~#rV#-1 zRiy3%%c(8krp6@XI#4PYGf>r}4ft&Db0@>(d^Tlnnm$?8}zTfX-I-S~8rwx$#g3d12i6sfB zv;49mBm<|qd_fW~%V7YVT;Q|4&jG;k1X2R#HlRTU$Uk*;IbQ|nI`}*Y;|H!R0DSfJ zvGx0M^?`*KXw(Lm4rT0##MvyV1WlQxDML zD&u-aa{MpL;(4AsOt}dY(liAymmZx90E^X^_JH1^@i>6QYBvVBT8x~vv*zwtHhR2T|H(w9X zT^+8LB#5g>cd22Ffvzn|?;$0|7=wp@{j>E1#NYn@Cjh|gt-;POLOlM*zi@sr#iPIc z6T{)~<0-9ym4G^nudf5J{X5?^-@BL$(R*)dzr}EK6Gr z0$>}Hx}Gn`!Z5`D^Bmwtb8jYZtbx1JzJoWDH+cW<5|eyZ|uoSvKkh<2be* zUSPgzzFb}!squJ>y}dmr@mcj8i=t%MQiW#^`0szd$NP7e0D$-JE^+tn-L(<93b&p< zeR`$KT)tKJ#R4DloPG!3uRmxs)gHffb#-+$7z_X`DmypXBcKB%d7o^9@f{qK)gvt} zvizoNjaim8!+_VXUthg?_3B19b3?>nFmQaeE`+3MYIU9g5RvD(L%0sIs;YA05+0jk zK)@C^;17YNcvn@0$z+1EESEMl$ap~pKas2j;##j$`{H7!^t#)sF83m&*@wON`z;r6=ao zSKqD=30@;JrNNa<@a;QTCt4IQin(vXQ4~4f#=wE=uN zSJgLh4cY9}la#$eU=jEvNrHB}?WhXiw>eVvnj{|hQ39?LG2Q8rE>Aa4DYDe}x-K&S zC;pIx>w=4n71j->F~W)ZqCBmO^x-ng<9Xe<-f5~gSTSnUo#LBp+W1feb*m%CWy_mo zGfqsm$LRlM!vuhh1P6nGB}fxWWLf3}OHINCLNe#}?f8(Bq_hBVQfc$!R+uD7u(Pv+ zG){zsB>(^b diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/sink.json b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/sink.json deleted file mode 100644 index fa628cf..0000000 --- a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/sink.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "1": "gp/block/block_five/sink" - }, - "elements": [ - { - "from": [3, 0, 8], - "to": [13, 11, 16], - "faces": { - "north": {"uv": [2, 10, 4.5, 12.75], "texture": "#1"}, - "east": {"uv": [0, 10, 2, 12.75], "texture": "#1"}, - "south": {"uv": [6.5, 10, 9, 12.75], "texture": "#1"}, - "west": {"uv": [4.5, 10, 6.5, 12.75], "texture": "#1"}, - "up": {"uv": [4.5, 10, 2, 8], "texture": "#1"}, - "down": {"uv": [7, 8, 4.5, 10], "texture": "#1"} - } - }, - { - "from": [0, 11, 3], - "to": [16, 17, 16], - "faces": { - "north": {"uv": [3.25, 3.25, 7.25, 4.75], "texture": "#1"}, - "east": {"uv": [0, 3.25, 3.25, 4.75], "texture": "#1"}, - "south": {"uv": [10.5, 3.25, 14.5, 4.75], "texture": "#1"}, - "west": {"uv": [7.25, 3.25, 10.5, 4.75], "texture": "#1"}, - "up": {"uv": [7.25, 3.25, 3.25, 0], "texture": "#1"}, - "down": {"uv": [11.25, 0, 7.25, 3.25], "texture": "#1"} - } - }, - { - "from": [14, 13, 5], - "to": [2, 17, 14], - "faces": { - "north": {"uv": [2.25, 7, 5.25, 8], "texture": "#1"}, - "east": {"uv": [0, 7, 2.25, 8], "texture": "#1"}, - "south": {"uv": [7.5, 7, 10.5, 8], "texture": "#1"}, - "west": {"uv": [5.25, 7, 7.5, 8], "texture": "#1"}, - "up": {"uv": [5.25, 7, 2.25, 4.75], "texture": "#1"}, - "down": {"uv": [8.25, 4.75, 5.25, 7], "texture": "#1"} - } - }, - { - "from": [7, 17, 14], - "to": [9, 23, 16], - "faces": { - "north": {"uv": [0.5, 0.5, 1, 2], "texture": "#1"}, - "east": {"uv": [0, 0.5, 0.5, 2], "texture": "#1"}, - "south": {"uv": [1.5, 0.5, 2, 2], "texture": "#1"}, - "west": {"uv": [1, 0.5, 1.5, 2], "texture": "#1"}, - "up": {"uv": [1, 0.5, 0.5, 0], "texture": "#1"}, - "down": {"uv": [1.5, 0, 1, 0.5], "texture": "#1"} - } - }, - { - "from": [5, 17, 14], - "to": [7, 19, 16], - "faces": { - "north": {"uv": [0.5, 5.25, 1, 5.75], "texture": "#1"}, - "east": {"uv": [0, 5.25, 0.5, 5.75], "texture": "#1"}, - "south": {"uv": [1.5, 5.25, 2, 5.75], "texture": "#1"}, - "west": {"uv": [1, 5.25, 1.5, 5.75], "texture": "#1"}, - "up": {"uv": [1, 5.25, 0.5, 4.75], "texture": "#1"}, - "down": {"uv": [1.5, 4.75, 1, 5.25], "texture": "#1"} - } - }, - { - "from": [9, 17, 14], - "to": [11, 19, 16], - "faces": { - "north": {"uv": [0.5, 2.5, 1, 3], "texture": "#1"}, - "east": {"uv": [0, 2.5, 0.5, 3], "texture": "#1"}, - "south": {"uv": [1.5, 2.5, 2, 3], "texture": "#1"}, - "west": {"uv": [1, 2.5, 1.5, 3], "texture": "#1"}, - "up": {"uv": [1, 2.5, 0.5, 2], "texture": "#1"}, - "down": {"uv": [1.5, 2, 1, 2.5], "texture": "#1"} - } - }, - { - "from": [7, 22, 9], - "to": [9, 23, 14], - "faces": { - "north": {"uv": [8.25, 9.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [7, 9.25, 8.25, 9.5], "texture": "#1"}, - "south": {"uv": [10, 9.25, 10.5, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 9.25, 10, 9.5], "texture": "#1"}, - "up": {"uv": [8.75, 9.25, 8.25, 8], "texture": "#1"}, - "down": {"uv": [9.25, 9.25, 8.75, 8], "texture": "#1"} - } - }, - { - "from": [7, 14, 13.9], - "to": [9, 16, 13.9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "east": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "south": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "west": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "up": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"}, - "down": {"uv": [0.5, 5.75, 0, 6.25], "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [1, -2.25, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [90, 0, 0], - "translation": [-8, 20, 14] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -16], - "scale": [2, 2, 2] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/sink.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/sink.png deleted file mode 100644 index fcf1a1a7e48bc7b07f307dfb332fc97c1933af76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1963 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