From a136855ee6f00890bc3c7d40a39d0483be4cb4e0 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Mon, 15 Apr 2024 08:09:00 -0600 Subject: [PATCH 01/17] Exclude CozyHome wood from generator, add missing pickaxe tags for Trashcans --- .../unlikepaladin/pfm/data/materials/WoodVariantRegistry.java | 2 +- .../com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariantRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariantRegistry.java index cc92dca50..9fd46fb12 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariantRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariantRegistry.java @@ -59,7 +59,7 @@ public Optional getVariantFromBlock(Block baseBlock, Identifier blo name = path.substring("plank_".length()); } String namespace = blockId.getNamespace(); - if (name != null && !namespace.equals("securitycraft") && + if (!namespace.equals("cozy_home") && name != null && !namespace.equals("securitycraft") && !namespace.equals("absentbydesign") && !(namespace.equals("terrestria") && path.contains("sakura")) && !(namespace.equals("betternether") && path.contains("nether_mushroom")) && !namespace.equals("chipped") && !(namespace.equals("regions_unexplored") && path.contains("alpha"))) { BlockState state = baseBlock.getDefaultState(); diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java index b0b0e5c16..868525ef0 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java @@ -126,7 +126,9 @@ protected void generateTags() { .add(sinkBlocks) .add(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HANDLE) .add(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HEAD) - .add(PaladinFurnitureModBlocksItems.BASIC_BATHTUB); + .add(PaladinFurnitureModBlocksItems.BASIC_BATHTUB) + .add(PaladinFurnitureModBlocksItems.TRASHCAN) + .add(PaladinFurnitureModBlocksItems.MESH_TRASHCAN); KitchenCounterBlock[] woodCounters = KitchenCounterBlock.streamWoodCounters().map(FurnitureBlock::getBlock).toArray(KitchenCounterBlock[]::new); KitchenWallCounterBlock[] woodWallCounters = KitchenWallCounterBlock.streamWallWoodCounters().map(FurnitureBlock::getBlock).toArray(KitchenWallCounterBlock[]::new); From 2fc84b2d457682e1e0fd7e06ac6ace12a8d6e627 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Wed, 1 May 2024 18:11:44 -0600 Subject: [PATCH 02/17] Add Classic Basic and Modern Coffee Tables Shorten Lang Update toilet paper recipe --- .../pfm/blocks/BasicCoffeeTableBlock.java | 274 +++++ .../pfm/blocks/ClassicCoffeeTableBlock.java | 148 +++ .../pfm/blocks/ModernCoffeeTableBlock.java | 163 +++ .../UnbakedCoffeeBasicTableModel.java | 89 ++ .../UnbakedClassicCoffeeTableModel.java | 79 ++ .../UnbakedModernCoffeeTableModel.java | 79 ++ .../registry/dynamic/LateBlockRegistry.java | 27 + .../assets/PFMBlockstateModelProvider.java | 10 + .../pfm/runtime/assets/PFMLangProvider.java | 20 + .../pfm/runtime/data/PFMRecipeProvider.java | 58 +- .../pfm/runtime/data/PFMTagProvider.java | 16 +- .../main/resources/assets/pfm/lang/en_us.json | 983 +----------------- .../coffe_table_basic_north_west.json | 84 ++ .../coffee_table_basic.json | 165 +++ .../coffee_table_basic_base.json | 86 ++ .../coffee_table_basic_east_west_north.json | 103 ++ .../coffee_table_basic_east_west_south.json | 103 ++ .../coffee_table_basic_north_east.json | 84 ++ .../coffee_table_basic_north_east_corner.json | 84 ++ .../coffee_table_basic_north_south_east.json | 103 ++ ...e_table_basic_north_south_east_bottom.json | 103 ++ ...ffee_table_basic_north_south_east_top.json | 103 ++ .../coffee_table_basic_north_south_west.json | 103 ++ ...e_table_basic_north_south_west_bottom.json | 103 ++ ...ffee_table_basic_north_south_west_top.json | 103 ++ .../coffee_table_basic_north_west.json | 84 ++ .../coffee_table_basic_north_west_corner.json | 84 ++ .../coffee_table_basic_south_east.json | 84 ++ .../coffee_table_basic_south_east_corner.json | 84 ++ .../coffee_table_basic_south_west.json | 84 ++ .../coffee_table_basic_south_west_corner.json | 84 ++ .../coffee_table_classic.json | 116 +++ .../coffee_table_classic_middle.json | 63 ++ .../coffee_table_classic_one.json | 63 ++ .../coffee_table_classic_one_uved.json | 63 ++ .../coffee_table_classic_two.json | 62 ++ .../coffee_table_classic_two_uved.json | 63 ++ .../coffee_table_modern.json | 204 ++++ .../coffee_table_modern_base.json | 80 ++ .../coffee_table_modern_left.json | 136 +++ .../coffee_table_modern_legs.json | 188 ++++ .../coffee_table_modern_middle.json | 84 ++ .../coffee_table_modern_right.json | 136 +++ .../pfm/models/block/doorbell/doorbell.json | 76 ++ .../block/doorbell/doorbell_pressed.json | 85 ++ .../fabric/FabricCoffeeBasicTableModel.java | 195 ++++ .../UnbakedCoffeeBasicTableModelImpl.java | 19 + .../fabric/FabricClassicCoffeeTableModel.java | 76 ++ .../UnbakedClassicCoffeeTableModelImpl.java | 20 + .../fabric/FabricModernCoffeeTableModel.java | 78 ++ .../UnbakedModernCoffeeTableModelImpl.java | 20 + .../client/fabric/PFMExtraModelProvider.java | 13 + .../pfm/client/fabric/PFMModelProvider.java | 12 + .../forge/ForgeCoffeeBasicTableModel.java | 229 ++++ .../UnbakedCoffeeBasicTableModelImpl.java | 19 + .../forge/ForgeClassicCoffeeTableModel.java | 111 ++ .../UnbakedClassicCoffeeTableModelImpl.java | 20 + .../models/forge/PFMForgeBakedModel.java | 3 + .../forge/ForgeModernCoffeeTableModel.java | 100 ++ .../UnbakedModernCoffeeTableModelImpl.java | 20 + .../forge/PaladinFurnitureModClientForge.java | 12 + .../pfm/mixin/forge/PFMModelLoaderMixin.java | 21 + 62 files changed, 5200 insertions(+), 964 deletions(-) create mode 100644 common/src/main/java/com/unlikepaladin/pfm/blocks/BasicCoffeeTableBlock.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/blocks/ClassicCoffeeTableBlock.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/blocks/ModernCoffeeTableBlock.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffe_table_basic_north_west.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_base.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_north.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_south.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east_corner.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_bottom.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_top.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_bottom.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_top.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west_corner.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east_corner.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west_corner.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_middle.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one_uved.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two_uved.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_base.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_left.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_legs.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_middle.json create mode 100644 common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_right.json create mode 100644 common/src/main/resources/assets/pfm/models/block/doorbell/doorbell.json create mode 100644 common/src/main/resources/assets/pfm/models/block/doorbell/doorbell_pressed.json create mode 100644 fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/FabricCoffeeBasicTableModel.java create mode 100644 fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java create mode 100644 fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/FabricClassicCoffeeTableModel.java create mode 100644 fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java create mode 100644 fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/FabricModernCoffeeTableModel.java create mode 100644 fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicCoffeeTableBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicCoffeeTableBlock.java new file mode 100644 index 000000000..f29519523 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicCoffeeTableBlock.java @@ -0,0 +1,274 @@ +package com.unlikepaladin.pfm.blocks; + +import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.data.FurnitureBlock; +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.fluid.FluidState; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + +public class BasicCoffeeTableBlock extends Block { + private final Block baseBlock; + public static final EnumProperty AXIS = Properties.HORIZONTAL_AXIS; + private final BlockState baseBlockState; + private static final List WOOD_BASIC_TABLES_COFFEE = new ArrayList<>(); + private static final List STONE_BASIC_TABLES_COFFEE = new ArrayList<>(); + public BasicCoffeeTableBlock(Settings settings) { + super(settings); + setDefaultState(this.getStateManager().getDefaultState().with(AXIS, Direction.Axis.X)); + this.baseBlockState = this.getDefaultState(); + this.baseBlock = baseBlockState.getBlock(); + if((material.equals(Material.WOOD) || material.equals(Material.NETHER_WOOD)) && this.getClass().isAssignableFrom(BasicCoffeeTableBlock.class)){ + WOOD_BASIC_TABLES_COFFEE.add(new FurnitureBlock(this, "coffee_table_basic")); + } + else if (this.getClass().isAssignableFrom(BasicCoffeeTableBlock.class)){ + STONE_BASIC_TABLES_COFFEE.add(new FurnitureBlock(this, "coffee_table_basic")); + } + } + + public static Stream streamWoodBasicTables() { + return WOOD_BASIC_TABLES_COFFEE.stream(); + } + public static Stream streamStoneBasicTables() { + return STONE_BASIC_TABLES_COFFEE.stream(); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(AXIS); + } + @Override + public BlockState rotate(BlockState state, BlockRotation rotation) { + switch (rotation) { + case COUNTERCLOCKWISE_90, CLOCKWISE_90 -> { + switch (state.get(AXIS)) { + case X -> { + return state.with(AXIS, Direction.Axis.Z); + } + case Z -> { + return state.with(AXIS, Direction.Axis.X); + } + } + return state; + } + } + return state; + } + @Override + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean notify) { + if (!state.isOf(state.getBlock())) { + this.baseBlockState.neighborUpdate(world, pos, Blocks.AIR, pos, false); + this.baseBlock.onBlockAdded(this.baseBlockState, world, pos, oldState, false); + } + } + @Override + public boolean isShapeFullCube(BlockState state, BlockView world, BlockPos pos) { + return false; + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + } + + public BlockState getPlacementState(ItemPlacementContext ctx) { + Direction.Axis facing = ctx.getPlayerFacing().getAxis(); + return this.getDefaultState().with(AXIS, facing); + } + @Override + public FluidState getFluidState(BlockState state) { + return super.getFluidState(state); + } + + public boolean canConnect(BlockState blockState) + { + return PaladinFurnitureMod.getPFMConfig().doTablesOfDifferentMaterialsConnect() ? blockState.getBlock() instanceof BasicCoffeeTableBlock : blockState.getBlock() == this; + } + + public int getFlammability(BlockState state, BlockView world, BlockPos pos, Direction face) { + if (state.getMaterial() == Material.WOOD || state.getMaterial() == Material.WOOL) { + return 20; + } + return 0; + } + + /** Method to rotate VoxelShapes from this random Forge Forums thread: https://forums.minecraftforge.net/topic/74979-1144-rotate-voxel-shapes/ */ + public static VoxelShape rotateShape(Direction from, Direction to, VoxelShape shape) { + VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() }; + int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4; + for (int i = 0; i < times; i++) { + buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX))); + buffer[0] = buffer[1]; + buffer[1] = VoxelShapes.empty(); + } + return buffer[0]; + } + + final static VoxelShape TABLE_BASIC_BASE = createCuboidShape(0, 8, 0, 16, 10, 16); + final static VoxelShape TABLE_BASIC_NORTH_EAST_LEG = createCuboidShape(12, 0, 2, 14, 8, 4); + final static VoxelShape TABLE_BASIC_SOUTH_WEST_LEG = createCuboidShape(2, 0, 12,4, 8, 14); + final static VoxelShape TABLE_BASIC_NORTH_WEST_LEG = createCuboidShape(2, 0, 2,4, 8, 4); + final static VoxelShape TABLE_BASIC_SOUTH_EAST_LEG = createCuboidShape(12, 0, 12,14, 8, 14); + final static VoxelShape TABLE_BASIC_EAST_WEST_NORTH = createCuboidShape(4, 0, 2,12, 2, 4); + final static VoxelShape TABLE_BASIC_EAST_WEST_SOUTH = createCuboidShape(4, 0, 12,12, 2, 14); + final static VoxelShape TABLE_BASIC_SOUTH_EAST_TOP = createCuboidShape(4, 0, 2,16, 2, 4); + final static VoxelShape TABLE_BASIC_SOUTH_EAST_BOTTOM = createCuboidShape(4, 0, 12,16, 2, 14); + final static VoxelShape TABLE_BASIC_SOUTH_WEST_BOTTOM = createCuboidShape(0, 0, 12,12, 2, 14); + final static VoxelShape TABLE_BASIC_SOUTH_WEST_TOP = createCuboidShape(0, 0, 2,12, 2, 4); + final static VoxelShape TABLE_BASIC_NORTH_SOUTH_WEST = createCuboidShape(0, 0, 2,16, 2, 4); + final static VoxelShape TABLE_BASIC_NORTH_SOUTH_EAST = createCuboidShape(0, 0, 12, 16, 2, 14); + final static VoxelShape TABLE_BASIC_NORTH_EAST_CORNER = createCuboidShape(14, 0, 2, 16, 2, 4); + final static VoxelShape TABLE_BASIC_SOUTH_EAST_CORNER = createCuboidShape(14, 0, 12, 16, 2, 14); + final static VoxelShape TABLE_BASIC_NORTH_WEST_CORNER = createCuboidShape(0, 0, 2, 2, 2, 4); + final static VoxelShape TABLE_BASIC_SOUTH_WEST_CORNER = createCuboidShape(0, 0, 12, 2, 2, 14); + final static Map VOXEL_SHAPES = new HashMap<>(); + + public boolean canConnect(BlockView world, BlockState state, BlockPos neighborPos, BlockPos pos){ + BlockState neighborState = world.getBlockState(neighborPos); + if (neighborState.contains(AXIS)) { + return neighborState.get(AXIS) == state.get(AXIS) && canConnect(neighborState); + } + return false; + } + + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + Direction.Axis dir = state.get(BasicCoffeeTableBlock.AXIS); + + Boolean north = canConnect(world, state, pos.north(), pos); + boolean east = canConnect(world, state, pos.east(), pos); + boolean west = canConnect(world, state, pos.west(), pos); + boolean south = canConnect(world, state, pos.south(), pos); + boolean cornerNorthWest = north && west && !canConnect(world, state, pos.north().west(), pos); + boolean cornerNorthEast = north && east && !canConnect(world, state, pos.north().east(), pos); + boolean cornerSouthEast = south && east && !canConnect(world, state, pos.south().east(), pos); + boolean cornerSouthWest = south && west && !canConnect(world, state, pos.south().west(), pos); + + String key = north.toString()+ east + west + south + cornerNorthWest + cornerNorthEast + cornerSouthEast + cornerSouthWest + dir.asString(); + if (!VOXEL_SHAPES.containsKey(key)) { + generateVoxelShape(key, north, east, west, south, cornerNorthWest, cornerNorthEast, cornerSouthEast, cornerSouthWest, dir); + } + return VOXEL_SHAPES.get(key); + } + + private static void generateVoxelShape(String key, Boolean north, Boolean east, Boolean west, Boolean south, Boolean cornerNorthWest, Boolean cornerNorthEast, Boolean cornerSouthEast, Boolean cornerSouthWest, Direction.Axis axis) { + VoxelShape newVoxelShape = TABLE_BASIC_BASE; + if (!north && !south && !east && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_EAST_WEST_NORTH, TABLE_BASIC_EAST_WEST_SOUTH); + } + if (!north && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, TABLE_BASIC_NORTH_EAST_LEG, TABLE_BASIC_NORTH_WEST_LEG)); + } + if (!north && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, TABLE_BASIC_NORTH_WEST_LEG, TABLE_BASIC_SOUTH_WEST_LEG)); + } + if (!south && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, TABLE_BASIC_SOUTH_EAST_LEG, TABLE_BASIC_NORTH_EAST_LEG)); + } + if (!south && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, TABLE_BASIC_SOUTH_WEST_LEG, TABLE_BASIC_SOUTH_EAST_LEG)); + } + if (cornerNorthEast) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, VoxelShapes.union(TABLE_BASIC_NORTH_EAST_LEG, TABLE_BASIC_NORTH_EAST_CORNER), VoxelShapes.union(TABLE_BASIC_NORTH_WEST_LEG, TABLE_BASIC_NORTH_WEST_CORNER))); + } + if (cornerNorthWest) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, VoxelShapes.union(TABLE_BASIC_NORTH_WEST_LEG, TABLE_BASIC_NORTH_WEST_CORNER), VoxelShapes.union(TABLE_BASIC_SOUTH_WEST_LEG, TABLE_BASIC_SOUTH_WEST_CORNER))); + } + if (cornerSouthWest) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, VoxelShapes.union(TABLE_BASIC_SOUTH_WEST_LEG, TABLE_BASIC_SOUTH_WEST_CORNER), VoxelShapes.union(TABLE_BASIC_SOUTH_EAST_LEG, TABLE_BASIC_SOUTH_EAST_CORNER))); + } + if (cornerSouthEast) { + newVoxelShape = VoxelShapes.union(newVoxelShape, getShapeForAxis(axis, VoxelShapes.union(TABLE_BASIC_SOUTH_EAST_LEG, TABLE_BASIC_SOUTH_EAST_CORNER), VoxelShapes.union(TABLE_BASIC_NORTH_EAST_LEG, TABLE_BASIC_NORTH_EAST_CORNER))); + } + + if (axis == Direction.Axis.Z) { + if (!north && south && !east && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_EAST_WEST_NORTH); + } + if (north && !south && !east && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_EAST_WEST_SOUTH); + } + if (!north && east && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_EAST_TOP); + } + if (!south && !east && west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_WEST_BOTTOM); + } + if (!south && east && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_EAST_BOTTOM); + } + if (!north && !east && west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_WEST_TOP); + } + if (!north && east && west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_NORTH_SOUTH_WEST); + } + if (!south && east && west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_NORTH_SOUTH_EAST); + } + } + else { + if (!north && south && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_EAST_BOTTOM); + } + if (north && !south && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_WEST_BOTTOM); + } + if (!north && south && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_EAST_TOP); + } + if (north && !south && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_WEST_TOP); + } + if (north && !south && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_SOUTH_WEST_TOP); + } + if (!north && !south && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_EAST_WEST_NORTH); + } + if (!north && !south && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_EAST_WEST_SOUTH); + } + if (north && south && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_NORTH_SOUTH_WEST); + } + if (north && south && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_BASIC_NORTH_SOUTH_EAST); + } + newVoxelShape = rotateShape(Direction.NORTH, Direction.EAST, newVoxelShape); + } + VOXEL_SHAPES.put(key, newVoxelShape); + } + + private static VoxelShape getShapeForAxis(Direction.Axis axis, VoxelShape a, VoxelShape b) { + if (axis == Direction.Axis.Z) { + return a; + } else if (axis == Direction.Axis.X) { + return b; + } + return VoxelShapes.empty(); + } + + @Override + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return false; + } +} + + diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/ClassicCoffeeTableBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/ClassicCoffeeTableBlock.java new file mode 100644 index 000000000..119bc7754 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/ClassicCoffeeTableBlock.java @@ -0,0 +1,148 @@ +package com.unlikepaladin.pfm.blocks; + +import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.data.FurnitureBlock; +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.fluid.FluidState; +import net.minecraft.item.ItemPlacementContext; +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.World; +import net.minecraft.world.WorldAccess; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + +public class ClassicCoffeeTableBlock extends Block { + private final Block baseBlock; + + private static final List WOOD_CLASSIC_TABLES = new ArrayList<>(); + private static final List STONE_CLASSIC_TABLES = new ArrayList<>(); + private final BlockState baseBlockState; + public ClassicCoffeeTableBlock(Settings settings) { + super(settings); + setDefaultState(this.getStateManager().getDefaultState()); + this.baseBlockState = this.getDefaultState(); + this.baseBlock = baseBlockState.getBlock(); + if((material.equals(Material.WOOD) || material.equals(Material.NETHER_WOOD)) && this.getClass().isAssignableFrom(ClassicCoffeeTableBlock.class)){ + WOOD_CLASSIC_TABLES.add(new FurnitureBlock(this, "coffee_table_classic")); + } + else if (this.getClass().isAssignableFrom(ClassicCoffeeTableBlock.class)){ + STONE_CLASSIC_TABLES.add(new FurnitureBlock(this, "coffee_table_classic")); + } + } + + public static Stream streamWoodClassicTables() { + return WOOD_CLASSIC_TABLES.stream(); + } + public static Stream streamStoneClassicTables() { + return STONE_CLASSIC_TABLES.stream(); + } + + @Override + public boolean isShapeFullCube(BlockState state, BlockView world, BlockPos pos) { + return false; + } + + @Override + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean notify) { + if (!state.isOf(state.getBlock())) { + this.baseBlockState.neighborUpdate(world, pos, Blocks.AIR, pos, false); + this.baseBlock.onBlockAdded(this.baseBlockState, world, pos, oldState, false); + } + } + + public int getFlammability(BlockState state, BlockView world, BlockPos pos, Direction face) { + if (state.getMaterial() == Material.WOOD || state.getMaterial() == Material.WOOL) { + return 20; + } + return 0; + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + } + + public BlockState getPlacementState(ItemPlacementContext ctx) { + return this.getDefaultState(); + } + + public boolean canConnect(BlockState blockState) { + return PaladinFurnitureMod.getPFMConfig().doTablesOfDifferentMaterialsConnect() ? blockState.getBlock() instanceof ClassicCoffeeTableBlock : blockState.getBlock() == this; + } + + @Override + public FluidState getFluidState(BlockState state) { + return super.getFluidState(state); + } + + /** Method to rotate VoxelShapes from this random Forge Forums thread: https://forums.minecraftforge.net/topic/74979-1144-rotate-voxel-shapes/ */ + public static VoxelShape rotateShape(Direction from, Direction to, VoxelShape shape) { + VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() }; + + int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4; + for (int i = 0; i < times; i++) { + buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX))); + buffer[0] = buffer[1]; + buffer[1] = VoxelShapes.empty(); + } + + return buffer[0]; + } + + final static VoxelShape TABLE_CLASSIC_BASE = createCuboidShape(0, 8, 0, 16, 10, 16); + final static VoxelShape TABLE_CLASSIC_NORTH_EAST_LEG = createCuboidShape(12, 0, 2, 14, 8, 4); + final static VoxelShape TABLE_CLASSIC_NORTH_WEST_LEG = createCuboidShape(2, 0, 2, 4, 8, 4); + final static VoxelShape TABLE_CLASSIC_SOUTH_WEST_LEG = createCuboidShape(2, 0, 12, 4, 8, 14); + final static VoxelShape TABLE_CLASSIC_SOUTH_EAST_LEG = createCuboidShape(12, 0, 12, 14, 8, 14); + + // Cursed I know + final static Map VOXEL_SHAPES = new HashMap<>(); + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + + Boolean north = canConnect(world.getBlockState(pos.north())); + boolean east = canConnect(world.getBlockState(pos.east())); + boolean west = canConnect(world.getBlockState(pos.west())); + boolean south = canConnect(world.getBlockState(pos.south())); + + String key = north.toString()+ east + west + south; + if (!VOXEL_SHAPES.containsKey(key)) { + generateVoxelShape(key, north, east, west, south); + } + return VOXEL_SHAPES.get(key); + } + private static void generateVoxelShape(String key, Boolean north, Boolean east, Boolean west, Boolean south) { + VoxelShape newVoxelShape = TABLE_CLASSIC_BASE; + if (!north && !south && !east && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_CLASSIC_NORTH_EAST_LEG, TABLE_CLASSIC_SOUTH_WEST_LEG, TABLE_CLASSIC_SOUTH_EAST_LEG, TABLE_CLASSIC_NORTH_WEST_LEG); + } + if (!north && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_CLASSIC_NORTH_EAST_LEG); + } + if (!north && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_CLASSIC_NORTH_WEST_LEG); + } + if (!south && !east) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_CLASSIC_SOUTH_EAST_LEG); + } + if (!south && !west) { + newVoxelShape = VoxelShapes.union(newVoxelShape, TABLE_CLASSIC_SOUTH_WEST_LEG); + } + VOXEL_SHAPES.put(key, newVoxelShape); + } + + @Override + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return false; + } +} + + diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/ModernCoffeeTableBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/ModernCoffeeTableBlock.java new file mode 100644 index 000000000..811484944 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/ModernCoffeeTableBlock.java @@ -0,0 +1,163 @@ +package com.unlikepaladin.pfm.blocks; + +import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.data.FurnitureBlock; +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; +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.World; +import net.minecraft.world.WorldAccess; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + +public class ModernCoffeeTableBlock extends Block { + private final Block baseBlock; + public static final EnumProperty AXIS = Properties.HORIZONTAL_AXIS; + private static final List WOOD_COFFEE_MODERN_TABLES = new ArrayList<>(); + private static final List STONE_COFEEE_MODERN_TABLES = new ArrayList<>(); + private final BlockState baseBlockState; + + public ModernCoffeeTableBlock(Settings settings) { + super(settings); + setDefaultState(this.getStateManager().getDefaultState().with(AXIS, Direction.Axis.X)); + this.baseBlockState = this.getDefaultState(); + this.baseBlock = baseBlockState.getBlock(); + if((material.equals(Material.WOOD) || material.equals(Material.NETHER_WOOD)) && this.getClass().isAssignableFrom(ModernCoffeeTableBlock.class)){ + WOOD_COFFEE_MODERN_TABLES.add(new FurnitureBlock(this, "coffee_table_modern")); + } + else if (this.getClass().isAssignableFrom(ModernCoffeeTableBlock.class)){ + STONE_COFEEE_MODERN_TABLES.add(new FurnitureBlock(this, "coffee_table_modern")); + } + } + + public static Stream streamWoodModernCoffeeTables() { + return WOOD_COFFEE_MODERN_TABLES.stream(); + } + public static Stream streamStoneModernCoffeeTables() { + return STONE_COFEEE_MODERN_TABLES.stream(); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(AXIS); + } + + @Override + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean notify) { + if (!state.isOf(state.getBlock())) { + this.baseBlockState.neighborUpdate(world, pos, Blocks.AIR, pos, false); + this.baseBlock.onBlockAdded(this.baseBlockState, world, pos, oldState, false); + } + } + + public BlockState getPlacementState(ItemPlacementContext ctx) { + return this.getDefaultState().with(AXIS, ctx.getPlayerFacing().rotateYClockwise().getAxis()); + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + } + + boolean canConnect(BlockState blockState) + { + return PaladinFurnitureMod.getPFMConfig().doTablesOfDifferentMaterialsConnect() ? blockState.getBlock() instanceof ModernCoffeeTableBlock : blockState.getBlock() == this; + } + + public boolean isTable(BlockView world, BlockPos pos, Direction.Axis direction, int i) + { + BlockState state = world.getBlockState(pos.offset(direction, i)); + if(canConnect(state)) + { + Direction.Axis sourceDirection = state.get(AXIS); + return sourceDirection.equals(direction); + } + return false; + } + + public int getFlammability(BlockState state, BlockView world, BlockPos pos, Direction face) { + if (state.getMaterial() == Material.WOOD || state.getMaterial() == Material.WOOL) { + return 20; + } + return 0; + } + + /** + * Method to rotate VoxelShapes from this random Forge Forums thread: https://forums.minecraftforge.net/topic/74979-1144-rotate-voxel-shapes/ + */ + public static VoxelShape rotateShape(Direction from, Direction to, VoxelShape shape) { + VoxelShape[] buffer = new VoxelShape[]{shape, VoxelShapes.empty()}; + + int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4; + for (int i = 0; i < times; i++) { + buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1 - maxZ, minY, minX, 1 - minZ, maxY, maxX))); + buffer[0] = buffer[1]; + buffer[1] = VoxelShapes.empty(); + } + + return buffer[0]; + } + + final static VoxelShape MODERN_COFFEE_TABLE = VoxelShapes.union(createCuboidShape(0, 8, 0, 16, 10, 16), createCuboidShape(12, 0, 12, 14, 8, 14), createCuboidShape(12, 0, 2, 14, 8, 4), createCuboidShape(13, 2, 7,15, 8, 9), createCuboidShape(1, 2, 7, 3, 8, 9),createCuboidShape(2, 0, 2,4, 8, 4),createCuboidShape(2, 0, 4, 4, 2, 12), createCuboidShape(3, 2, 7,13, 4, 9),createCuboidShape(12, 0, 4,14, 2, 12), createCuboidShape(2, 0, 12,4, 8, 14)); + final static VoxelShape MODERN_COFFEE_TABLE_MIDDLE = VoxelShapes.union(createCuboidShape(0, 8, 0, 16, 10, 16),createCuboidShape(0, 2, 7,16, 4, 9 )); + final static VoxelShape MODERN_COFFEE_TABLE_ONE = VoxelShapes.union(createCuboidShape(0, 8, 0, 16, 10, 16), createCuboidShape(13, 2, 7, 15, 8, 9), createCuboidShape(12, 0, 12,14, 8, 14), createCuboidShape(12, 0, 4,14, 2, 12 ), createCuboidShape(0, 2, 7,13, 4, 9), createCuboidShape(12, 0, 2,14, 8, 4 )); + final static VoxelShape MODERN_COFFEE_TABLE_ONE_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, MODERN_COFFEE_TABLE_ONE); + final static VoxelShape MODERN_COFFEE_TABLE_ONE_WEST = rotateShape(Direction.NORTH, Direction.WEST, MODERN_COFFEE_TABLE_ONE); + final static VoxelShape MODERN_COFFEE_TABLE_ONE_EAST = rotateShape(Direction.NORTH, Direction.EAST, MODERN_COFFEE_TABLE_ONE); + final static VoxelShape MODERN_COFFEE_TABLE_MIDDLE_EAST = rotateShape(Direction.NORTH, Direction.EAST, MODERN_COFFEE_TABLE_MIDDLE); + final static VoxelShape MODERN_COFFEE_TABLE_EAST = rotateShape(Direction.NORTH, Direction.EAST, MODERN_COFFEE_TABLE); + + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { + Direction.Axis dir = state.get(AXIS); + boolean dirNorthOrSouth = dir.equals(Direction.Axis.X); + boolean dirWestOrEast = dir.equals(Direction.Axis.Z); + boolean left = isTable(view, pos, dir, -1); + boolean right = isTable(view, pos, dir, 1); + + if (left && right) { + if (dirNorthOrSouth) { + return MODERN_COFFEE_TABLE_MIDDLE; + } else { + return MODERN_COFFEE_TABLE_MIDDLE_EAST; + } + } + else if (right) { + if (dirNorthOrSouth) { + return MODERN_COFFEE_TABLE_ONE_SOUTH; + } else { + return MODERN_COFFEE_TABLE_ONE_WEST; + } + } + else if (left) { + if (dirNorthOrSouth) { + return MODERN_COFFEE_TABLE_ONE; + } else { + return MODERN_COFFEE_TABLE_ONE_EAST; + } + } + else { + if (dirWestOrEast) { + return MODERN_COFFEE_TABLE_EAST;} + else { + return MODERN_COFFEE_TABLE; + } + } + } + + @Override + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return false; + } +} + + diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java new file mode 100644 index 000000000..7b988a2dd --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java @@ -0,0 +1,89 @@ +package com.unlikepaladin.pfm.blocks.models.basicCoffeeTable; + +import com.mojang.datafixers.util.Pair; +import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.WoodVariant; +import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import dev.architectury.injectables.annotations.ExpectPlatform; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.UnbakedModel; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +@Environment(EnvType.CLIENT) +public class UnbakedCoffeeBasicTableModel implements UnbakedModel { + public static final Identifier[] BASIC_MODEL_PARTS_BASE = { + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_base"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_east"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_west"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_south_east"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_south_west"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_south_east_top"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_south_west_top"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_east_west_north"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_east_west_south"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_south_east_bottom"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_south_west_bottom"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_south_east"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_south_west"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_east_corner"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_north_west_corner"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_south_east_corner"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic/coffee_table_basic_south_west_corner") + }; + private static final Identifier PARENT = new Identifier("block/block"); + public static final Identifier TABLE_MODEL_ID = new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_basic"); + public static final List MODEL_IDS = new ArrayList<>() { + { + for(WoodVariant variant : WoodVariantRegistry.getVariants()){ + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_basic")); + if (variant.hasStripped()) + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_basic")); + } + for(StoneVariant variant : StoneVariant.values()){ + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_basic")); + } + add(TABLE_MODEL_ID); + } + }; + + @Override + public Collection getModelDependencies() { + return List.of(PARENT); + } + @Override + public Collection getTextureDependencies(Function unbakedModelGetter, Set> unresolvedTextureReferences) { + return Collections.emptyList(); + } + + public static final Map> CACHED_MODELS = new ConcurrentHashMap<>(); + @Nullable + @Override + public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + if (CACHED_MODELS.containsKey(rotationContainer)) + return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + + List bakedModelList = new ArrayList<>(); + for (Identifier modelPart : BASIC_MODEL_PARTS_BASE) { + bakedModelList.add(loader.bake(modelPart, rotationContainer)); + } + CACHED_MODELS.put(rotationContainer, bakedModelList); + return getBakedModel(rotationContainer, bakedModelList); + } + + @ExpectPlatform + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + throw new RuntimeException("Method wasn't replaced correctly"); + } +} diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java new file mode 100644 index 000000000..42b3be168 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java @@ -0,0 +1,79 @@ +package com.unlikepaladin.pfm.blocks.models.classicCoffeeTable; + +import com.mojang.datafixers.util.Pair; +import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.WoodVariant; +import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import dev.architectury.injectables.annotations.ExpectPlatform; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.UnbakedModel; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +@Environment(EnvType.CLIENT) +public class UnbakedClassicCoffeeTableModel implements UnbakedModel { + public static final Identifier[] CLASSIC_MODEL_PARTS_BASE = new Identifier[] { + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_classic/coffee_table_classic_middle"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_classic/coffee_table_classic_two"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_classic/coffee_table_classic_two_uved"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_classic/coffee_table_classic_one"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_classic/coffee_table_classic_one_uved"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_classic/coffee_table_classic") + }; + + private static final Identifier PARENT = new Identifier("block/block"); + public static final Identifier TABLE_MODEL_ID = new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_classic"); + public static final List MODEL_IDS = new ArrayList<>() { + { + for(WoodVariant variant : WoodVariantRegistry.getVariants()){ + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_classic")); + if (variant.hasStripped()) + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_classic")); + } + for(StoneVariant variant : StoneVariant.values()){ + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_classic")); + } + add(TABLE_MODEL_ID); + } + }; + + @Override + public Collection getModelDependencies() { + return List.of(PARENT); + } + @Override + public Collection getTextureDependencies(Function unbakedModelGetter, Set> unresolvedTextureReferences) { + return Collections.emptyList(); + } + + public static final Map> CACHED_MODELS = new ConcurrentHashMap<>(); + @Nullable + @Override + public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + if (CACHED_MODELS.containsKey(rotationContainer)) + return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + + List bakedModelList = new ArrayList<>(); + for (Identifier modelPart : CLASSIC_MODEL_PARTS_BASE) { + bakedModelList.add(loader.bake(modelPart, rotationContainer)); + } + CACHED_MODELS.put(rotationContainer, bakedModelList); + return getBakedModel(rotationContainer, bakedModelList); + } + + @ExpectPlatform + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + throw new RuntimeException("Method wasn't replaced correctly"); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java new file mode 100644 index 000000000..767b749b6 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java @@ -0,0 +1,79 @@ +package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable; + +import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.WoodVariant; +import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import dev.architectury.injectables.annotations.ExpectPlatform; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.UnbakedModel; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +@Environment(EnvType.CLIENT) +public class UnbakedModernCoffeeTableModel implements UnbakedModel { + public static final Identifier[] MODERN_COFFEE_MODEL_PARTS_BASE = new Identifier[] { + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_modern/coffee_table_modern_base"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_modern/coffee_table_modern_right"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_modern/coffee_table_modern_left"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_modern/coffee_table_modern_legs"), + new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_modern/coffee_table_modern_middle"), + }; + + + private static final Identifier PARENT = new Identifier("block/block"); + public static final Identifier TABLE_MODEL_ID = new Identifier(PaladinFurnitureMod.MOD_ID, "block/coffee_table_modern"); + public static final List TABLE_MODEL_IDS = new ArrayList<>() { + { + for(WoodVariant variant : WoodVariantRegistry.getVariants()){ + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_modern")); + if (variant.hasStripped()) + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_modern")); + } + for(StoneVariant variant : StoneVariant.values()){ + add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_modern")); + } + add(TABLE_MODEL_ID); + } + }; + + @Override + public Collection getModelDependencies() { + return List.of(PARENT); + } + + @Override + public Collection getTextureDependencies(Function unbakedModelGetter, Set> unresolvedTextureReferences) { + return Collections.emptyList(); + } + + public static final Map> CACHED_MODELS = new ConcurrentHashMap<>(); + @Nullable + @Override + public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + if (CACHED_MODELS.containsKey(rotationContainer)) + return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + + List bakedModelList = new ArrayList<>(); + for (Identifier modelPart : MODERN_COFFEE_MODEL_PARTS_BASE) { + bakedModelList.add(loader.bake(modelPart, rotationContainer)); + } + CACHED_MODELS.put(rotationContainer, bakedModelList); + return getBakedModel(rotationContainer, bakedModelList); + } + + @ExpectPlatform + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + throw new RuntimeException("Method wasn't replaced correctly"); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java index 5dbfcff84..566290d5c 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java @@ -169,6 +169,33 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat for (StoneVariant variant : StoneVariant.values()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); + PaladinFurnitureModBlocksItems.furnitureEntryMap.put(BasicCoffeeTableBlock.class, new FurnitureEntry<>() {{ + for (WoodVariant variant : WoodVariantRegistry.getVariants()) { + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + if (variant.hasStripped()) + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + } + for (StoneVariant variant : StoneVariant.values()) { + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + }}}); + PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ModernCoffeeTableBlock.class, new FurnitureEntry<>() {{ + for (WoodVariant variant : WoodVariantRegistry.getVariants()) { + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + if (variant.hasStripped()) + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + } + for (StoneVariant variant : StoneVariant.values()) { + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + }}}); + PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicCoffeeTableBlock.class, new FurnitureEntry<>() {{ + for (WoodVariant variant : WoodVariantRegistry.getVariants()) { + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + if (variant.hasStripped()) + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + } + for (StoneVariant variant : StoneVariant.values()) { + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicNightstandBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java index d1d0ccdc9..2783ad7a0 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java @@ -171,6 +171,16 @@ public void registerTables() { generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernDinnerTableBlock.class).getVariantToBlockMap(), "modern_dinner_table", (block, identifiers) -> createAxisOrientableTableBlockState(block, identifiers, 90)); generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernDinnerTableBlock.class).getVariantToBlockMapNonBase(), "modern_dinner_table", (block, identifiers) -> createAxisOrientableTableBlockState(block, identifiers, 90)); + + generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(BasicCoffeeTableBlock.class).getVariantToBlockMap(), "coffee_table_basic", PFMBlockStateModelGenerator::createAxisOrientableTableBlockState); + generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(BasicCoffeeTableBlock.class).getVariantToBlockMapNonBase(), "coffee_table_basic", PFMBlockStateModelGenerator::createAxisOrientableTableBlockState); + + generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernCoffeeTableBlock.class).getVariantToBlockMap(), "coffee_table_modern", (block, identifiers) -> createAxisOrientableTableBlockState(block, identifiers, 90)); + generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernCoffeeTableBlock.class).getVariantToBlockMapNonBase(), "coffee_table_modern", (block, identifiers) -> createAxisOrientableTableBlockState(block, identifiers, 90)); + + generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ClassicCoffeeTableBlock.class).getVariantToBlockMap(), "coffee_table_classic", PFMBlockStateModelGenerator::createSingleStateBlockState); + generateBlockStateForBlock(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ClassicCoffeeTableBlock.class).getVariantToBlockMapNonBase(), "coffee_table_classic", PFMBlockStateModelGenerator::createSingleStateBlockState); + } public void registerNightStands() { diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java index 897bc15e7..93bcbb44f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java @@ -130,6 +130,16 @@ public void run() { generateTranslationForVariantBlockMap(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).getVariantToBlockMapNonBase(), writer, "block.pfm.kitchen_wall_small_drawer", this::simpleStrippedFurnitureTranslation); generateTranslationForLampBlock(writer); + + generateTranslationForVariantBlockMap(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(BasicCoffeeTableBlock.class).getVariantToBlockMap(), writer, "block.pfm.coffee_table_basic", this::simpleStrippedFurnitureTranslation); + generateTranslationForVariantBlockMap(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(BasicCoffeeTableBlock.class).getVariantToBlockMapNonBase(), writer, "block.pfm.coffee_table_basic", this::simpleStrippedFurnitureTranslation); + + generateTranslationForVariantBlockMap(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernCoffeeTableBlock.class).getVariantToBlockMap(), writer, "block.pfm.coffee_table_modern", this::simpleStrippedFurnitureTranslation); + generateTranslationForVariantBlockMap(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernCoffeeTableBlock.class).getVariantToBlockMapNonBase(), writer, "block.pfm.coffee_table_modern", this::simpleStrippedFurnitureTranslation); + + generateTranslationForVariantBlockMap(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ClassicCoffeeTableBlock.class).getVariantToBlockMap(), writer, "block.pfm.coffee_table_classic", this::simpleStrippedFurnitureTranslation); + generateTranslationForVariantBlockMap(PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ClassicCoffeeTableBlock.class).getVariantToBlockMapNonBase(), writer, "block.pfm.coffee_table_classic", this::simpleStrippedFurnitureTranslation); + writer.write(" \"pfm.dummy.entry\": \"dummy entry\"\n"); writer.write("}"); } @@ -270,6 +280,16 @@ public void generateTranslationForVariantBlockMap(Map, ? extends getParent().getLogger().error("Writer exception: " + e); throw new RuntimeException(e); } + } else { + String translatedVariantName = translate("block.pfm.variant."+variant.getIdentifier().getPath()); + String translatedFurnitureName = StringUtils.normalizeSpace(blockStringStringStringStringQuadFunc.apply(block, furnitureKey, "", translatedVariantName)); + try { + writer.write(String.format(" \"%1$s\": \"%2$s\",", block.getTranslationKey(), translatedFurnitureName)); + writer.write("\n"); + } catch (IOException e) { + getParent().getLogger().error("Writer exception: " + e); + throw new RuntimeException(e); + } } }); diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java index bf949de3e..809eab441 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java @@ -589,7 +589,7 @@ else if (block == PaladinFurnitureModBlocksItems.WHITE_MODERN_PENDANT) } if (!generatedRecipes.contains(getId(PaladinFurnitureModBlocksItems.WALL_TOILET_PAPER))) { - offerWallToiletPaperRecipe(PaladinFurnitureModBlocksItems.WALL_TOILET_PAPER, Ingredient.ofItems(Blocks.LIGHT_GRAY_CONCRETE), exporter); + offerWallToiletPaperRecipe(PaladinFurnitureModBlocksItems.WALL_TOILET_PAPER, Ingredient.ofItems(Blocks.STONE), exporter); generatedRecipes.add(getId(PaladinFurnitureModBlocksItems.WALL_TOILET_PAPER)); } @@ -636,6 +636,46 @@ else if (block == PaladinFurnitureModBlocksItems.WHITE_MODERN_PENDANT) } offerLampRecipes(exporter); + + PaladinFurnitureModBlocksItems.furnitureEntryMap.get(BasicCoffeeTableBlock.class).getVariantToBlockMap().forEach((variantBase, block) -> { + if (!generatedRecipes.contains(getId(block))) { + offerBasicCoffeeTableRecipe(block.asItem(), Ingredient.ofItems(variantBase.getSecondaryBlock()), Ingredient.ofItems(variantBase.getBaseBlock()), exporter); + generatedRecipes.add(getId(block)); + } + }); + PaladinFurnitureModBlocksItems.furnitureEntryMap.get(BasicCoffeeTableBlock.class).getVariantToBlockMapNonBase().forEach((variantBase, block) -> { + if (!generatedRecipes.contains(getId(block))) { + offerBasicCoffeeTableRecipe(block.asItem(), Ingredient.ofItems(variantBase.getBaseBlock()), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), exporter); + generatedRecipes.add(getId(block)); + } + }); + + PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernCoffeeTableBlock.class).getVariantToBlockMap().forEach((variantBase, block) -> { + if (!generatedRecipes.contains(getId(block))) { + offerModernCoffeeTableRecipe(block.asItem(), Ingredient.ofItems(variantBase.getSecondaryBlock()), Ingredient.ofItems(variantBase.getBaseBlock()), exporter); + generatedRecipes.add(getId(block)); + } + }); + PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ModernCoffeeTableBlock.class).getVariantToBlockMapNonBase().forEach((variantBase, block) -> { + if (!generatedRecipes.contains(getId(block))) { + offerModernCoffeeTableRecipe(block.asItem(), Ingredient.ofItems(variantBase.getBaseBlock()), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), exporter); + generatedRecipes.add(getId(block)); + } + }); + + PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ClassicCoffeeTableBlock.class).getVariantToBlockMap().forEach((variantBase, block) -> { + if (!generatedRecipes.contains(getId(block))) { + offerClassicCoffeeTableRecipe(block.asItem(), Ingredient.ofItems(variantBase.getSecondaryBlock()), Ingredient.ofItems(variantBase.getBaseBlock()), exporter); + generatedRecipes.add(getId(block)); + } + }); + PaladinFurnitureModBlocksItems.furnitureEntryMap.get(ClassicCoffeeTableBlock.class).getVariantToBlockMapNonBase().forEach((variantBase, block) -> { + if (!generatedRecipes.contains(getId(block))) { + offerClassicCoffeeTableRecipe(block.asItem(), Ingredient.ofItems(variantBase.getBaseBlock()), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), exporter); + generatedRecipes.add(getId(block)); + } + }); + PaladinFurnitureMod.pfmModCompatibilities.forEach(pfmModCompatibility -> pfmModCompatibility.generateRecipes(exporter)); } @@ -712,11 +752,23 @@ public static void offerSimpleSofaRecipe(ItemConvertible output, Ingredient base } public static void offerBasicTableRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient baseMaterial, Consumer exporter) { - FurnitureRecipeJsonFactory.create(output, 4).group("chairs").criterion(getCriterionNameFromOutput(output), conditionsFromIngredient(baseMaterial)).input(legMaterial, 5).input(baseMaterial, 3).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + FurnitureRecipeJsonFactory.create(output, 4).group("tables").criterion(getCriterionNameFromOutput(output), conditionsFromIngredient(baseMaterial)).input(legMaterial, 5).input(baseMaterial, 3).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + } + + public static void offerBasicCoffeeTableRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient baseMaterial, Consumer exporter) { + FurnitureRecipeJsonFactory.create(output, 4).group("tables").criterion(getCriterionNameFromOutput(output), conditionsFromIngredient(baseMaterial)).input(legMaterial, 3).input(baseMaterial, 3).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + } + + public static void offerModernCoffeeTableRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient baseMaterial, Consumer exporter) { + FurnitureRecipeJsonFactory.create(output, 4).group("tables").criterion(getCriterionNameFromOutput(output), conditionsFromIngredient(baseMaterial)).input(legMaterial, 4).input(baseMaterial, 3).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + } + + public static void offerClassicCoffeeTableRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient baseMaterial, Consumer exporter) { + FurnitureRecipeJsonFactory.create(output, 4).group("tables").criterion(getCriterionNameFromOutput(output), conditionsFromIngredient(baseMaterial)).input(legMaterial, 2).input(baseMaterial, 3).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); } public static void offerClassicTableRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient baseMaterial, Consumer exporter) { - FurnitureRecipeJsonFactory.create(output, 4).group("chairs").criterion(getCriterionNameFromOutput(output), conditionsFromIngredient(baseMaterial)).input(legMaterial, 4).input(baseMaterial, 3).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + FurnitureRecipeJsonFactory.create(output, 4).group("tables").criterion(getCriterionNameFromOutput(output), conditionsFromIngredient(baseMaterial)).input(legMaterial, 4).input(baseMaterial, 3).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); } public static void offerLogTableRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient baseMaterial, Consumer exporter) { diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java index 868525ef0..8d82126b6 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java @@ -62,6 +62,9 @@ protected void generateTags() { ModernDinnerTableBlock[] stoneModernDinnerTables = ModernDinnerTableBlock.streamStoneModernDinnerTables().map(FurnitureBlock::getBlock).toArray(ModernDinnerTableBlock[]::new); ClassicNightstandBlock[] stoneClassicNightstands = ClassicNightstandBlock.streamStoneClassicNightstands().map(FurnitureBlock::getBlock).toArray(ClassicNightstandBlock[]::new); LogTableBlock[] stoneNaturalTables = LogTableBlock.streamStoneNaturalTables().map(FurnitureBlock::getBlock).toArray(LogTableBlock[]::new); + BasicCoffeeTableBlock[] stoneBasicCoffeeTables = BasicCoffeeTableBlock.streamStoneBasicTables().map(FurnitureBlock::getBlock).toArray(BasicCoffeeTableBlock[]::new); + ModernCoffeeTableBlock[] stoneModernCoffeeTables = ModernCoffeeTableBlock.streamStoneModernCoffeeTables().map(FurnitureBlock::getBlock).toArray(ModernCoffeeTableBlock[]::new); + ClassicCoffeeTableBlock[] stoneClassicCoffeeTables = ClassicCoffeeTableBlock.streamStoneClassicTables().map(FurnitureBlock::getBlock).toArray(ClassicCoffeeTableBlock[]::new); SimpleStoolBlock[] stoneSimpleStools = SimpleStoolBlock.streamStoneSimpleStools().map(FurnitureBlock::getBlock).toArray(SimpleStoolBlock[]::new); PendantBlock[] pendantLights = PendantBlock.streamPendantLights().toList().toArray(new PendantBlock[0]); @@ -128,7 +131,10 @@ protected void generateTags() { .add(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HEAD) .add(PaladinFurnitureModBlocksItems.BASIC_BATHTUB) .add(PaladinFurnitureModBlocksItems.TRASHCAN) - .add(PaladinFurnitureModBlocksItems.MESH_TRASHCAN); + .add(PaladinFurnitureModBlocksItems.MESH_TRASHCAN) + .add(stoneBasicCoffeeTables) + .add(stoneModernCoffeeTables) + .add(stoneClassicCoffeeTables); KitchenCounterBlock[] woodCounters = KitchenCounterBlock.streamWoodCounters().map(FurnitureBlock::getBlock).toArray(KitchenCounterBlock[]::new); KitchenWallCounterBlock[] woodWallCounters = KitchenWallCounterBlock.streamWallWoodCounters().map(FurnitureBlock::getBlock).toArray(KitchenWallCounterBlock[]::new); @@ -154,6 +160,9 @@ protected void generateTags() { ModernChairBlock[] woodModernChairs = ModernChairBlock.streamWoodModernChairs().map(FurnitureBlock::getBlock).toArray(ModernChairBlock[]::new); ModernDinnerTableBlock[] woodModernDinnerTables = ModernDinnerTableBlock.streamWoodModernDinnerTables().map(FurnitureBlock::getBlock).toArray(ModernDinnerTableBlock[]::new); RawLogTableBlock[] logTables = RawLogTableBlock.streamLogTables().map(FurnitureBlock::getBlock).toArray(RawLogTableBlock[]::new); + BasicCoffeeTableBlock[] woodBasicCoffeeTables = BasicCoffeeTableBlock.streamWoodBasicTables().map(FurnitureBlock::getBlock).toArray(BasicCoffeeTableBlock[]::new); + ModernCoffeeTableBlock[] woodModernCoffeeTables = ModernCoffeeTableBlock.streamWoodModernCoffeeTables().map(FurnitureBlock::getBlock).toArray(ModernCoffeeTableBlock[]::new); + ClassicCoffeeTableBlock[] woodClassicCoffeeTables = ClassicCoffeeTableBlock.streamWoodClassicTables().map(FurnitureBlock::getBlock).toArray(ClassicCoffeeTableBlock[]::new); ClassicNightstandBlock[] woodClassicNightstands = ClassicNightstandBlock.streamWoodClassicNightstands().map(FurnitureBlock::getBlock).toArray(ClassicNightstandBlock[]::new); ModernStoolBlock[] woodModernStools = ModernStoolBlock.streamWoodModernStools().map(FurnitureBlock::getBlock).toArray(ModernStoolBlock[]::new); @@ -199,7 +208,10 @@ protected void generateTags() { .add(simpleBunkLadders) .add(classicBeds) .add(logTables) - .add(PaladinFurnitureModBlocksItems.BASIC_LAMP); + .add(PaladinFurnitureModBlocksItems.BASIC_LAMP) + .add(woodBasicCoffeeTables) + .add(woodModernCoffeeTables) + .add(woodClassicCoffeeTables); getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE) .add(PaladinFurnitureModBlocksItems.RAW_CONCRETE_POWDER); diff --git a/common/src/main/resources/assets/pfm/lang/en_us.json b/common/src/main/resources/assets/pfm/lang/en_us.json index f4c58bfe0..a03b5e184 100644 --- a/common/src/main/resources/assets/pfm/lang/en_us.json +++ b/common/src/main/resources/assets/pfm/lang/en_us.json @@ -1,64 +1,6 @@ { "block.pfm.working_table": "Furniture Workbench", - "block.pfm.oak_chair": "Basic Oak Chair", - "block.pfm.birch_chair": "Basic Birch Chair", - "block.pfm.spruce_chair": "Basic Spruce Chair", - "block.pfm.acacia_chair": "Basic Acacia Chair", - "block.pfm.jungle_chair": "Basic Jungle Chair", - "block.pfm.dark_oak_chair": "Basic Dark Oak Chair", - "block.pfm.warped_chair": "Basic Warped Chair", - "block.pfm.crimson_chair": "Basic Crimson Chair", - - "block.pfm.stripped_oak_chair": "Basic Stripped Oak Chair", - "block.pfm.stripped_birch_chair": "Basic Stripped Birch Chair", - "block.pfm.stripped_spruce_chair": "Basic Stripped Spruce Chair", - "block.pfm.stripped_acacia_chair": "Basic Stripped Acacia Chair", - "block.pfm.stripped_jungle_chair": "Basic Stripped Jungle Chair", - "block.pfm.stripped_dark_oak_chair": "Basic Stripped Dark Oak Chair", - "block.pfm.stripped_warped_chair": "Basic Stripped Warped Chair", - "block.pfm.stripped_crimson_chair": "Basic Stripped Crimson Chair", - "block.pfm.quartz_chair": "Basic Quartz Chair", - "block.pfm.netherite_chair": "The Swaggiest Basic Chair Ever", - "block.pfm.light_wood_chair": "Basic Light Wood Chair", - "block.pfm.dark_wood_chair": "Basic Dark Wood Chair", - "block.pfm.granite_chair": "Basic Granite Chair", - "block.pfm.calcite_chair": "Basic Calcite Chair", - "block.pfm.andesite_chair": "Basic Andesite Chair", - "block.pfm.diorite_chair": "Basic Diorite Chair", - "block.pfm.stone_chair": "Basic Stone Chair", - "block.pfm.blackstone_chair": "Basic Blackstone Chair", - "block.pfm.deepslate_chair": "Basic Deepslate Chair", - - "block.pfm.oak_chair_dinner": "Dining Oak Chair", - "block.pfm.birch_chair_dinner": "Dining Birch Chair", - "block.pfm.spruce_chair_dinner": "Dining Spruce Chair", - "block.pfm.acacia_chair_dinner": "Dining Acacia Chair", - "block.pfm.jungle_chair_dinner": "Dining Jungle Chair", - "block.pfm.dark_oak_chair_dinner": "Dining Dark Oak Chair", - "block.pfm.warped_chair_dinner": "Dining Warped Chair", - "block.pfm.crimson_chair_dinner": "Dining Crimson Chair", - - "block.pfm.stripped_oak_chair_dinner": "Dining Stripped Oak Chair", - "block.pfm.stripped_birch_chair_dinner": "Dining Stripped Birch Chair", - "block.pfm.stripped_spruce_chair_dinner": "Dining Stripped Spruce Chair", - "block.pfm.stripped_acacia_chair_dinner": "Dining Stripped Acacia Chair", - "block.pfm.stripped_jungle_chair_dinner": "Dining Stripped Jungle Chair", - "block.pfm.stripped_dark_oak_chair_dinner": "Dining Stripped Dark Oak Chair", - "block.pfm.stripped_warped_chair_dinner": "Dining Stripped Warped Chair", - "block.pfm.stripped_crimson_chair_dinner": "Dining Stripped Crimson Chair", - "block.pfm.quartz_chair_dinner": "Dining Quartz Chair", - "block.pfm.netherite_chair_dinner": "The Swaggiest Dining Chair Ever", - "block.pfm.light_wood_chair_dinner": "Dining Light Wood Chair", - "block.pfm.dark_wood_chair_dinner": "Dining Dark Wood Chair", - "block.pfm.granite_chair_dinner": "Dining Granite Chair", - "block.pfm.andesite_chair_dinner": "Dining Andesite Chair", - "block.pfm.calcite_chair_dinner": "Dining Calcite Chair", - "block.pfm.diorite_chair_dinner": "Dining Diorite Chair", - "block.pfm.stone_chair_dinner": "Dining Stone Chair", - "block.pfm.blackstone_chair_dinner": "Dining Blackstone Chair", - "block.pfm.deepslate_chair_dinner": "Dining Deepslate Chair", - "block.pfm.froggy_chair": "Froggy Chair", "block.pfm.froggy_chair_pink": "Pink Froggy Chair", "block.pfm.froggy_chair_orange": "Orange Froggy Chair", @@ -66,68 +8,9 @@ "block.pfm.froggy_chair_light_blue": "Light Blue Froggy Chair", "block.pfm.froggy_chair_yellow": "Yellow Froggy Chair", - "block.pfm.oak_chair_classic": "Classic Oak Chair", - "block.pfm.birch_chair_classic": "Classic Birch Chair", - "block.pfm.spruce_chair_classic": "Classic Spruce Chair", - "block.pfm.acacia_chair_classic": "Classic Acacia Chair", - "block.pfm.jungle_chair_classic": "Classic Jungle Chair", - "block.pfm.dark_oak_chair_classic": "Classic Dark Oak Chair", - "block.pfm.warped_chair_classic": "Classic Warped Chair", - "block.pfm.crimson_chair_classic": "Classic Crimson Chair", - - "block.pfm.stripped_oak_chair_classic": "Classic Stripped Oak Chair", - "block.pfm.stripped_birch_chair_classic": "Classic Stripped Birch Chair", - "block.pfm.stripped_spruce_chair_classic": "Classic Stripped Spruce Chair", - "block.pfm.stripped_acacia_chair_classic": "Classic Stripped Acacia Chair", - "block.pfm.stripped_jungle_chair_classic": "Classic Stripped Jungle Chair", - "block.pfm.stripped_dark_oak_chair_classic": "Classic Stripped Dark Oak Chair", - "block.pfm.stripped_warped_chair_classic": "Classic Stripped Warped Chair", - "block.pfm.stripped_crimson_chair_classic": "Classic Stripped Crimson Chair", - "block.pfm.chair_classic_wool": "Wool Classic Chair", - "block.pfm.quartz_chair_classic": "Classic Quartz Chair", - "block.pfm.netherite_chair_classic": "The Swaggiest Classic Chair Ever", - "block.pfm.light_wood_chair_classic": "Classic Light Wood Chair", - "block.pfm.dark_wood_chair_classic": "Classic Dark Wood Chair", - "block.pfm.granite_chair_classic": "Classic Granite Chair", - "block.pfm.andesite_chair_classic": "Classic Andesite Chair", - "block.pfm.diorite_chair_classic": "Classic Diorite Chair", - "block.pfm.stone_chair_classic": "Classic Stone Chair", - "block.pfm.blackstone_chair_classic": "Classic Blackstone Chair", - "block.pfm.deepslate_chair_classic": "Classic Deepslate Chair", - "block.pfm.calcite_chair_classic": "Classic Calcite Chair", - "itemGroup.pfm.furniture": "Paladin's Furniture", "itemGroup.pfm.dye_kits": "Dye Kits", - "block.pfm.oak_chair_modern": "Modern Oak Chair", - "block.pfm.birch_chair_modern": "Modern Birch Chair", - "block.pfm.spruce_chair_modern": "Modern Spruce Chair", - "block.pfm.acacia_chair_modern": "Modern Acacia Chair", - "block.pfm.jungle_chair_modern": "Modern Jungle Chair", - "block.pfm.dark_oak_chair_modern": "Modern Dark Oak Chair", - "block.pfm.warped_chair_modern": "Modern Warped Chair", - "block.pfm.crimson_chair_modern": "Modern Crimson Chair", - - "block.pfm.stripped_oak_chair_modern": "Modern Stripped Oak Chair", - "block.pfm.stripped_birch_chair_modern": "Modern Stripped Birch Chair", - "block.pfm.stripped_spruce_chair_modern": "Modern Stripped Spruce Chair", - "block.pfm.stripped_acacia_chair_modern": "Modern Stripped Acacia Chair", - "block.pfm.stripped_jungle_chair_modern": "Modern Stripped Jungle Chair", - "block.pfm.stripped_dark_oak_chair_modern": "Modern Stripped Dark Oak Chair", - "block.pfm.stripped_warped_chair_modern": "Modern Stripped Warped Chair", - "block.pfm.stripped_crimson_chair_modern": "Modern Stripped Crimson Chair", - "block.pfm.quartz_chair_modern": "Modern Quartz Chair", - "block.pfm.netherite_chair_modern": "The Swaggiest Modern Chair Ever", - "block.pfm.light_wood_chair_modern": "Modern Light Wood Chair", - "block.pfm.dark_wood_chair_modern": "Modern Dark Wood Chair", - "block.pfm.granite_chair_modern": "Modern Granite Chair", - "block.pfm.andesite_chair_modern": "Modern Andesite Chair", - "block.pfm.diorite_chair_modern": "Modern Diorite Chair", - "block.pfm.stone_chair_modern": "Modern Stone Chair", - "block.pfm.blackstone_chair_modern": "Modern Blackstone Chair", - "block.pfm.deepslate_chair_modern": "Modern Deepslate Chair", - "block.pfm.calcite_chair_modern": "Modern Calcite Chair", - "block.pfm.white_arm_chair": "White Arm Chair", "block.pfm.orange_arm_chair": "Orange Arm Chair", "block.pfm.magenta_arm_chair": "Magenta Arm Chair", @@ -226,575 +109,6 @@ "block.pfm.red_shower_towel": "Red Shower Towel", "block.pfm.black_shower_towel": "Black Shower Towel", - "block.pfm.oak_table_basic": "Basic Oak Table", - "block.pfm.birch_table_basic": "Basic Birch Table", - "block.pfm.spruce_table_basic": "Basic Spruce Table", - "block.pfm.acacia_table_basic": "Basic Acacia Table", - "block.pfm.jungle_table_basic": "Basic Jungle Table", - "block.pfm.dark_oak_table_basic": "Basic Dark Oak Table", - "block.pfm.crimson_table_basic": "Basic Crimson Table", - "block.pfm.warped_table_basic": "Basic Warped Table", - - "block.pfm.stripped_oak_table_basic": "Basic Stripped Oak Table", - "block.pfm.stripped_birch_table_basic": "Basic Stripped Birch Table", - "block.pfm.stripped_spruce_table_basic": "Basic Stripped Spruce Table", - "block.pfm.stripped_acacia_table_basic": "Basic Stripped Acacia Table", - "block.pfm.stripped_jungle_table_basic": "Basic Stripped Jungle Table", - "block.pfm.stripped_dark_oak_table_basic": "Basic Stripped Dark Oak Table", - "block.pfm.stripped_crimson_table_basic": "Basic Stripped Crimson Table", - "block.pfm.stripped_warped_table_basic": "Basic Stripped Warped Table", - - "block.pfm.quartz_table_basic": "Basic Quartz Table", - "block.pfm.netherite_table_basic": "The Swaggiest Basic Table Ever", - "block.pfm.light_wood_table_basic": "Basic Light Wood Table", - "block.pfm.dark_wood_table_basic": "Basic Dark Wood Table", - "block.pfm.granite_table_basic": "Basic Granite Table", - "block.pfm.andesite_table_basic": "Basic Andesite Table", - "block.pfm.diorite_table_basic": "Basic Diorite Table", - "block.pfm.stone_table_basic": "Basic Stone Table", - "block.pfm.blackstone_table_basic": "Basic Blackstone Table", - "block.pfm.deepslate_table_basic": "Basic Deepslate Table", - "block.pfm.calcite_table_basic": "Basic Calcite Table", - - "block.pfm.oak_table_classic": "Classic Oak Table", - "block.pfm.birch_table_classic": "Classic Birch Table", - "block.pfm.spruce_table_classic": "Classic Spruce Table", - "block.pfm.acacia_table_classic": "Classic Acacia Table", - "block.pfm.jungle_table_classic": "Classic Jungle Table", - "block.pfm.dark_oak_table_classic": "Classic Dark Oak Table", - "block.pfm.crimson_table_classic": "Classic Crimson Table", - "block.pfm.warped_table_classic": "Classic Warped Table", - - "block.pfm.stripped_oak_table_classic": "Classic Stripped Oak Table", - "block.pfm.stripped_birch_table_classic": "Classic Stripped Birch Table", - "block.pfm.stripped_spruce_table_classic": "Classic Stripped Spruce Table", - "block.pfm.stripped_acacia_table_classic": "Classic Stripped Acacia Table", - "block.pfm.stripped_jungle_table_classic": "Classic Stripped Jungle Table", - "block.pfm.stripped_dark_oak_table_classic": "Classic Stripped Dark Oak Table", - "block.pfm.stripped_crimson_table_classic": "Classic Stripped Crimson Table", - "block.pfm.stripped_warped_table_classic": "Classic Stripped Warped Table", - - "block.pfm.quartz_table_classic": "Classic Quartz Table", - "block.pfm.netherite_table_classic": "The Swaggiest Classic Table Ever", - "block.pfm.light_wood_table_classic": "Classic Light Wood Table", - "block.pfm.dark_wood_table_classic": "Classic Dark Wood Table", - "block.pfm.granite_table_classic": "Classic Granite Table", - "block.pfm.andesite_table_classic": "Classic Andesite Table", - "block.pfm.diorite_table_classic": "Classic Diorite Table", - "block.pfm.stone_table_classic": "Classic Stone Table", - "block.pfm.blackstone_table_classic": "Classic Blackstone Table", - "block.pfm.deepslate_table_classic": "Classic Deepslate Table", - "block.pfm.calcite_table_classic": "Classic Calcite Table", - - "block.pfm.oak_table_log": "Oak Log Table", - "block.pfm.birch_table_log": "Birch Log Table", - "block.pfm.spruce_table_log": "Spruce Log Table", - "block.pfm.acacia_table_log": "Acacia Log Table", - "block.pfm.jungle_table_log": "Jungle Log Table", - "block.pfm.dark_oak_table_log": "Dark Oak Log Table", - "block.pfm.crimson_table_stem": "Crimson Stem Table", - "block.pfm.warped_table_stem": "Warped Stem Table", - - "block.pfm.stripped_oak_table_log": "Stripped Oak Log Table", - "block.pfm.stripped_birch_table_log": "Stripped Birch Log Table", - "block.pfm.stripped_spruce_table_log": "Stripped Spruce Log Table", - "block.pfm.stripped_acacia_table_log": "Stripped Acacia Log Table", - "block.pfm.stripped_jungle_table_log": "Stripped Jungle Log Table", - "block.pfm.stripped_dark_oak_table_log": "Stripped Dark Oak Log Table", - "block.pfm.stripped_crimson_table_stem": "Stripped Crimson Stem Table", - "block.pfm.stripped_warped_table_stem": "Stripped Warped Stem Table", - - "block.pfm.quartz_table_natural": "Natural Quartz Table", - "block.pfm.netherite_table_natural": "The Swaggiest Natural Table Ever", - "block.pfm.light_wood_table_natural": "Natural Light Wood Table", - "block.pfm.dark_wood_table_natural": "Natural Dark Wood Table", - "block.pfm.granite_table_natural": "Natural Granite Table", - "block.pfm.andesite_table_natural": "Natural Andesite Table", - "block.pfm.diorite_table_natural": "Natural Diorite Table", - "block.pfm.stone_table_natural": "Natural Stone Table", - "block.pfm.blackstone_table_natural": "Natural Blackstone Table", - "block.pfm.deepslate_table_natural": "Natural Deepslate Table", - "block.pfm.calcite_table_natural": "Natural Calcite Table", - - "block.pfm.oak_raw_table_log": "Raw Oak Log Table", - "block.pfm.birch_raw_table_log": "Raw Birch Log Table", - "block.pfm.spruce_raw_table_log": "Raw Spruce Log Table", - "block.pfm.acacia_raw_table_log": "Raw Acacia Log Table", - "block.pfm.jungle_raw_table_log": "Raw Jungle Log Table", - "block.pfm.dark_oak_raw_table_log": "Raw Dark Oak Log Table", - "block.pfm.warped_raw_table_stem": "Raw Warped Stem Table", - "block.pfm.crimson_raw_table_stem": "Raw Crimson Stem Table", - "block.pfm.stripped_oak_raw_table_log": "Raw Stripped Oak Log Table", - "block.pfm.stripped_birch_raw_table_log": "Raw Stripped Birch Log Table", - "block.pfm.stripped_spruce_raw_table_log": "Raw Stripped Spruce Log Table", - "block.pfm.stripped_acacia_raw_table_log": "Raw Stripped Acacia Log Table", - "block.pfm.stripped_jungle_raw_table_log": "Raw Stripped Jungle Log Table", - "block.pfm.stripped_dark_oak_raw_table_log": "Raw Stripped Dark Oak Log Table", - "block.pfm.stripped_warped_raw_table_stem": "Raw Stripped Warped Stem Table", - "block.pfm.stripped_crimson_raw_table_stem": "Raw Stripped Crimson Stem Table", - - "block.pfm.oak_log_stool": "Oak Log Stool", - "block.pfm.birch_log_stool": "Birch Log Stool", - "block.pfm.spruce_log_stool": "Spruce Log Stool", - "block.pfm.acacia_log_stool": "Acacia Log Stool", - "block.pfm.jungle_log_stool": "Jungle Log Stool", - "block.pfm.dark_oak_log_stool": "Dark Oak Log Stool", - "block.pfm.crimson_stem_stool": "Crimson Stem Stool", - "block.pfm.warped_stem_stool": "Warped Stem Stool", - - "block.pfm.oak_classic_stool": "Oak Classic Stool", - "block.pfm.birch_classic_stool": "Birch Classic Stool", - "block.pfm.spruce_classic_stool": "Spruce Classic Stool", - "block.pfm.acacia_classic_stool": "Acacia Classic Stool", - "block.pfm.jungle_classic_stool": "Jungle Classic Stool", - "block.pfm.dark_oak_classic_stool": "Dark Oak Classic Stool", - "block.pfm.crimson_classic_stool": "Crimson Classic Stool", - "block.pfm.warped_classic_stool": "Warped Classic Stool", - "block.pfm.stripped_oak_classic_stool": "Stripped Oak Classic Stool", - "block.pfm.stripped_birch_classic_stool": "Stripped Birch Classic Stool", - "block.pfm.stripped_spruce_classic_stool": "Stripped Spruce Classic Stool", - "block.pfm.stripped_acacia_classic_stool": "Stripped Acacia Classic Stool", - "block.pfm.stripped_jungle_classic_stool": "Stripped Jungle Classic Stool", - "block.pfm.stripped_dark_oak_classic_stool": "Stripped Dark Oak Classic Stool", - "block.pfm.stripped_crimson_classic_stool": "Stripped Crimson Classic Stool", - "block.pfm.stripped_warped_classic_stool": "Stripped Warped Classic Stool", - "block.pfm.quartz_classic_stool": "Quartz Classic Stool", - "block.pfm.netherite_classic_stool": "The Swaggiest Classic Stool Ever", - "block.pfm.light_wood_classic_stool": "Light Wood Classic Stool", - "block.pfm.dark_wood_classic_stool": "Dark Wood Classic Stool", - "block.pfm.granite_classic_stool": "Granite Classic Stool", - "block.pfm.andesite_classic_stool": "Andesite Classic Stool", - "block.pfm.diorite_classic_stool": "Diorite Classic Stool", - "block.pfm.stone_classic_stool": "Stone Classic Stool", - "block.pfm.blackstone_classic_stool": "Blackstone Classic Stool", - "block.pfm.deepslate_classic_stool": "Deepslate Classic Stool", - "block.pfm.calcite_classic_stool": "Calcite Classic Stool", - - "block.pfm.oak_modern_stool": "Oak Modern Stool", - "block.pfm.birch_modern_stool": "Birch Modern Stool", - "block.pfm.spruce_modern_stool": "Spruce Modern Stool", - "block.pfm.acacia_modern_stool": "Acacia Modern Stool", - "block.pfm.jungle_modern_stool": "Jungle Modern Stool", - "block.pfm.dark_oak_modern_stool": "Dark Oak Modern Stool", - "block.pfm.crimson_modern_stool": "Crimson Modern Stool", - "block.pfm.warped_modern_stool": "Warped Modern Stool", - "block.pfm.stripped_oak_modern_stool": "Stripped Oak Modern Stool", - "block.pfm.stripped_birch_modern_stool": "Stripped Birch Modern Stool", - "block.pfm.stripped_spruce_modern_stool": "Stripped Spruce Modern Stool", - "block.pfm.stripped_acacia_modern_stool": "Stripped Acacia Modern Stool", - "block.pfm.stripped_jungle_modern_stool": "Stripped Jungle Modern Stool", - "block.pfm.stripped_dark_oak_modern_stool": "Stripped Dark Oak Modern Stool", - "block.pfm.stripped_crimson_modern_stool": "Stripped Crimson Modern Stool", - "block.pfm.stripped_warped_modern_stool": "Stripped Warped Modern Stool", - "block.pfm.white_modern_stool": "White Modern Concrete Stool", - "block.pfm.gray_modern_stool": "Gray Modern Concrete Stool", - "block.pfm.dark_wood_modern_stool": "Dark Wood Modern Stool", - "block.pfm.gray_dark_oak_modern_stool": "Gray Dark Oak Modern Stool", - "block.pfm.light_gray_dark_oak_modern_stool": "Light Gray Dark Oak Modern Stool", - "block.pfm.light_wood_modern_stool": "Light Wood Modern Stool", - "block.pfm.quartz_modern_stool": "Quartz Modern Stool", - "block.pfm.netherite_modern_stool": "The Swaggiest Modern Stool Ever", - "block.pfm.granite_modern_stool": "Granite Modern Stool", - "block.pfm.andesite_modern_stool": "Andesite Modern Stool", - "block.pfm.diorite_modern_stool": "Diorite Modern Stool", - "block.pfm.stone_modern_stool": "Stone Modern Stool", - "block.pfm.blackstone_modern_stool": "Blackstone Modern Stool", - "block.pfm.deepslate_modern_stool": "Deepslate Modern Stool", - "block.pfm.calcite_modern_stool": "Calcite Modern Stool", - - "block.pfm.oak_simple_stool": "Oak Simple Stool", - "block.pfm.birch_simple_stool": "Birch Simple Stool", - "block.pfm.spruce_simple_stool": "Spruce Simple Stool", - "block.pfm.acacia_simple_stool": "Acacia Simple Stool", - "block.pfm.jungle_simple_stool": "Jungle Simple Stool", - "block.pfm.dark_oak_simple_stool": "Dark Oak Simple Stool", - "block.pfm.crimson_simple_stool": "Crimson Simple Stool", - "block.pfm.warped_simple_stool": "Warped Simple Stool", - "block.pfm.stripped_oak_simple_stool": "Stripped Oak Simple Stool", - "block.pfm.stripped_birch_simple_stool": "Stripped Birch Simple Stool", - "block.pfm.stripped_spruce_simple_stool": "Stripped Spruce Simple Stool", - "block.pfm.stripped_acacia_simple_stool": "Stripped Acacia Simple Stool", - "block.pfm.stripped_jungle_simple_stool": "Stripped Jungle Simple Stool", - "block.pfm.stripped_dark_oak_simple_stool": "Stripped Dark Oak Simple Stool", - "block.pfm.stripped_crimson_simple_stool": "Stripped Crimson Simple Stool", - "block.pfm.stripped_warped_simple_stool": "Stripped Warped Simple Stool", - "block.pfm.quartz_simple_stool": "Quartz Simple Stool", - "block.pfm.netherite_simple_stool": "The Swaggiest Simple Stool Ever", - "block.pfm.light_wood_simple_stool": "Light Wood Simple Stool", - "block.pfm.dark_wood_simple_stool": "Dark Wood Simple Stool", - "block.pfm.granite_simple_stool": "Granite Simple Stool", - "block.pfm.andesite_simple_stool": "Andesite Simple Stool", - "block.pfm.diorite_simple_stool": "Diorite Simple Stool", - "block.pfm.stone_simple_stool": "Stone Simple Stool", - "block.pfm.blackstone_simple_stool": "Blackstone Simple Stool", - "block.pfm.deepslate_simple_stool": "Deepslate Simple Stool", - "block.pfm.calcite_simple_stool": "Calcite Simple Stool", - - "block.pfm.oak_table_dinner": "Oak Dining Table", - "block.pfm.birch_table_dinner": "Birch Dining Table", - "block.pfm.spruce_table_dinner": "Spruce Dining Table", - "block.pfm.acacia_table_dinner": "Acacia Dining Table", - "block.pfm.jungle_table_dinner": "Jungle Dining Table", - "block.pfm.dark_oak_table_dinner": "Dark Oak Dining Table", - "block.pfm.crimson_table_dinner": "Crimson Dining Table", - "block.pfm.warped_table_dinner": "Warped Dining Table", - "block.pfm.stripped_oak_table_dinner": "Stripped Oak Dining Table", - "block.pfm.stripped_birch_table_dinner": "Stripped Birch Dining Table", - "block.pfm.stripped_spruce_table_dinner": "Stripped Spruce Dining Table", - "block.pfm.stripped_acacia_table_dinner": "Stripped Acacia Dining Table", - "block.pfm.stripped_jungle_table_dinner": "Stripped Jungle Dining Table", - "block.pfm.stripped_dark_oak_table_dinner": "Stripped Dark Oak Dining Table", - "block.pfm.stripped_crimson_table_dinner": "Stripped Crimson Dining Table", - "block.pfm.stripped_warped_table_dinner": "Stripped Warped Dining Table", - "block.pfm.quartz_table_dinner": "Quartz Dining Table", - "block.pfm.netherite_table_dinner": "The Swaggiest Dining Table Ever", - "block.pfm.light_wood_table_dinner": "Light Wood Dining Table", - "block.pfm.dark_wood_table_dinner": "Dark Wood Dining Table", - "block.pfm.granite_table_dinner": "Granite Dining Table", - "block.pfm.andesite_table_dinner": "Andesite Dining Table", - "block.pfm.diorite_table_dinner": "Diorite Dining Table", - "block.pfm.stone_table_dinner": "Stone Dining Table", - "block.pfm.blackstone_table_dinner": "Blackstone Dining Table", - "block.pfm.deepslate_table_dinner": "Deepslate Dining Table", - "block.pfm.calcite_table_dinner": "Calcite Dining Table", - - "block.pfm.oak_table_modern_dinner": "Oak Modern Dining Table", - "block.pfm.birch_table_modern_dinner": "Birch Modern Dining Table", - "block.pfm.spruce_table_modern_dinner": "Spruce Modern Dining Table", - "block.pfm.acacia_table_modern_dinner": "Acacia Modern Dining Table", - "block.pfm.jungle_table_modern_dinner": "Jungle Modern Dining Table", - "block.pfm.dark_oak_table_modern_dinner": "Dark Oak Modern Dining Table", - "block.pfm.crimson_table_modern_dinner": "Crimson Modern Dining Table", - "block.pfm.warped_table_modern_dinner": "Warped Modern Dining Table", - "block.pfm.stripped_oak_table_modern_dinner": "Stripped Modern Oak Dining Table", - "block.pfm.stripped_birch_table_modern_dinner": "Stripped Modern Birch Dining Table", - "block.pfm.stripped_spruce_table_modern_dinner": "Stripped Modern Spruce Dining Table", - "block.pfm.stripped_acacia_table_modern_dinner": "Stripped Modern Acacia Dining Table", - "block.pfm.stripped_jungle_table_modern_dinner": "Stripped Modern Jungle Dining Table", - "block.pfm.stripped_dark_oak_table_modern_dinner": "Stripped Modern Dark Oak Dining Table", - "block.pfm.stripped_crimson_table_modern_dinner": "Stripped Modern Crimson Dining Table", - "block.pfm.stripped_warped_table_modern_dinner": "Stripped Modern Warped Dining Table", - "block.pfm.quartz_table_modern_dinner": "Quartz Modern Dining Table", - "block.pfm.netherite_table_modern_dinner": "The Swaggiest Modern Dining Table Ever", - "block.pfm.light_wood_table_modern_dinner": "Light Wood Modern Dining Table", - "block.pfm.dark_wood_table_modern_dinner": "Dark Wood Modern Dining Table", - "block.pfm.granite_table_modern_dinner": "Granite Modern Dining Table", - "block.pfm.andesite_table_modern_dinner": "Andesite Modern Dining Table", - "block.pfm.diorite_table_modern_dinner": "Diorite Modern Dining Table", - "block.pfm.stone_table_modern_dinner": "Stone Modern Dining Table", - "block.pfm.blackstone_table_modern_dinner": "Blackstone Modern Dining Table", - "block.pfm.deepslate_table_modern_dinner": "Deepslate Modern Dining Table", - "block.pfm.calcite_table_modern_dinner": "Calcite Modern Dining Table", - - "block.pfm.oak_classic_nightstand": "Oak Classic Nightstand", - "block.pfm.birch_classic_nightstand": "Birch Classic Nightstand", - "block.pfm.spruce_classic_nightstand": "Spruce Classic Nightstand", - "block.pfm.acacia_classic_nightstand": "Acacia Classic Nightstand", - "block.pfm.jungle_classic_nightstand": "Jungle Classic Nightstand", - "block.pfm.dark_oak_classic_nightstand": "Dark Oak Classic Nightstand", - "block.pfm.crimson_classic_nightstand": "Crimson Classic Nightstand", - "block.pfm.warped_classic_nightstand": "Warped Classic Nightstand", - "block.pfm.stripped_oak_classic_nightstand": "Stripped Oak Classic Nightstand", - "block.pfm.stripped_birch_classic_nightstand": "Stripped Birch Classic Nightstand", - "block.pfm.stripped_spruce_classic_nightstand": "Stripped Spruce Classic Nightstand", - "block.pfm.stripped_acacia_classic_nightstand": "Stripped Acacia Classic Nightstand", - "block.pfm.stripped_jungle_classic_nightstand": "Stripped Jungle Classic Nightstand", - "block.pfm.stripped_dark_oak_classic_nightstand": "Stripped Dark Oak Classic Nightstand", - "block.pfm.stripped_crimson_classic_nightstand": "Stripped Crimson Classic Nightstand", - "block.pfm.stripped_warped_classic_nightstand": "Stripped Warped Classic Nightstand", - "block.pfm.quartz_classic_nightstand": "Quartz Classic Nightstand", - "block.pfm.netherite_classic_nightstand": "The Swaggiest Classic Nightstand Ever", - "block.pfm.light_wood_classic_nightstand": "Light Wood Classic Nightstand", - "block.pfm.dark_wood_classic_nightstand": "Dark Wood Classic Nightstand", - "block.pfm.granite_classic_nightstand": "Granite Classic Nightstand", - "block.pfm.andesite_classic_nightstand": "Andesite Classic Nightstand", - "block.pfm.diorite_classic_nightstand": "Diorite Classic Nightstand", - "block.pfm.stone_classic_nightstand": "Stone Classic Nightstand", - "block.pfm.blackstone_classic_nightstand": "Blackstone Classic Nightstand", - "block.pfm.deepslate_classic_nightstand": "Deepslate Classic Nightstand", - "block.pfm.calcite_classic_nightstand": "Calcite Classic Nightstand", - - "block.pfm.oak_red_simple_bed": "Oak Red Simple Bed", - "block.pfm.oak_orange_simple_bed": "Oak Orange Simple Bed", - "block.pfm.oak_yellow_simple_bed": "Oak Yellow Simple Bed", - "block.pfm.oak_green_simple_bed": "Oak Green Simple Bed", - "block.pfm.oak_lime_simple_bed": "Oak Lime Simple Bed", - "block.pfm.oak_light_blue_simple_bed": "Oak Light Blue Simple Bed", - "block.pfm.oak_blue_simple_bed": "Oak Blue Simple Bed", - "block.pfm.oak_brown_simple_bed": "Oak Brown Simple Bed", - "block.pfm.oak_cyan_simple_bed": "Oak Cyan Simple Bed", - "block.pfm.oak_light_gray_simple_bed": "Oak Light Gray Simple Bed", - "block.pfm.oak_gray_simple_bed": "Oak Gray Simple Bed", - "block.pfm.oak_purple_simple_bed": "Oak Purple Simple Bed", - "block.pfm.oak_magenta_simple_bed": "Oak Magenta Simple Bed", - "block.pfm.oak_pink_simple_bed": "Oak Pink Simple Bed", - "block.pfm.oak_black_simple_bed": "Oak Black Simple Bed", - "block.pfm.oak_white_simple_bed": "Oak White Simple Bed", - - "block.pfm.spruce_red_simple_bed": "Spruce Red Simple Bed", - "block.pfm.spruce_orange_simple_bed": "Spruce Orange Simple Bed", - "block.pfm.spruce_yellow_simple_bed": "Spruce Yellow Simple Bed", - "block.pfm.spruce_green_simple_bed": "Spruce Green Simple Bed", - "block.pfm.spruce_lime_simple_bed": "Spruce Lime Simple Bed", - "block.pfm.spruce_light_blue_simple_bed": "Spruce Light Blue Simple Bed", - "block.pfm.spruce_blue_simple_bed": "Spruce Blue Simple Bed", - "block.pfm.spruce_brown_simple_bed": "Spruce Brown Simple Bed", - "block.pfm.spruce_cyan_simple_bed": "Spruce Cyan Simple Bed", - "block.pfm.spruce_light_gray_simple_bed": "Spruce Light Gray Simple Bed", - "block.pfm.spruce_gray_simple_bed": "Spruce Gray Simple Bed", - "block.pfm.spruce_purple_simple_bed": "Spruce Purple Simple Bed", - "block.pfm.spruce_magenta_simple_bed": "Spruce Magenta Simple Bed", - "block.pfm.spruce_pink_simple_bed": "Spruce Pink Simple Bed", - "block.pfm.spruce_black_simple_bed": "Spruce Black Simple Bed", - "block.pfm.spruce_white_simple_bed": "Spruce White Simple Bed", - - "block.pfm.birch_red_simple_bed": "Birch Red Simple Bed", - "block.pfm.birch_orange_simple_bed": "Birch Orange Simple Bed", - "block.pfm.birch_yellow_simple_bed": "Birch Yellow Simple Bed", - "block.pfm.birch_green_simple_bed": "Birch Green Simple Bed", - "block.pfm.birch_lime_simple_bed": "Birch Lime Simple Bed", - "block.pfm.birch_light_blue_simple_bed": "Birch Light Blue Simple Bed", - "block.pfm.birch_blue_simple_bed": "Birch Blue Simple Bed", - "block.pfm.birch_brown_simple_bed": "Birch Brown Simple Bed", - "block.pfm.birch_cyan_simple_bed": "Birch Cyan Simple Bed", - "block.pfm.birch_light_gray_simple_bed": "Birch Light Gray Simple Bed", - "block.pfm.birch_gray_simple_bed": "Birch Gray Simple Bed", - "block.pfm.birch_purple_simple_bed": "Birch Purple Simple Bed", - "block.pfm.birch_magenta_simple_bed": "Birch Magenta Simple Bed", - "block.pfm.birch_pink_simple_bed": "Birch Pink Simple Bed", - "block.pfm.birch_black_simple_bed": "Birch Black Simple Bed", - "block.pfm.birch_white_simple_bed": "Birch White Simple Bed", - - "block.pfm.acacia_red_simple_bed": "Acacia Red Simple Bed", - "block.pfm.acacia_orange_simple_bed": "Acacia Orange Simple Bed", - "block.pfm.acacia_yellow_simple_bed": "Acacia Yellow Simple Bed", - "block.pfm.acacia_green_simple_bed": "Acacia Green Simple Bed", - "block.pfm.acacia_lime_simple_bed": "Acacia Lime Simple Bed", - "block.pfm.acacia_light_blue_simple_bed": "Acacia Light Blue Simple Bed", - "block.pfm.acacia_blue_simple_bed": "Acacia Blue Simple Bed", - "block.pfm.acacia_brown_simple_bed": "Acacia Brown Simple Bed", - "block.pfm.acacia_cyan_simple_bed": "Acacia Cyan Simple Bed", - "block.pfm.acacia_light_gray_simple_bed": "Acacia Light Gray Simple Bed", - "block.pfm.acacia_gray_simple_bed": "Acacia Gray Simple Bed", - "block.pfm.acacia_purple_simple_bed": "Acacia Purple Simple Bed", - "block.pfm.acacia_magenta_simple_bed": "Acacia Magenta Simple Bed", - "block.pfm.acacia_pink_simple_bed": "Acacia Pink Simple Bed", - "block.pfm.acacia_black_simple_bed": "Acacia Black Simple Bed", - "block.pfm.acacia_white_simple_bed": "Acacia White Simple Bed", - - "block.pfm.jungle_red_simple_bed": "Jungle Red Simple Bed", - "block.pfm.jungle_orange_simple_bed": "Jungle Orange Simple Bed", - "block.pfm.jungle_yellow_simple_bed": "Jungle Yellow Simple Bed", - "block.pfm.jungle_green_simple_bed": "Jungle Green Simple Bed", - "block.pfm.jungle_lime_simple_bed": "Jungle Lime Simple Bed", - "block.pfm.jungle_light_blue_simple_bed": "Jungle Light Blue Simple Bed", - "block.pfm.jungle_blue_simple_bed": "Jungle Blue Simple Bed", - "block.pfm.jungle_brown_simple_bed": "Jungle Brown Simple Bed", - "block.pfm.jungle_cyan_simple_bed": "Jungle Cyan Simple Bed", - "block.pfm.jungle_light_gray_simple_bed": "Jungle Light Gray Simple Bed", - "block.pfm.jungle_gray_simple_bed": "Jungle Gray Simple Bed", - "block.pfm.jungle_purple_simple_bed": "Jungle Purple Simple Bed", - "block.pfm.jungle_magenta_simple_bed": "Jungle Magenta Simple Bed", - "block.pfm.jungle_pink_simple_bed": "Jungle Pink Simple Bed", - "block.pfm.jungle_black_simple_bed": "Jungle Black Simple Bed", - "block.pfm.jungle_white_simple_bed": "Jungle White Simple Bed", - - "block.pfm.dark_oak_red_simple_bed": "Dark Oak Red Simple Bed", - "block.pfm.dark_oak_orange_simple_bed": "Dark Oak Orange Simple Bed", - "block.pfm.dark_oak_yellow_simple_bed": "Dark Oak Yellow Simple Bed", - "block.pfm.dark_oak_green_simple_bed": "Dark Oak Green Simple Bed", - "block.pfm.dark_oak_lime_simple_bed": "Dark Oak Lime Simple Bed", - "block.pfm.dark_oak_light_blue_simple_bed": "Dark Oak Light Blue Simple Bed", - "block.pfm.dark_oak_blue_simple_bed": "Dark Oak Blue Simple Bed", - "block.pfm.dark_oak_brown_simple_bed": "Dark Oak Brown Simple Bed", - "block.pfm.dark_oak_cyan_simple_bed": "Dark Oak Cyan Simple Bed", - "block.pfm.dark_oak_light_gray_simple_bed": "Dark Oak Light Gray Simple Bed", - "block.pfm.dark_oak_gray_simple_bed": "Dark Oak Gray Simple Bed", - "block.pfm.dark_oak_purple_simple_bed": "Dark Oak Purple Simple Bed", - "block.pfm.dark_oak_magenta_simple_bed": "Dark Oak Magenta Simple Bed", - "block.pfm.dark_oak_pink_simple_bed": "Dark Oak Pink Simple Bed", - "block.pfm.dark_oak_black_simple_bed": "Dark Oak Black Simple Bed", - "block.pfm.dark_oak_white_simple_bed": "Dark Oak White Simple Bed", - - "block.pfm.crimson_red_simple_bed": "Crimson Red Simple Bed", - "block.pfm.crimson_orange_simple_bed": "Crimson Orange Simple Bed", - "block.pfm.crimson_yellow_simple_bed": "Crimson Yellow Simple Bed", - "block.pfm.crimson_green_simple_bed": "Crimson Green Simple Bed", - "block.pfm.crimson_lime_simple_bed": "Crimson Lime Simple Bed", - "block.pfm.crimson_light_blue_simple_bed": "Crimson Light Blue Simple Bed", - "block.pfm.crimson_blue_simple_bed": "Crimson Blue Simple Bed", - "block.pfm.crimson_brown_simple_bed": "Crimson Brown Simple Bed", - "block.pfm.crimson_cyan_simple_bed": "Crimson Cyan Simple Bed", - "block.pfm.crimson_light_gray_simple_bed": "Crimson Light Gray Simple Bed", - "block.pfm.crimson_gray_simple_bed": "Crimson Gray Simple Bed", - "block.pfm.crimson_purple_simple_bed": "Crimson Purple Simple Bed", - "block.pfm.crimson_magenta_simple_bed": "Crimson Magenta Simple Bed", - "block.pfm.crimson_pink_simple_bed": "Crimson Pink Simple Bed", - "block.pfm.crimson_black_simple_bed": "Crimson Black Simple Bed", - "block.pfm.crimson_white_simple_bed": "Crimson White Simple Bed", - - "block.pfm.warped_red_simple_bed": "Warped Red Simple Bed", - "block.pfm.warped_orange_simple_bed": "Warped Orange Simple Bed", - "block.pfm.warped_yellow_simple_bed": "Warped Yellow Simple Bed", - "block.pfm.warped_green_simple_bed": "Warped Green Simple Bed", - "block.pfm.warped_lime_simple_bed": "Warped Lime Simple Bed", - "block.pfm.warped_light_blue_simple_bed": "Warped Light Blue Simple Bed", - "block.pfm.warped_blue_simple_bed": "Warped Blue Simple Bed", - "block.pfm.warped_brown_simple_bed": "Warped Brown Simple Bed", - "block.pfm.warped_cyan_simple_bed": "Warped Cyan Simple Bed", - "block.pfm.warped_light_gray_simple_bed": "Warped Light Gray Simple Bed", - "block.pfm.warped_gray_simple_bed": "Warped Gray Simple Bed", - "block.pfm.warped_purple_simple_bed": "Warped Purple Simple Bed", - "block.pfm.warped_magenta_simple_bed": "Warped Magenta Simple Bed", - "block.pfm.warped_pink_simple_bed": "Warped Pink Simple Bed", - "block.pfm.warped_black_simple_bed": "Warped Black Simple Bed", - "block.pfm.warped_white_simple_bed": "Warped White Simple Bed", - - "block.pfm.oak_red_classic_bed": "Oak Red Classic Bed", - "block.pfm.oak_orange_classic_bed": "Oak Orange Classic Bed", - "block.pfm.oak_yellow_classic_bed": "Oak Yellow Classic Bed", - "block.pfm.oak_green_classic_bed": "Oak Green Classic Bed", - "block.pfm.oak_lime_classic_bed": "Oak Lime Classic Bed", - "block.pfm.oak_light_blue_classic_bed": "Oak Light Blue Classic Bed", - "block.pfm.oak_blue_classic_bed": "Oak Blue Classic Bed", - "block.pfm.oak_brown_classic_bed": "Oak Brown Classic Bed", - "block.pfm.oak_cyan_classic_bed": "Oak Cyan Classic Bed", - "block.pfm.oak_light_gray_classic_bed": "Oak Light Gray Classic Bed", - "block.pfm.oak_gray_classic_bed": "Oak Gray Classic Bed", - "block.pfm.oak_purple_classic_bed": "Oak Purple Classic Bed", - "block.pfm.oak_magenta_classic_bed": "Oak Magenta Classic Bed", - "block.pfm.oak_pink_classic_bed": "Oak Pink Classic Bed", - "block.pfm.oak_black_classic_bed": "Oak Black Classic Bed", - "block.pfm.oak_white_classic_bed": "Oak White Classic Bed", - - "block.pfm.spruce_red_classic_bed": "Spruce Red Classic Bed", - "block.pfm.spruce_orange_classic_bed": "Spruce Orange Classic Bed", - "block.pfm.spruce_yellow_classic_bed": "Spruce Yellow Classic Bed", - "block.pfm.spruce_green_classic_bed": "Spruce Green Classic Bed", - "block.pfm.spruce_lime_classic_bed": "Spruce Lime Classic Bed", - "block.pfm.spruce_light_blue_classic_bed": "Spruce Light Blue Classic Bed", - "block.pfm.spruce_blue_classic_bed": "Spruce Blue Classic Bed", - "block.pfm.spruce_brown_classic_bed": "Spruce Brown Classic Bed", - "block.pfm.spruce_cyan_classic_bed": "Spruce Cyan Classic Bed", - "block.pfm.spruce_light_gray_classic_bed": "Spruce Light Gray Classic Bed", - "block.pfm.spruce_gray_classic_bed": "Spruce Gray Classic Bed", - "block.pfm.spruce_purple_classic_bed": "Spruce Purple Classic Bed", - "block.pfm.spruce_magenta_classic_bed": "Spruce Magenta Classic Bed", - "block.pfm.spruce_pink_classic_bed": "Spruce Pink Classic Bed", - "block.pfm.spruce_black_classic_bed": "Spruce Black Classic Bed", - "block.pfm.spruce_white_classic_bed": "Spruce White Classic Bed", - - "block.pfm.birch_red_classic_bed": "Birch Red Classic Bed", - "block.pfm.birch_orange_classic_bed": "Birch Orange Classic Bed", - "block.pfm.birch_yellow_classic_bed": "Birch Yellow Classic Bed", - "block.pfm.birch_green_classic_bed": "Birch Green Classic Bed", - "block.pfm.birch_lime_classic_bed": "Birch Lime Classic Bed", - "block.pfm.birch_light_blue_classic_bed": "Birch Light Blue Classic Bed", - "block.pfm.birch_blue_classic_bed": "Birch Blue Classic Bed", - "block.pfm.birch_brown_classic_bed": "Birch Brown Classic Bed", - "block.pfm.birch_cyan_classic_bed": "Birch Cyan Classic Bed", - "block.pfm.birch_light_gray_classic_bed": "Birch Light Gray Classic Bed", - "block.pfm.birch_gray_classic_bed": "Birch Gray Classic Bed", - "block.pfm.birch_purple_classic_bed": "Birch Purple Classic Bed", - "block.pfm.birch_magenta_classic_bed": "Birch Magenta Classic Bed", - "block.pfm.birch_pink_classic_bed": "Birch Pink Classic Bed", - "block.pfm.birch_black_classic_bed": "Birch Black Classic Bed", - "block.pfm.birch_white_classic_bed": "Birch White Classic Bed", - - "block.pfm.acacia_red_classic_bed": "Acacia Red Classic Bed", - "block.pfm.acacia_orange_classic_bed": "Acacia Orange Classic Bed", - "block.pfm.acacia_yellow_classic_bed": "Acacia Yellow Classic Bed", - "block.pfm.acacia_green_classic_bed": "Acacia Green Classic Bed", - "block.pfm.acacia_lime_classic_bed": "Acacia Lime Classic Bed", - "block.pfm.acacia_light_blue_classic_bed": "Acacia Light Blue Classic Bed", - "block.pfm.acacia_blue_classic_bed": "Acacia Blue Classic Bed", - "block.pfm.acacia_brown_classic_bed": "Acacia Brown Classic Bed", - "block.pfm.acacia_cyan_classic_bed": "Acacia Cyan Classic Bed", - "block.pfm.acacia_light_gray_classic_bed": "Acacia Light Gray Classic Bed", - "block.pfm.acacia_gray_classic_bed": "Acacia Gray Classic Bed", - "block.pfm.acacia_purple_classic_bed": "Acacia Purple Classic Bed", - "block.pfm.acacia_magenta_classic_bed": "Acacia Magenta Classic Bed", - "block.pfm.acacia_pink_classic_bed": "Acacia Pink Classic Bed", - "block.pfm.acacia_black_classic_bed": "Acacia Black Classic Bed", - "block.pfm.acacia_white_classic_bed": "Acacia White Classic Bed", - - "block.pfm.jungle_red_classic_bed": "Jungle Red Classic Bed", - "block.pfm.jungle_orange_classic_bed": "Jungle Orange Classic Bed", - "block.pfm.jungle_yellow_classic_bed": "Jungle Yellow Classic Bed", - "block.pfm.jungle_green_classic_bed": "Jungle Green Classic Bed", - "block.pfm.jungle_lime_classic_bed": "Jungle Lime Classic Bed", - "block.pfm.jungle_light_blue_classic_bed": "Jungle Light Blue Classic Bed", - "block.pfm.jungle_blue_classic_bed": "Jungle Blue Classic Bed", - "block.pfm.jungle_brown_classic_bed": "Jungle Brown Classic Bed", - "block.pfm.jungle_cyan_classic_bed": "Jungle Cyan Classic Bed", - "block.pfm.jungle_light_gray_classic_bed": "Jungle Light Gray Classic Bed", - "block.pfm.jungle_gray_classic_bed": "Jungle Gray Classic Bed", - "block.pfm.jungle_purple_classic_bed": "Jungle Purple Classic Bed", - "block.pfm.jungle_magenta_classic_bed": "Jungle Magenta Classic Bed", - "block.pfm.jungle_pink_classic_bed": "Jungle Pink Classic Bed", - "block.pfm.jungle_black_classic_bed": "Jungle Black Classic Bed", - "block.pfm.jungle_white_classic_bed": "Jungle White Classic Bed", - - "block.pfm.dark_oak_red_classic_bed": "Dark Oak Red Classic Bed", - "block.pfm.dark_oak_orange_classic_bed": "Dark Oak Orange Classic Bed", - "block.pfm.dark_oak_yellow_classic_bed": "Dark Oak Yellow Classic Bed", - "block.pfm.dark_oak_green_classic_bed": "Dark Oak Green Classic Bed", - "block.pfm.dark_oak_lime_classic_bed": "Dark Oak Lime Classic Bed", - "block.pfm.dark_oak_light_blue_classic_bed": "Dark Oak Light Blue Classic Bed", - "block.pfm.dark_oak_blue_classic_bed": "Dark Oak Blue Classic Bed", - "block.pfm.dark_oak_brown_classic_bed": "Dark Oak Brown Classic Bed", - "block.pfm.dark_oak_cyan_classic_bed": "Dark Oak Cyan Classic Bed", - "block.pfm.dark_oak_light_gray_classic_bed": "Dark Oak Light Gray Classic Bed", - "block.pfm.dark_oak_gray_classic_bed": "Dark Oak Gray Classic Bed", - "block.pfm.dark_oak_purple_classic_bed": "Dark Oak Purple Classic Bed", - "block.pfm.dark_oak_magenta_classic_bed": "Dark Oak Magenta Classic Bed", - "block.pfm.dark_oak_pink_classic_bed": "Dark Oak Pink Classic Bed", - "block.pfm.dark_oak_black_classic_bed": "Dark Oak Black Classic Bed", - "block.pfm.dark_oak_white_classic_bed": "Dark Oak White Classic Bed", - - "block.pfm.crimson_red_classic_bed": "Crimson Red Classic Bed", - "block.pfm.crimson_orange_classic_bed": "Crimson Orange Classic Bed", - "block.pfm.crimson_yellow_classic_bed": "Crimson Yellow Classic Bed", - "block.pfm.crimson_green_classic_bed": "Crimson Green Classic Bed", - "block.pfm.crimson_lime_classic_bed": "Crimson Lime Classic Bed", - "block.pfm.crimson_light_blue_classic_bed": "Crimson Light Blue Classic Bed", - "block.pfm.crimson_blue_classic_bed": "Crimson Blue Classic Bed", - "block.pfm.crimson_brown_classic_bed": "Crimson Brown Classic Bed", - "block.pfm.crimson_cyan_classic_bed": "Crimson Cyan Classic Bed", - "block.pfm.crimson_light_gray_classic_bed": "Crimson Light Gray Classic Bed", - "block.pfm.crimson_gray_classic_bed": "Crimson Gray Classic Bed", - "block.pfm.crimson_purple_classic_bed": "Crimson Purple Classic Bed", - "block.pfm.crimson_magenta_classic_bed": "Crimson Magenta Classic Bed", - "block.pfm.crimson_pink_classic_bed": "Crimson Pink Classic Bed", - "block.pfm.crimson_black_classic_bed": "Crimson Black Classic Bed", - "block.pfm.crimson_white_classic_bed": "Crimson White Classic Bed", - - "block.pfm.warped_red_classic_bed": "Warped Red Classic Bed", - "block.pfm.warped_orange_classic_bed": "Warped Orange Classic Bed", - "block.pfm.warped_yellow_classic_bed": "Warped Yellow Classic Bed", - "block.pfm.warped_green_classic_bed": "Warped Green Classic Bed", - "block.pfm.warped_lime_classic_bed": "Warped Lime Classic Bed", - "block.pfm.warped_light_blue_classic_bed": "Warped Light Blue Classic Bed", - "block.pfm.warped_blue_classic_bed": "Warped Blue Classic Bed", - "block.pfm.warped_brown_classic_bed": "Warped Brown Classic Bed", - "block.pfm.warped_cyan_classic_bed": "Warped Cyan Classic Bed", - "block.pfm.warped_light_gray_classic_bed": "Warped Light Gray Classic Bed", - "block.pfm.warped_gray_classic_bed": "Warped Gray Classic Bed", - "block.pfm.warped_purple_classic_bed": "Warped Purple Classic Bed", - "block.pfm.warped_magenta_classic_bed": "Warped Magenta Classic Bed", - "block.pfm.warped_pink_classic_bed": "Warped Pink Classic Bed", - "block.pfm.warped_black_classic_bed": "Warped Black Classic Bed", - "block.pfm.warped_white_classic_bed": "Warped White Classic Bed", - - "block.pfm.oak_simple_bunk_ladder": "Oak Simple Bunk Ladder", - "block.pfm.birch_simple_bunk_ladder": "Birch Simple Bunk Ladder", - "block.pfm.spruce_simple_bunk_ladder": "Spruce Simple Bunk Ladder", - "block.pfm.acacia_simple_bunk_ladder": "Acacia Simple Bunk Ladder", - "block.pfm.dark_oak_simple_bunk_ladder": "Dark Oak Simple Bunk Ladder", - "block.pfm.jungle_simple_bunk_ladder": "Jungle Simple Bunk Ladder", - "block.pfm.crimson_simple_bunk_ladder": "Crimson Simple Bunk Ladder", - "block.pfm.warped_simple_bunk_ladder": "Warped Simple Bunk Ladder", - "container.pfm.nightstand": "Nightstand", "container.pfm.drawer": "Kitchen Drawer", "container.pfm.drawer_small": "Small Kitchen Drawer", @@ -839,150 +153,6 @@ "block.pfm.iron_freezer": "Iron Freezer", "block.pfm.xbox_fridge": "Xbox Series X Fridge", - "block.pfm.oak_kitchen_counter": "Oak Kitchen Counter", - "block.pfm.oak_kitchen_drawer": "Oak Kitchen Drawer", - "block.pfm.oak_kitchen_cabinet": "Oak Wall Cabinet", - "block.pfm.oak_kitchen_sink": "Oak Kitchen Sink", - "block.pfm.oak_kitchen_counter_oven": "Oak Kitchen Oven", - "block.pfm.oak_kitchen_wall_counter": "Oak Kitchen Filler Cabinet", - "block.pfm.oak_kitchen_wall_drawer": "Oak Kitchen Cabinet", - "block.pfm.oak_kitchen_wall_small_drawer": "Oak Kitchen Small Cabinet", - - "block.pfm.dark_oak_kitchen_counter": "Dark Oak Kitchen Counter", - "block.pfm.dark_oak_kitchen_drawer": "Dark Oak Kitchen Drawer", - "block.pfm.dark_oak_kitchen_cabinet": "Dark Oak Wall Cabinet", - "block.pfm.dark_oak_kitchen_sink": "Dark Oak Kitchen Sink", - "block.pfm.dark_oak_kitchen_counter_oven": "Dark Oak Kitchen Oven", - "block.pfm.dark_oak_kitchen_wall_counter": "Dark Oak Kitchen Filler Cabinet", - "block.pfm.dark_oak_kitchen_wall_drawer": "Dark Oak Kitchen Cabinet", - "block.pfm.dark_oak_kitchen_wall_small_drawer": "Dark Oak Kitchen Small Cabinet", - - "block.pfm.spruce_kitchen_counter": "Spruce Kitchen Counter", - "block.pfm.spruce_kitchen_drawer": "Spruce Kitchen Drawer", - "block.pfm.spruce_kitchen_cabinet": "Spruce Wall Cabinet", - "block.pfm.spruce_kitchen_sink": "Spruce Kitchen Sink", - "block.pfm.spruce_kitchen_counter_oven": "Spruce Kitchen Oven", - "block.pfm.spruce_kitchen_wall_counter": "Spruce Kitchen Filler Cabinet", - "block.pfm.spruce_kitchen_wall_drawer": "Spruce Kitchen Cabinet", - "block.pfm.spruce_kitchen_wall_small_drawer": "Spruce Kitchen Small Cabinet", - - "block.pfm.acacia_kitchen_counter": "Acacia Kitchen Counter", - "block.pfm.acacia_kitchen_drawer": "Acacia Kitchen Drawer", - "block.pfm.acacia_kitchen_cabinet": "Acacia Wall Cabinet", - "block.pfm.acacia_kitchen_sink": "Acacia Kitchen Sink", - "block.pfm.acacia_kitchen_counter_oven": "Acacia Kitchen Oven", - "block.pfm.acacia_kitchen_wall_counter": "Acacia Kitchen Filler Cabinet", - "block.pfm.acacia_kitchen_wall_drawer": "Acacia Kitchen Cabinet", - "block.pfm.acacia_kitchen_wall_small_drawer": "Acacia Kitchen Small Cabinet", - - "block.pfm.birch_kitchen_counter": "Birch Kitchen Counter", - "block.pfm.birch_kitchen_drawer": "Birch Kitchen Drawer", - "block.pfm.birch_kitchen_cabinet": "Birch Wall Cabinet", - "block.pfm.birch_kitchen_sink": "Birch Kitchen Sink", - "block.pfm.birch_kitchen_counter_oven": "Birch Kitchen Oven", - "block.pfm.birch_kitchen_wall_counter": "Birch Kitchen Filler Cabinet", - "block.pfm.birch_kitchen_wall_drawer": "Birch Kitchen Cabinet", - "block.pfm.birch_kitchen_wall_small_drawer": "Birch Kitchen Small Cabinet", - - "block.pfm.jungle_kitchen_counter": "Jungle Kitchen Counter", - "block.pfm.jungle_kitchen_drawer": "Jungle Kitchen Drawer", - "block.pfm.jungle_kitchen_cabinet": "Jungle Wall Cabinet", - "block.pfm.jungle_kitchen_sink": "Jungle Kitchen Sink", - "block.pfm.jungle_kitchen_counter_oven": "Jungle Kitchen Oven", - "block.pfm.jungle_kitchen_wall_counter": "Jungle Kitchen Filler Cabinet", - "block.pfm.jungle_kitchen_wall_drawer": "Jungle Kitchen Cabinet", - "block.pfm.jungle_kitchen_wall_small_drawer": "Jungle Kitchen Small Cabinet", - - "block.pfm.crimson_kitchen_counter": "Crimson Kitchen Counter", - "block.pfm.crimson_kitchen_drawer": "Crimson Kitchen Drawer", - "block.pfm.crimson_kitchen_cabinet": "Crimson Wall Cabinet", - "block.pfm.crimson_kitchen_sink": "Crimson Kitchen Sink", - "block.pfm.crimson_kitchen_counter_oven": "Crimson Kitchen Oven", - "block.pfm.crimson_kitchen_wall_counter": "Crimson Kitchen Filler Cabinet", - "block.pfm.crimson_kitchen_wall_drawer": "Crimson Kitchen Cabinet", - "block.pfm.crimson_kitchen_wall_small_drawer": "Crimson Kitchen Small Cabinet", - - "block.pfm.warped_kitchen_counter": "Warped Kitchen Counter", - "block.pfm.warped_kitchen_drawer": "Warped Kitchen Drawer", - "block.pfm.warped_kitchen_cabinet": "Warped Wall Cabinet", - "block.pfm.warped_kitchen_sink": "Warped Kitchen Sink", - "block.pfm.warped_kitchen_counter_oven": "Warped Kitchen Oven", - "block.pfm.warped_kitchen_wall_counter": "Warped Kitchen Filler Cabinet", - "block.pfm.warped_kitchen_wall_drawer": "Warped Kitchen Cabinet", - "block.pfm.warped_kitchen_wall_small_drawer": "Warped Kitchen Small Cabinet", - - "block.pfm.stripped_oak_kitchen_counter": "Stripped Oak Kitchen Counter", - "block.pfm.stripped_oak_kitchen_drawer": "Stripped Oak Kitchen Drawer", - "block.pfm.stripped_oak_kitchen_cabinet": "Stripped Oak Wall Cabinet", - "block.pfm.stripped_oak_kitchen_sink": "Stripped Oak Kitchen Sink", - "block.pfm.stripped_oak_kitchen_counter_oven": "Stripped Oak Kitchen Oven", - "block.pfm.stripped_oak_kitchen_wall_counter": "Stripped Oak Kitchen Filler Cabinet", - "block.pfm.stripped_oak_kitchen_wall_drawer": "Stripped Oak Kitchen Cabinet", - "block.pfm.stripped_oak_kitchen_wall_small_drawer": "Stripped Oak Kitchen Small Cabinet", - - "block.pfm.stripped_dark_oak_kitchen_counter": "Stripped Dark Oak Kitchen Counter", - "block.pfm.stripped_dark_oak_kitchen_drawer": "Stripped Dark Oak Kitchen Drawer", - "block.pfm.stripped_dark_oak_kitchen_cabinet": "Stripped Dark Oak Wall Cabinet", - "block.pfm.stripped_dark_oak_kitchen_sink": "Stripped Dark Oak Kitchen Sink", - "block.pfm.stripped_dark_oak_kitchen_counter_oven": "Stripped Dark Oak Kitchen Oven", - "block.pfm.stripped_dark_oak_kitchen_wall_counter": "Stripped Dark Oak Kitchen Filler Cabinet", - "block.pfm.stripped_dark_oak_kitchen_wall_drawer": "Stripped Dark Oak Kitchen Cabinet", - "block.pfm.stripped_dark_oak_kitchen_wall_small_drawer": "Stripped Dark Oak Kitchen Small Cabinet", - - "block.pfm.stripped_spruce_kitchen_counter": "Stripped Spruce Kitchen Counter", - "block.pfm.stripped_spruce_kitchen_drawer": "Stripped Spruce Kitchen Drawer", - "block.pfm.stripped_spruce_kitchen_cabinet": "Stripped Spruce Wall Cabinet", - "block.pfm.stripped_spruce_kitchen_sink": "Stripped Spruce Kitchen Sink", - "block.pfm.stripped_spruce_kitchen_counter_oven": "Stripped Spruce Kitchen Oven", - "block.pfm.stripped_spruce_kitchen_wall_counter": "Stripped Spruce Kitchen Filler Cabinet", - "block.pfm.stripped_spruce_kitchen_wall_drawer": "Stripped Spruce Kitchen Cabinet", - "block.pfm.stripped_spruce_kitchen_wall_small_drawer": "Stripped Spruce Kitchen Small Cabinet", - - "block.pfm.stripped_acacia_kitchen_counter": "Stripped Acacia Kitchen Counter", - "block.pfm.stripped_acacia_kitchen_drawer": "Stripped Acacia Kitchen Drawer", - "block.pfm.stripped_acacia_kitchen_cabinet": "Stripped Acacia Wall Cabinet", - "block.pfm.stripped_acacia_kitchen_sink": "Stripped Acacia Kitchen Sink", - "block.pfm.stripped_acacia_kitchen_counter_oven": "Stripped Acacia Kitchen Oven", - "block.pfm.stripped_acacia_kitchen_wall_counter": "Stripped Acacia Kitchen Filler Cabinet", - "block.pfm.stripped_acacia_kitchen_wall_drawer": "Stripped Acacia Kitchen Cabinet", - "block.pfm.stripped_acacia_kitchen_wall_small_drawer": "Stripped Acacia Kitchen Small Cabinet", - - "block.pfm.stripped_birch_kitchen_counter": "Stripped Birch Kitchen Counter", - "block.pfm.stripped_birch_kitchen_drawer": "Stripped Birch Kitchen Drawer", - "block.pfm.stripped_birch_kitchen_cabinet": "Stripped Birch Wall Cabinet", - "block.pfm.stripped_birch_kitchen_sink": "Stripped Birch Kitchen Sink", - "block.pfm.stripped_birch_kitchen_counter_oven": "Stripped Birch Kitchen Oven", - "block.pfm.stripped_birch_kitchen_wall_counter": "Stripped Birch Kitchen Filler Cabinet", - "block.pfm.stripped_birch_kitchen_wall_drawer": "Stripped Birch Kitchen Cabinet", - "block.pfm.stripped_birch_kitchen_wall_small_drawer": "Stripped Birch Kitchen Small Cabinet", - - "block.pfm.stripped_jungle_kitchen_counter": "Stripped Jungle Kitchen Counter", - "block.pfm.stripped_jungle_kitchen_drawer": "Stripped Jungle Kitchen Drawer", - "block.pfm.stripped_jungle_kitchen_cabinet": "Stripped Jungle Wall Cabinet", - "block.pfm.stripped_jungle_kitchen_sink": "Stripped Jungle Kitchen Sink", - "block.pfm.stripped_jungle_kitchen_counter_oven": "Stripped Jungle Kitchen Oven", - "block.pfm.stripped_jungle_kitchen_wall_counter": "Stripped Jungle Kitchen Filler Cabinet", - "block.pfm.stripped_jungle_kitchen_wall_drawer": "Stripped Jungle Kitchen Cabinet", - "block.pfm.stripped_jungle_kitchen_wall_small_drawer": "Stripped Jungle Kitchen Small Cabinet", - - "block.pfm.stripped_crimson_kitchen_counter": "Stripped Crimson Kitchen Counter", - "block.pfm.stripped_crimson_kitchen_drawer": "Stripped Crimson Kitchen Drawer", - "block.pfm.stripped_crimson_kitchen_cabinet": "Stripped Crimson Wall Cabinet", - "block.pfm.stripped_crimson_kitchen_sink": "Stripped Crimson Kitchen Sink", - "block.pfm.stripped_crimson_kitchen_counter_oven": "Stripped Crimson Kitchen Oven", - "block.pfm.stripped_crimson_kitchen_wall_counter": "Stripped Crimson Kitchen Filler Cabinet", - "block.pfm.stripped_crimson_kitchen_wall_drawer": "Stripped Crimson Kitchen Cabinet", - "block.pfm.stripped_crimson_kitchen_wall_small_drawer": "Stripped Crimson Kitchen Small Cabinet", - - "block.pfm.stripped_warped_kitchen_counter": "Stripped Warped Kitchen Counter", - "block.pfm.stripped_warped_kitchen_drawer": "Stripped Warped Kitchen Drawer", - "block.pfm.stripped_warped_kitchen_cabinet": "Stripped Warped Wall Cabinet", - "block.pfm.stripped_warped_kitchen_sink": "Stripped Warped Kitchen Sink", - "block.pfm.stripped_warped_kitchen_counter_oven": "Stripped Warped Kitchen Oven", - "block.pfm.stripped_warped_kitchen_wall_counter": "Stripped Warped Kitchen Filler Cabinet", - "block.pfm.stripped_warped_kitchen_wall_drawer": "Stripped Warped Kitchen Cabinet", - "block.pfm.stripped_warped_kitchen_wall_small_drawer": "Stripped Warped Kitchen Small Cabinet", - "block.pfm.oak_herringbone_planks": "Oak Herringbone Planks", "block.pfm.dark_oak_herringbone_planks": "Dark Oak Herringbone Planks", "block.pfm.jungle_herringbone_planks": "Jungle Herringbone Planks", @@ -1001,133 +171,6 @@ "block.pfm.glass_modern_pendant": "Glass Modern Light Pendant", "block.pfm.simple_light": "Simple Ceiling Light", - - "block.pfm.concrete_kitchen_counter": "Concrete Kitchen Counter", - "block.pfm.concrete_kitchen_drawer": "Concrete Kitchen Drawer", - "block.pfm.concrete_kitchen_cabinet": "Concrete Wall Cabinet", - "block.pfm.concrete_kitchen_sink": "Concrete Kitchen Sink", - "block.pfm.concrete_kitchen_counter_oven": "Concrete Kitchen Oven", - "block.pfm.concrete_kitchen_wall_counter": "Concrete Kitchen Filler Cabinet", - "block.pfm.concrete_kitchen_wall_drawer": "Concrete Kitchen Cabinet", - "block.pfm.concrete_kitchen_wall_small_drawer": "Concrete Kitchen Small Cabinet", - - "block.pfm.dark_concrete_kitchen_counter": "Dark Concrete Kitchen Counter", - "block.pfm.dark_concrete_kitchen_drawer": "Dark Concrete Kitchen Drawer", - "block.pfm.dark_concrete_kitchen_cabinet": "Dark Concrete Wall Cabinet", - "block.pfm.dark_concrete_kitchen_sink": "Dark Concrete Kitchen Sink", - "block.pfm.dark_concrete_kitchen_counter_oven": "Dark Concrete Kitchen Oven", - "block.pfm.dark_concrete_kitchen_wall_counter": "Dark Concrete Kitchen Filler Cabinet", - "block.pfm.dark_concrete_kitchen_wall_drawer": "Dark Concrete Kitchen Cabinet", - "block.pfm.dark_concrete_kitchen_wall_small_drawer": "Dark Concrete Kitchen Small Cabinet", - - "block.pfm.light_wood_kitchen_counter": "Light Wooden Kitchen Counter", - "block.pfm.light_wood_kitchen_drawer": "Light Wooden Kitchen Drawer", - "block.pfm.light_wood_kitchen_cabinet": "Light Wooden Wall Cabinet", - "block.pfm.light_wood_kitchen_sink": "Light Wooden Kitchen Sink", - "block.pfm.light_wood_kitchen_counter_oven": "Light Wooden Kitchen Oven", - "block.pfm.light_wood_kitchen_wall_counter": "Light Wooden Kitchen Filler Cabinet", - "block.pfm.light_wood_kitchen_wall_drawer": "Light Wooden Kitchen Cabinet", - "block.pfm.light_wood_kitchen_wall_small_drawer": "Light Wood Kitchen Small Cabinet", - - "block.pfm.dark_wood_kitchen_counter": "Dark Wooden Kitchen Counter", - "block.pfm.dark_wood_kitchen_drawer": "Dark Wooden Kitchen Drawer", - "block.pfm.dark_wood_kitchen_cabinet": "Dark Wooden Wall Cabinet", - "block.pfm.dark_wood_kitchen_sink": "Dark Wooden Kitchen Sink", - "block.pfm.dark_wood_kitchen_counter_oven": "Dark Wooden Kitchen Oven", - "block.pfm.dark_wood_kitchen_wall_counter": "Dark Wooden Kitchen Filler Cabinet", - "block.pfm.dark_wood_kitchen_wall_drawer": "Dark Wooden Kitchen Cabinet", - "block.pfm.dark_wood_kitchen_wall_small_drawer": "Dark Wood Kitchen Small Cabinet", - - "block.pfm.granite_kitchen_counter": "Granite Kitchen Counter", - "block.pfm.granite_kitchen_drawer": "Granite Kitchen Drawer", - "block.pfm.granite_kitchen_cabinet": "Granite Wall Cabinet", - "block.pfm.granite_kitchen_sink": "Granite Kitchen Sink", - "block.pfm.granite_kitchen_counter_oven": "Granite Kitchen Oven", - "block.pfm.granite_kitchen_wall_counter": "Granite Kitchen Filler Cabinet", - "block.pfm.granite_kitchen_wall_drawer": "Granite Kitchen Cabinet", - "block.pfm.granite_kitchen_wall_small_drawer": "Granite Kitchen Small Cabinet", - - "block.pfm.calcite_kitchen_counter": "Calcite Kitchen Counter", - "block.pfm.calcite_kitchen_drawer": "Calcite Kitchen Drawer", - "block.pfm.calcite_kitchen_cabinet": "Calcite Wall Cabinet", - "block.pfm.calcite_kitchen_sink": "Calcite Kitchen Sink", - "block.pfm.calcite_kitchen_counter_oven": "Calcite Kitchen Oven", - "block.pfm.calcite_kitchen_wall_counter": "Calcite Kitchen Filler Cabinet", - "block.pfm.calcite_kitchen_wall_drawer": "Calcite Kitchen Cabinet", - "block.pfm.calcite_kitchen_wall_small_drawer": "Calcite Kitchen Small Cabinet", - - "block.pfm.netherite_kitchen_counter": "Netherite Kitchen Counter", - "block.pfm.netherite_kitchen_drawer": "Netherite Kitchen Drawer", - "block.pfm.netherite_kitchen_cabinet": "Netherite Wall Cabinet", - "block.pfm.netherite_kitchen_sink": "Netherite Kitchen Sink", - "block.pfm.netherite_kitchen_counter_oven": "Netherite Kitchen Oven", - "block.pfm.netherite_kitchen_wall_counter": "Netherite Kitchen Filler Cabinet", - "block.pfm.netherite_kitchen_wall_drawer": "Netherite Kitchen Cabinet", - "block.pfm.netherite_kitchen_wall_small_drawer": "Netherite Kitchen Small Cabinet", - - "block.pfm.andesite_kitchen_counter": "Andesite Kitchen Counter", - "block.pfm.andesite_kitchen_drawer": "Andesite Kitchen Drawer", - "block.pfm.andesite_kitchen_cabinet": "Andesite Wall Cabinet", - "block.pfm.andesite_kitchen_sink": "Andesite Kitchen Sink", - "block.pfm.andesite_kitchen_counter_oven": "Andesite Kitchen Oven", - "block.pfm.andesite_kitchen_wall_counter": "Andesite Kitchen Filler Cabinet", - "block.pfm.andesite_kitchen_wall_drawer": "Andesite Kitchen Cabinet", - "block.pfm.andesite_kitchen_wall_small_drawer": "Andesite Kitchen Small Cabinet", - - "block.pfm.diorite_kitchen_counter": "Diorite Kitchen Counter", - "block.pfm.diorite_kitchen_drawer": "Diorite Kitchen Drawer", - "block.pfm.diorite_kitchen_cabinet": "Diorite Wall Cabinet", - "block.pfm.diorite_kitchen_sink": "Diorite Kitchen Sink", - "block.pfm.diorite_kitchen_counter_oven": "Diorite Kitchen Oven", - "block.pfm.diorite_kitchen_wall_counter": "Diorite Kitchen Filler Cabinet", - "block.pfm.diorite_kitchen_wall_drawer": "Diorite Kitchen Cabinet", - "block.pfm.diorite_kitchen_wall_small_drawer": "Diorite Kitchen Small Cabinet", - - "block.pfm.stone_kitchen_counter": "Stone Kitchen Counter", - "block.pfm.stone_kitchen_drawer": "Stone Kitchen Drawer", - "block.pfm.stone_kitchen_cabinet": "Stone Wall Cabinet", - "block.pfm.stone_kitchen_sink": "Stone Kitchen Sink", - "block.pfm.stone_kitchen_counter_oven": "Stone Kitchen Oven", - "block.pfm.stone_kitchen_wall_counter": "Stone Kitchen Filler Cabinet", - "block.pfm.stone_kitchen_wall_drawer": "Stone Kitchen Cabinet", - "block.pfm.stone_kitchen_wall_small_drawer": "Stone Kitchen Small Cabinet", - - "block.pfm.smooth_stone_kitchen_counter": "Smooth Stone Kitchen Counter", - "block.pfm.smooth_stone_kitchen_drawer": "Smooth Stone Kitchen Drawer", - "block.pfm.smooth_stone_kitchen_cabinet": "Smooth Stone Wall Cabinet", - "block.pfm.smooth_stone_kitchen_sink": "Smooth Stone Kitchen Sink", - "block.pfm.smooth_stone_kitchen_counter_oven": "Smooth Stone Kitchen Oven", - "block.pfm.smooth_stone_kitchen_wall_counter": "Smooth Stone Kitchen Filler Cabinet", - "block.pfm.smooth_stone_kitchen_wall_drawer": "Smooth Stone Kitchen Cabinet", - "block.pfm.smooth_stone_kitchen_wall_small_drawer": "Smooth Stone Kitchen Small Cabinet", - - "block.pfm.deepslate_tile_kitchen_counter": "Deepslate Tile Kitchen Counter", - "block.pfm.deepslate_tile_kitchen_drawer": "Deepslate Tile Kitchen Drawer", - "block.pfm.deepslate_tile_kitchen_cabinet": "Deepslate Tile Wall Cabinet", - "block.pfm.deepslate_tile_kitchen_sink": "Deepslate Tile Kitchen Sink", - "block.pfm.deepslate_tile_kitchen_counter_oven": "Deepslate Tile Kitchen Oven", - "block.pfm.deepslate_tile_kitchen_wall_counter": "Deepslate Tile Kitchen Filler Cabinet", - "block.pfm.deepslate_tile_kitchen_wall_drawer": "Deepslate Tile Kitchen Cabinet", - "block.pfm.deepslate_tile_kitchen_wall_small_drawer": "Deepslate Tile Kitchen Small Cabinet", - - "block.pfm.blackstone_kitchen_counter": "Blackstone Kitchen Counter", - "block.pfm.blackstone_kitchen_drawer": "Blackstone Kitchen Drawer", - "block.pfm.blackstone_kitchen_cabinet": "Blackstone Wall Cabinet", - "block.pfm.blackstone_kitchen_sink": "Blackstone Kitchen Sink", - "block.pfm.blackstone_kitchen_counter_oven": "Blackstone Kitchen Oven", - "block.pfm.blackstone_kitchen_wall_counter": "Blackstone Kitchen Filler Cabinet", - "block.pfm.blackstone_kitchen_wall_drawer": "Blackstone Kitchen Cabinet", - "block.pfm.blackstone_kitchen_wall_small_drawer": "Blackstone Kitchen Small Cabinet", - - "block.pfm.deepslate_kitchen_counter": "Deepslate Kitchen Counter", - "block.pfm.deepslate_kitchen_drawer": "Deepslate Kitchen Drawer", - "block.pfm.deepslate_kitchen_cabinet": "Deepslate Wall Cabinet", - "block.pfm.deepslate_kitchen_sink": "Deepslate Kitchen Sink", - "block.pfm.deepslate_kitchen_counter_oven": "Deepslate Kitchen Oven", - "block.pfm.deepslate_kitchen_wall_counter": "Deepslate Kitchen Filler Cabinet", - "block.pfm.deepslate_kitchen_wall_drawer": "Deepslate Kitchen Cabinet", - "block.pfm.deepslate_kitchen_wall_small_drawer": "Deepslate Kitchen Small Cabinet", - "block.pfm.white_mirror": "White Mirror", "block.pfm.gray_mirror": "Gray Mirror", @@ -1246,9 +289,31 @@ "block.pfm.kitchen_wall_counter": "%s %s Kitchen Filler Cabinet", "block.pfm.kitchen_wall_drawer": "%s %s Kitchen Cabinet", "block.pfm.kitchen_wall_small_drawer": "%s %s Kitchen Small Cabinet", - + "block.pfm.coffee_table_basic": "Basic %s %s Coffee Table", + "block.pfm.coffee_table_modern": "Modern %s %s Coffee Table", + "block.pfm.coffee_table_classic": "Classic %s %s Coffee Table", "block.pfm.basic_lamp": "Basic %s %s Lamp", - "message.pfm.toilet_use": "To use the toilet you must first fill it with water, use a water bucket or a water bottle on it. To automatically fill it, you must place a water source 1 block under the floor." + "message.pfm.toilet_use": "To use the toilet you must first fill it with water, use a water bucket or a water bottle on it. To automatically fill it, you must place a water source 1 block under the floor.", + + "block.pfm.variant.quartz": "Quartz", + "block.pfm.variant.netherite": "Netherite", + "block.pfm.variant.light_wood": "Light Wood", + "block.pfm.variant.dark_wood": "Dark Wood", + "block.pfm.variant.granite": "Granite", + "block.pfm.variant.calcite": "Calcite", + "block.pfm.variant.andesite": "Andesite", + "block.pfm.variant.stone": "Stone", + "block.pfm.variant.diorite": "Diorite", + "block.pfm.variant.deepslate": "Deepslate", + "block.pfm.variant.blackstone": "Blackstone", + "block.pfm.variant.dark_concrete": "Dark Concrete", + "block.pfm.variant.concrete": "Concrete", + "block.pfm.variant.smooth_stone": "Smooth Stone", + "block.pfm.variant.deepslate_tile": "Deepslate Tile", + "block.pfm.variant.gray_dark_oak": "Gray Dark Oak", + "block.pfm.variant.white": "White", + "block.pfm.variant.gray": "Gray", + "block.pfm.variant.light_gray_dark_oak": "Light Gray Dark Oak" } diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffe_table_basic_north_west.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffe_table_basic_north_west.json new file mode 100644 index 000000000..1268feffe --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffe_table_basic_north_west.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic.json new file mode 100644 index 000000000..557b9d72d --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic.json @@ -0,0 +1,165 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "name": "Seat", + "from": [0, 8, 0], + "to": [16, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, + "faces": { + "north": {"uv": [0, 0, 14, 2], "texture": "#base"}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base"}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base"}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + }, + { + "from": [12, 0, 4], + "to": [14, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + 0, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [1, 2, 3, 4, 5, 6] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_base.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_base.json new file mode 100644 index 000000000..56cc7eb0f --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_base.json @@ -0,0 +1,86 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "base": "block/oak_planks" + }, + "elements": [ + { + "name": "Seat", + "from": [0, 8, 0], + "to": [16, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, + "faces": { + "north": {"uv": [0, 0, 14, 2], "texture": "#base"}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base"}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base"}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + 0, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_north.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_north.json new file mode 100644 index 000000000..2156995cb --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_north.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [4, 0, 2], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 8], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 1, 4, 9], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 2, 4, 10], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 3, 2, 11], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_south.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_south.json new file mode 100644 index 000000000..7c894dc09 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_east_west_south.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [4, 0, 12], + "to": [12, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 8], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 1, 4, 9], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 2, 4, 10], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 3, 2, 11], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east.json new file mode 100644 index 000000000..a8a721d70 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [12, 0, 2], + "to": [14, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east_corner.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east_corner.json new file mode 100644 index 000000000..160563b2c --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_east_corner.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [14, 0, 2], + "to": [16, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east.json new file mode 100644 index 000000000..e4d1c5503 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 0, 12], + "to": [16, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 0, 4, 16], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 0, 4, 16], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_bottom.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_bottom.json new file mode 100644 index 000000000..49307ef3a --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_bottom.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [4, 0, 12], + "to": [16, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_top.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_top.json new file mode 100644 index 000000000..d61d1d7bf --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_east_top.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [4, 0, 2], + "to": [16, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west.json new file mode 100644 index 000000000..f993e0d38 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 0, 2], + "to": [16, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 0, 4, 16], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 0, 4, 16], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_bottom.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_bottom.json new file mode 100644 index 000000000..70bb888e7 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_bottom.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 0, 12], + "to": [12, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_top.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_top.json new file mode 100644 index 000000000..a36e5280a --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_south_west_top.json @@ -0,0 +1,103 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 0, 2], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs"}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs"}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] + }, + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west.json new file mode 100644 index 000000000..1268feffe --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west_corner.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west_corner.json new file mode 100644 index 000000000..836f70da9 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_north_west_corner.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 0, 2], + "to": [2, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east.json new file mode 100644 index 000000000..24c96956d --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "legs": "block/oak_log", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [12, 0, 12], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east_corner.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east_corner.json new file mode 100644 index 000000000..0a9abcd4b --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_east_corner.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [14, 0, 12], + "to": [16, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west.json new file mode 100644 index 000000000..fb4375a05 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [2, 0, 12], + "to": [4, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west_corner.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west_corner.json new file mode 100644 index 000000000..41437b3af --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_basic/coffee_table_basic_south_west_corner.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 0, 12], + "to": [2, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic.json new file mode 100644 index 000000000..f760de17e --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic.json @@ -0,0 +1,116 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 8, 0], + "to": [16, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, + "faces": { + "north": {"uv": [0, 0, 14, 2], "texture": "#base"}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base"}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base"}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, -45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_middle.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_middle.json new file mode 100644 index 000000000..b509699a2 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_middle.json @@ -0,0 +1,63 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "base": "block/oak_planks" + }, + "elements": [ + { + "from": [0, 8, 0], + "to": [16, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, + "faces": { + "north": {"uv": [0, 0, 14, 2], "texture": "#base"}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base"}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base"}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one.json new file mode 100644 index 000000000..f848a1d2a --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one.json @@ -0,0 +1,63 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "legs": "block/oak_log", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [2, 0, 12], + "to": [4, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [13, -58, 0], + "translation": [0, -0.5, 0], + "scale": [0.58, 0.58, 0.58] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one_uved.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one_uved.json new file mode 100644 index 000000000..5fd517534 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_one_uved.json @@ -0,0 +1,63 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "legs": "block/oak_log", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [12, 0, 12], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [13, -58, 0], + "translation": [0, -0.5, 0], + "scale": [0.58, 0.58, 0.58] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two.json new file mode 100644 index 000000000..9c464d341 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two.json @@ -0,0 +1,62 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [12, 0, 2], + "to": [14, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [13, -58, 0], + "translation": [0, -0.5, 0], + "scale": [0.58, 0.58, 0.58] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two_uved.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two_uved.json new file mode 100644 index 000000000..9aadc8256 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_classic/coffee_table_classic_two_uved.json @@ -0,0 +1,63 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "legs": "block/oak_log", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.39, 0.39, 0.39] + }, + "thirdperson_lefthand": { + "rotation": [59, 58, 0], + "translation": [0.5, 1, 0], + "scale": [0.39, 0.39, 0.39] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "firstperson_lefthand": { + "rotation": [-1, 32, 0], + "translation": [0, 0.75, 0], + "scale": [0.44, 0.44, 0.44] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [13, -58, 0], + "translation": [0, -0.5, 0], + "scale": [0.58, 0.58, 0.58] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3, -5.5], + "scale": [0.9, 0.9, 0.9] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern.json new file mode 100644 index 000000000..0b0ba33d5 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern.json @@ -0,0 +1,204 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "name": "Seat", + "from": [0, 8, 0], + "to": [16, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, + "faces": { + "north": {"uv": [0, 0, 14, 2], "texture": "#base"}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base"}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base"}, + "down": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [13, 2, 7], + "to": [15, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [1, 2, 7], + "to": [3, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + }, + { + "from": [3, 2, 7], + "to": [13, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs"} + } + }, + { + "from": [12, 0, 4], + "to": [14, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "thirdperson_lefthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_lefthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -0.5, -0.75], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + 0, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_base.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_base.json new file mode 100644 index 000000000..dfa81bf67 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_base.json @@ -0,0 +1,80 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "base": "block/oak_planks" + }, + "elements": [ + { + "name": "Seat", + "from": [0, 8, 0], + "to": [16, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, + "faces": { + "north": {"uv": [0, 0, 14, 2], "texture": "#base"}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base"}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base"}, + "down": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "thirdperson_lefthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_lefthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -0.5, -0.75], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_left.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_left.json new file mode 100644 index 000000000..fce1d97ff --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_left.json @@ -0,0 +1,136 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [12, 0, 12], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [13, 2, 7], + "to": [15, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [0, 2, 7], + "to": [13, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 13], "rotation": 270, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"} + } + }, + { + "from": [12, 0, 4], + "to": [14, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "thirdperson_lefthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_lefthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -0.5, -0.75], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_legs.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_legs.json new file mode 100644 index 000000000..4a2e2e89f --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_legs.json @@ -0,0 +1,188 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [12, 0, 12], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [13, 2, 7], + "to": [15, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [1, 2, 7], + "to": [3, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + }, + { + "from": [3, 2, 7], + "to": [13, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs"} + } + }, + { + "from": [12, 0, 4], + "to": [14, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "thirdperson_lefthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_lefthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -0.5, -0.75], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_middle.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_middle.json new file mode 100644 index 000000000..4816ab95f --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_middle.json @@ -0,0 +1,84 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [0, 2, 7], + "to": [16, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "thirdperson_lefthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_lefthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -0.5, -0.75], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_right.json b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_right.json new file mode 100644 index 000000000..ee83b75a6 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/coffee_table_modern/coffee_table_modern_right.json @@ -0,0 +1,136 @@ +{ + "credit": "By UnlikePaladin", + "textures": { + "particle": "block/oak_planks", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [1, 2, 7], + "to": [3, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + }, + { + "from": [2, 0, 4], + "to": [4, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs"} + } + }, + { + "from": [3, 2, 7], + "to": [16, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 13], "rotation": 270, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "thirdperson_lefthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_lefthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -0.5, -0.75], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "chair", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Backrest", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "legs", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/doorbell/doorbell.json b/common/src/main/resources/assets/pfm/models/block/doorbell/doorbell.json new file mode 100644 index 000000000..b21e27aff --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/doorbell/doorbell.json @@ -0,0 +1,76 @@ +{ + "credit": "By UnlikePaladin", + "ambientocclusion": false, + "textures": { + "base": "block/stone", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [7, 1.75, 6], + "to": [9, 2.75, 9], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 1.5, 7.5]}, + "faces": { + "north": {"uv": [0, 1, 2, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 1, 1, 5], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 1, 2, 2], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 5], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 2, 5], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 2, 5], "texture": "#base"} + } + }, + { + "from": [6, -0.25, 4], + "to": [10, 1.75, 11], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 1.5, 7.5]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [4, 0, 0, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 7], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 4, 7], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 4, 7], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -8.25] + }, + "thirdperson_lefthand": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -8.25] + }, + "firstperson_righthand": { + "rotation": [-74, 0, 9], + "translation": [-0.75, 4.5, -4.25] + }, + "firstperson_lefthand": { + "rotation": [-74, 0, 9], + "translation": [-0.75, 4.5, -4.25] + }, + "ground": { + "translation": [0, 4.25, 0] + }, + "gui": { + "rotation": [90, 0, -22], + "translation": [3, -0.5, 0] + }, + "head": { + "translation": [0, 13.25, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -7.25] + } + }, + "groups": [ + { + "name": "doorbell", + "origin": [14, 0, 3], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/doorbell/doorbell_pressed.json b/common/src/main/resources/assets/pfm/models/block/doorbell/doorbell_pressed.json new file mode 100644 index 000000000..d00416d20 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/doorbell/doorbell_pressed.json @@ -0,0 +1,85 @@ +{ + "credit": "By UnlikePaladin", + "ambientocclusion": false, + "textures": { + "base": "block/stone", + "legs": "block/oak_log" + }, + "elements": [ + { + "from": [7, 1.25, 6], + "to": [9, 2.25, 9], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 1.5, 7.25]}, + "faces": { + "north": {"uv": [0, 1, 2, 2], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 1, 1, 5], "rotation": 270, "texture": "#base"}, + "south": {"uv": [0, 1, 2, 2], "texture": "#base"}, + "west": {"uv": [0, 1, 1, 5], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 1, 2, 5], "rotation": 180, "texture": "#base"}, + "down": {"uv": [0, 1, 2, 5], "texture": "#base"} + } + }, + { + "from": [6, -0.25, 4], + "to": [10, 1.75, 11], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 1.5, 7.25]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#legs"}, + "east": {"uv": [0, 0, 2, 7], "rotation": 270, "texture": "#legs"}, + "south": {"uv": [4, 0, 0, 2], "texture": "#legs"}, + "west": {"uv": [0, 0, 2, 7], "rotation": 90, "texture": "#legs"}, + "up": {"uv": [0, 0, 4, 7], "rotation": 180, "texture": "#legs"}, + "down": {"uv": [0, 0, 4, 7], "texture": "#legs"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "thirdperson_lefthand": { + "rotation": [59, -140, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_righthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "firstperson_lefthand": { + "rotation": [-1, -146, 0], + "translation": [1, 0.75, 0], + "scale": [0.32, 0.32, 0.32] + }, + "ground": { + "translation": [0, -0.75, 0], + "scale": [0.39, 0.39, 0.39] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-1, 90, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, -0.5, -0.75], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "doorbell", + "origin": [14, 0, 3], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/FabricCoffeeBasicTableModel.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/FabricCoffeeBasicTableModel.java new file mode 100644 index 000000000..33cc9b33b --- /dev/null +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/FabricCoffeeBasicTableModel.java @@ -0,0 +1,195 @@ +package com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.fabric; + +import com.unlikepaladin.pfm.blocks.BasicCoffeeTableBlock; +import com.unlikepaladin.pfm.blocks.models.fabric.PFMFabricBakedModel; +import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; +import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.minecraft.block.BlockState; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.texture.Sprite; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockRenderView; + +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +public class FabricCoffeeBasicTableModel extends PFMFabricBakedModel { + public FabricCoffeeBasicTableModel(ModelBakeSettings settings, List modelParts) { + super(settings, modelParts); + } + + @Override + public boolean isVanillaAdapter() { + return false; + } + + @Override + public void emitBlockQuads(BlockRenderView world, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + if (state.getBlock() instanceof BasicCoffeeTableBlock) { + Direction.Axis dir = state.get(BasicCoffeeTableBlock.AXIS); + BasicCoffeeTableBlock block = (BasicCoffeeTableBlock) state.getBlock(); + boolean north = block.canConnect(world, state, pos.north(), pos); + boolean east = block.canConnect(world, state, pos.east(), pos); + boolean west = block.canConnect(world, state, pos.west(), pos); + boolean south = block.canConnect(world, state, pos.south(), pos); + boolean cornerNorthWest = north && west && !block.canConnect(world, state, pos.north().west(), pos); + boolean cornerNorthEast = north && east && !block.canConnect(world, state, pos.north().east(), pos); + boolean cornerSouthEast = south && east && !block.canConnect(world, state, pos.south().east(), pos); + boolean cornerSouthWest = south && west && !block.canConnect(world, state, pos.south().west(), pos); + + List spriteList = getSpriteList(state); + pushTextureTransform(context, spriteList.get(0)); + ((FabricBakedModel) getTemplateBakedModels().get(0)).emitBlockQuads(world, state, pos, randomSupplier, context); + context.popTransform(); + + + pushTextureTransform(context, spriteList.get(1)); + if (!north && !south && !east && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(8)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(7)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (dir == Direction.Axis.Z) { + if (!north && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(1)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(2)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(4)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && south && !east && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(7)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (north && !south && !east && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(8)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && east && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(5)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && !east && west) { + ((FabricBakedModel) getTemplateBakedModels().get(10)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && east && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(9)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && !east && west) { + ((FabricBakedModel) getTemplateBakedModels().get(6)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && east && west) { + ((FabricBakedModel) getTemplateBakedModels().get(12)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && east && west) { + ((FabricBakedModel) getTemplateBakedModels().get(11)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (cornerNorthEast) { + ((FabricBakedModel) getTemplateBakedModels().get(13)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(1)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (cornerNorthWest) { + ((FabricBakedModel) getTemplateBakedModels().get(14)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(2)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (cornerSouthWest) { + ((FabricBakedModel) getTemplateBakedModels().get(16)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(4)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (cornerSouthEast) { + ((FabricBakedModel) getTemplateBakedModels().get(15)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + } else { + if (!north && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(2)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(4)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(1)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && south && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(9)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (north && !south && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(10)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && south && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(5)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (north && !south && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(6)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + + if (!north && !south && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(7)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && !south && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(8)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + + if (north && south && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(12)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (north && south && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(11)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + + if (cornerNorthEast) { + ((FabricBakedModel) getTemplateBakedModels().get(14)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(2)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (cornerSouthEast) { + ((FabricBakedModel) getTemplateBakedModels().get(13)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(1)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (cornerNorthWest) { + ((FabricBakedModel) getTemplateBakedModels().get(16)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(4)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (cornerSouthWest) { + ((FabricBakedModel) getTemplateBakedModels().get(15)).emitBlockQuads(world, state, pos, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + } + context.popTransform(); + } + } + + @Override + public void emitItemQuads(ItemStack stack, Supplier randomSupplier, RenderContext context) { + if (stack.getItem() instanceof BlockItem) { + pushTextureTransform(context, getSpriteList(stack).get(0)); + // base + ((FabricBakedModel) getTemplateBakedModels().get(0)).emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + + pushTextureTransform(context, getSpriteList(stack).get(1)); + // legs + ((FabricBakedModel) getTemplateBakedModels().get(1)).emitItemQuads(stack, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(2)).emitItemQuads(stack, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitItemQuads(stack, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(4)).emitItemQuads(stack, randomSupplier, context); + // in between pieces + ((FabricBakedModel) getTemplateBakedModels().get(8)).emitItemQuads(stack, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(7)).emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + } + } + + @Override + public Sprite pfm$getParticle(BlockState state) { + return getSpriteList(state).get(0); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java new file mode 100644 index 000000000..4ad9b76f3 --- /dev/null +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java @@ -0,0 +1,19 @@ +package com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.fabric; + +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class UnbakedCoffeeBasicTableModelImpl { + static Map modelMap = new ConcurrentHashMap<>(); + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + if (modelMap.containsKey(settings)) + return modelMap.get(settings); + BakedModel model = new FabricCoffeeBasicTableModel(settings, modelParts); + modelMap.put(settings, model); + return model; + } +} diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/FabricClassicCoffeeTableModel.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/FabricClassicCoffeeTableModel.java new file mode 100644 index 000000000..a03d8ae1e --- /dev/null +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/FabricClassicCoffeeTableModel.java @@ -0,0 +1,76 @@ +package com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.fabric; + +import com.unlikepaladin.pfm.blocks.ClassicCoffeeTableBlock; +import com.unlikepaladin.pfm.blocks.models.fabric.PFMFabricBakedModel; +import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; +import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.minecraft.block.BlockState; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.texture.Sprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockRenderView; + +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +public class FabricClassicCoffeeTableModel extends PFMFabricBakedModel { + public FabricClassicCoffeeTableModel(ModelBakeSettings settings, List modelParts) { + super(settings, modelParts); + } + @Override + public boolean isVanillaAdapter() { + return false; + } + + @Override + public void emitBlockQuads(BlockRenderView world, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + if (state.getBlock() instanceof ClassicCoffeeTableBlock) { + ClassicCoffeeTableBlock block = (ClassicCoffeeTableBlock) state.getBlock(); + boolean north = block.canConnect(world.getBlockState(pos.north())); + boolean east = block.canConnect(world.getBlockState(pos.east())); + boolean west = block.canConnect(world.getBlockState(pos.west())); + boolean south = block.canConnect(world.getBlockState(pos.south())); + pushTextureTransform(context, getSpriteList(state).get(0)); + ((FabricBakedModel) getTemplateBakedModels().get(0)).emitBlockQuads(world, state, pos, randomSupplier, context); + context.popTransform(); + + pushTextureTransform(context, getSpriteList(state).get(1)); + if (!north && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(1)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!north && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(2)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && !west) { + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!south && !east) { + ((FabricBakedModel) getTemplateBakedModels().get(4)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + context.popTransform(); + } + } + + @Override + public void emitItemQuads(ItemStack stack, Supplier randomSupplier, RenderContext context) { + pushTextureTransform(context, getSpriteList(stack).get(0)); + ((FabricBakedModel) getTemplateBakedModels().get(0)).emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + + pushTextureTransform(context, getSpriteList(stack).get(1)); + // legs + ((FabricBakedModel) getTemplateBakedModels().get(1)).emitItemQuads(stack, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(2)).emitItemQuads(stack, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitItemQuads(stack, randomSupplier, context); + ((FabricBakedModel) getTemplateBakedModels().get(4)).emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + } + + @Override + public Sprite pfm$getParticle(BlockState state) { + return getSpriteList(state).get(0); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java new file mode 100644 index 000000000..712438809 --- /dev/null +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java @@ -0,0 +1,20 @@ +package com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.fabric; + +import com.unlikepaladin.pfm.blocks.models.classicTable.fabric.FabricClassicTableModel; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class UnbakedClassicCoffeeTableModelImpl { + static Map modelMap = new ConcurrentHashMap<>(); + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + if (modelMap.containsKey(settings)) + return modelMap.get(settings); + BakedModel model = new FabricClassicCoffeeTableModel(settings, modelParts); + modelMap.put(settings, model); + return model; + } +} diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/FabricModernCoffeeTableModel.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/FabricModernCoffeeTableModel.java new file mode 100644 index 000000000..3421946e0 --- /dev/null +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/FabricModernCoffeeTableModel.java @@ -0,0 +1,78 @@ +package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.fabric; + +import com.unlikepaladin.pfm.blocks.ModernCoffeeTableBlock; +import com.unlikepaladin.pfm.blocks.models.fabric.PFMFabricBakedModel; +import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; +import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.minecraft.block.BlockState; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.texture.Sprite; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockRenderView; + +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +public class FabricModernCoffeeTableModel extends PFMFabricBakedModel { + public FabricModernCoffeeTableModel(ModelBakeSettings settings, List modelList) { + super(settings, modelList); + } + @Override + public boolean isVanillaAdapter() { + return false; + } + + @Override + public void emitBlockQuads(BlockRenderView world, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + if (state.getBlock() instanceof ModernCoffeeTableBlock) { + ModernCoffeeTableBlock block = (ModernCoffeeTableBlock) state.getBlock(); + Direction.Axis dir = state.get(ModernCoffeeTableBlock.AXIS); + boolean left = block.isTable(world, pos, dir, -1); + boolean right = block.isTable(world, pos, dir, 1); + List spriteList = getSpriteList(state); + pushTextureTransform(context, spriteList.get(0)); + ((FabricBakedModel) getTemplateBakedModels().get((0))).emitBlockQuads(world, state, pos, randomSupplier, context); + context.popTransform(); + + pushTextureTransform(context, spriteList.get(1)); + if (left && right) { + ((FabricBakedModel)getTemplateBakedModels().get(4)).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!left && right) { + ((FabricBakedModel) getTemplateBakedModels().get((1))).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!right && left) { + ((FabricBakedModel) getTemplateBakedModels().get((2))).emitBlockQuads(world, state, pos, randomSupplier, context); + } + if (!right && !left) { + ((FabricBakedModel) getTemplateBakedModels().get((3))).emitBlockQuads(world, state, pos, randomSupplier, context); + } + context.popTransform(); + } + } + + @Override + public void emitItemQuads(ItemStack stack, Supplier randomSupplier, RenderContext context) { + if (stack.getItem() instanceof BlockItem) { + pushTextureTransform(context, getSpriteList(stack).get(0)); + // base + ((FabricBakedModel) getTemplateBakedModels().get(0)).emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + + pushTextureTransform(context, getSpriteList(stack).get(1)); + // legs + ((FabricBakedModel) getTemplateBakedModels().get(3)).emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + } + } + + @Override + public Sprite pfm$getParticle(BlockState state) { + return getSpriteList(state).get(0); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java new file mode 100644 index 000000000..24e4d7472 --- /dev/null +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java @@ -0,0 +1,20 @@ +package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.fabric; + +import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.fabric.FabricModernDinnerTableModel; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class UnbakedModernCoffeeTableModelImpl { + static Map modelMap = new ConcurrentHashMap<>(); + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + if (modelMap.containsKey(settings)) + return modelMap.get(settings); + BakedModel model = new FabricModernCoffeeTableModel(settings, modelParts); + modelMap.put(settings, model); + return model; + } +} diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMExtraModelProvider.java b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMExtraModelProvider.java index 78aa6cb08..a9997c7d0 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMExtraModelProvider.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMExtraModelProvider.java @@ -1,5 +1,6 @@ package com.unlikepaladin.pfm.client.fabric; +import com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.UnbakedCoffeeBasicTableModel; import com.unlikepaladin.pfm.blocks.models.basicLamp.UnbakedBasicLampModel; import com.unlikepaladin.pfm.blocks.models.basicTable.UnbakedBasicTableModel; import com.unlikepaladin.pfm.blocks.models.bed.UnbakedBedModel; @@ -7,6 +8,8 @@ import com.unlikepaladin.pfm.blocks.models.chairClassic.UnbakedChairClassicModel; import com.unlikepaladin.pfm.blocks.models.chairDinner.UnbakedChairDinnerModel; import com.unlikepaladin.pfm.blocks.models.chairModern.UnbakedChairModernModel; +import com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.UnbakedClassicCoffeeTableModel; +import com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.fabric.UnbakedClassicCoffeeTableModelImpl; import com.unlikepaladin.pfm.blocks.models.classicNightstand.UnbakedClassicNightstandModel; import com.unlikepaladin.pfm.blocks.models.classicStool.UnbakedClassicStoolModel; import com.unlikepaladin.pfm.blocks.models.classicTable.UnbakedClassicTableModel; @@ -26,6 +29,7 @@ import com.unlikepaladin.pfm.blocks.models.logStool.UnbakedLogStoolModel; import com.unlikepaladin.pfm.blocks.models.logTable.UnbakedLogTableModel; import com.unlikepaladin.pfm.blocks.models.mirror.UnbakedMirrorModel; +import com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.UnbakedModernCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.UnbakedModernDinnerTableModel; import com.unlikepaladin.pfm.blocks.models.modernStool.UnbakedModernStoolModel; import com.unlikepaladin.pfm.blocks.models.simpleStool.UnbakedSimpleStoolModel; @@ -110,6 +114,15 @@ public void provideExtraModels(ResourceManager manager, Consumer out for (Identifier id : UnbakedLadderModel.LADDER_PARTS_BASE) { out.accept(id); } + for (Identifier id : UnbakedCoffeeBasicTableModel.BASIC_MODEL_PARTS_BASE) { + out.accept(id); + } + for (Identifier id : UnbakedModernCoffeeTableModel.MODERN_COFFEE_MODEL_PARTS_BASE) { + out.accept(id); + } + for (Identifier id : UnbakedClassicCoffeeTableModel.CLASSIC_MODEL_PARTS_BASE) { + out.accept(id); + } UnbakedMirrorModel.ALL_MODEL_IDS.forEach(out::accept); UnbakedIronFridgeModel.ALL_MODEL_IDS.forEach(out::accept); UnbakedFridgeModel.ALL_MODEL_IDS.forEach(out::accept); diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMModelProvider.java b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMModelProvider.java index f77bfbb5d..3424218d2 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMModelProvider.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PFMModelProvider.java @@ -1,6 +1,7 @@ package com.unlikepaladin.pfm.client.fabric; import com.unlikepaladin.pfm.blocks.models.ModelHelper; +import com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.UnbakedCoffeeBasicTableModel; import com.unlikepaladin.pfm.blocks.models.basicLamp.UnbakedBasicLampModel; import com.unlikepaladin.pfm.blocks.models.basicTable.UnbakedBasicTableModel; import com.unlikepaladin.pfm.blocks.models.bed.UnbakedBedModel; @@ -8,6 +9,7 @@ import com.unlikepaladin.pfm.blocks.models.chairClassic.UnbakedChairClassicModel; import com.unlikepaladin.pfm.blocks.models.chairDinner.UnbakedChairDinnerModel; import com.unlikepaladin.pfm.blocks.models.chairModern.UnbakedChairModernModel; +import com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.UnbakedClassicCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.classicNightstand.UnbakedClassicNightstandModel; import com.unlikepaladin.pfm.blocks.models.classicStool.UnbakedClassicStoolModel; import com.unlikepaladin.pfm.blocks.models.classicTable.UnbakedClassicTableModel; @@ -27,6 +29,7 @@ import com.unlikepaladin.pfm.blocks.models.logStool.UnbakedLogStoolModel; import com.unlikepaladin.pfm.blocks.models.logTable.UnbakedLogTableModel; import com.unlikepaladin.pfm.blocks.models.mirror.UnbakedMirrorModel; +import com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.UnbakedModernCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.UnbakedModernDinnerTableModel; import com.unlikepaladin.pfm.blocks.models.modernStool.UnbakedModernStoolModel; import com.unlikepaladin.pfm.blocks.models.simpleStool.UnbakedSimpleStoolModel; @@ -127,6 +130,15 @@ else if (UnbakedBasicLampModel.LAMP_MODEL_IDS.contains(resourceId)){ else if (UnbakedLadderModel.LADDER_MODEL_IDS.contains(resourceId)){ return new UnbakedLadderModel(); } + else if (UnbakedCoffeeBasicTableModel.MODEL_IDS.contains(resourceId)){ + return new UnbakedCoffeeBasicTableModel(); + } + else if (UnbakedModernCoffeeTableModel.TABLE_MODEL_IDS.contains(resourceId)){ + return new UnbakedModernCoffeeTableModel(); + } + else if (UnbakedClassicCoffeeTableModel.MODEL_IDS.contains(resourceId)){ + return new UnbakedClassicCoffeeTableModel(); + } else return null; } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java new file mode 100644 index 000000000..d95dd4010 --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java @@ -0,0 +1,229 @@ +package com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.forge; + +import com.unlikepaladin.pfm.blocks.BasicCoffeeTableBlock; +import com.unlikepaladin.pfm.blocks.models.forge.ModelBitSetProperty; +import com.unlikepaladin.pfm.blocks.models.forge.PFMForgeBakedModel; +import net.minecraft.block.BlockState; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.texture.Sprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockRenderView; +import net.minecraftforge.client.model.data.IModelData; +import net.minecraftforge.client.model.data.ModelDataMap; +import net.minecraftforge.client.model.data.ModelProperty; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.*; + +public class ForgeCoffeeBasicTableModel extends PFMForgeBakedModel { + public ForgeCoffeeBasicTableModel(ModelBakeSettings settings, List modelParts) { + super(settings, modelParts); + } + + public static ModelProperty CONNECTIONS = new ModelProperty<>(); + @Override + public void appendProperties(ModelDataMap.Builder builder) { + super.appendProperties(builder); + builder.withProperty(CONNECTIONS); + } + + @NotNull + @Override + public IModelData getModelData(@NotNull BlockRenderView world, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull IModelData tileData) { + if (state.getBlock() instanceof BasicCoffeeTableBlock) { + ModelDataMap.Builder builder = new ModelDataMap.Builder(); + appendProperties(builder); + + IModelData data = builder.build(); + super.getModelData(world, pos, state, data); + + BasicCoffeeTableBlock block = (BasicCoffeeTableBlock) state.getBlock(); + boolean north = block.canConnect(world, state, pos.north(), pos); + boolean east = block.canConnect(world, state, pos.east(), pos); + boolean west = block.canConnect(world, state, pos.west(), pos); + boolean south = block.canConnect(world, state, pos.south(), pos); + boolean cornerNorthWest = north && west && !block.canConnect(world, state, pos.north().west(), pos); + boolean cornerNorthEast = north && east && !block.canConnect(world, state, pos.north().east(), pos); + boolean cornerSouthEast = south && east && !block.canConnect(world, state, pos.south().east(), pos); + boolean cornerSouthWest = south && west && !block.canConnect(world, state, pos.south().west(), pos); + BitSet set = new BitSet(); + set.set(0, north); + set.set(1, east); + set.set(2, west); + set.set(3, south); + set.set(4, cornerNorthWest); + set.set(5, cornerNorthEast); + set.set(6, cornerSouthEast); + set.set(7, cornerSouthWest); + data.setData(CONNECTIONS, new ModelBitSetProperty(set)); + return data; + } + return tileData; + } + + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull Random rand, @NotNull IModelData extraData) { + if (state != null && state.getBlock() instanceof BasicCoffeeTableBlock && extraData.getData(CONNECTIONS) != null && extraData.getData(CONNECTIONS).connections != null) { + List baseQuads = new ArrayList<>(); + List secondaryQuads = new ArrayList<>(); + + BitSet set = extraData.getData(CONNECTIONS).connections; + boolean north = set.get(0); + boolean east = set.get(1); + boolean west = set.get(2); + boolean south = set.get(3); + boolean cornerNorthWest = set.get(4); + boolean cornerNorthEast = set.get(5); + boolean cornerSouthEast = set.get(6); + boolean cornerSouthWest = set.get(7); + Direction.Axis dir = state.get(BasicCoffeeTableBlock.AXIS); + baseQuads.addAll(getTemplateBakedModels().get(0).getQuads(state, side, rand, extraData)); + if (!north && !south && !east && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(8).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(7).getQuads(state, side, rand, extraData)); + } + if (dir == Direction.Axis.Z) { + if (!north && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, side, rand, extraData)); + } + if (!north && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, side, rand, extraData)); + } + if (!south && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); + } + if (!south && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData)); + } + if (!north && south && !east && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(7).getQuads(state, side, rand, extraData)); + } + if (north && !south && !east && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(8).getQuads(state, side, rand, extraData)); + } + if (!north && east && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(5).getQuads(state, side, rand, extraData)); + } + if (!south && !east && west) { + secondaryQuads.addAll(getTemplateBakedModels().get(10).getQuads(state, side, rand, extraData)); + } + if (!south && east && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(9).getQuads(state, side, rand, extraData)); + } + if (!north && !east && west) { + secondaryQuads.addAll(getTemplateBakedModels().get(6).getQuads(state, side, rand, extraData)); + } + if (!north && east && west) { + secondaryQuads.addAll(getTemplateBakedModels().get(12).getQuads(state, side, rand, extraData)); + } + if (!south && east && west) { + secondaryQuads.addAll(getTemplateBakedModels().get(11).getQuads(state, side, rand, extraData)); + } + if (cornerNorthEast) { + secondaryQuads.addAll(getTemplateBakedModels().get(13).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, side, rand, extraData)); + } + if (cornerNorthWest) { + secondaryQuads.addAll(getTemplateBakedModels().get(14).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, side, rand, extraData)); + } + if (cornerSouthWest) { + secondaryQuads.addAll(getTemplateBakedModels().get(16).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData)); + } + if (cornerSouthEast) { + secondaryQuads.addAll(getTemplateBakedModels().get(15).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); + } + } else { + if (!north && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, side, rand, extraData)); + } + if (!north && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData)); + } + if (!south && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, side, rand, extraData)); + } + if (!south && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); + } + if (!north && south && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(9).getQuads(state, side, rand, extraData)); + } + if (north && !south && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(10).getQuads(state, side, rand, extraData)); + } + if (!north && south && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(5).getQuads(state, side, rand, extraData)); + } + if (north && !south && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(6).getQuads(state, side, rand, extraData)); + } + + if (!north && !south && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(7).getQuads(state, side, rand, extraData)); + } + if (!north && !south && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(8).getQuads(state, side, rand, extraData)); + } + + if (north && south && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(12).getQuads(state, side, rand, extraData)); + } + if (north && south && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(11).getQuads(state, side, rand, extraData)); + } + + if (cornerNorthEast) { + secondaryQuads.addAll(getTemplateBakedModels().get(14).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, side, rand, extraData)); + } + if (cornerSouthEast) { + secondaryQuads.addAll(getTemplateBakedModels().get(13).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, side, rand, extraData)); + } + if (cornerNorthWest) { + secondaryQuads.addAll(getTemplateBakedModels().get(16).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData)); + } + if (cornerSouthWest) { + secondaryQuads.addAll(getTemplateBakedModels().get(15).getQuads(state, side, rand, extraData)); + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); + } + } + List spriteList = getSpriteList(state); + List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); + quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + return quads; + } + return Collections.emptyList(); + } + + + @Override + public List getQuads(ItemStack stack, @Nullable BlockState state, @Nullable Direction face, Random random) { + // base + List baseQuads = new ArrayList<>(getTemplateBakedModels().get(0).getQuads(state, face, random)); + + List secondaryQuads = new ArrayList<>(); + // legs + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, face, random)); + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, face, random)); + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, face, random)); + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, face, random)); + // in between pieces + secondaryQuads.addAll(getTemplateBakedModels().get(8).getQuads(state, face, random)); + secondaryQuads.addAll(getTemplateBakedModels().get(7).getQuads(state, face, random)); + + List spriteList = getSpriteList(stack); + List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); + quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + return quads; + } +} \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java new file mode 100644 index 000000000..55dd8aac0 --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java @@ -0,0 +1,19 @@ +package com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.forge; + +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class UnbakedCoffeeBasicTableModelImpl { + static Map modelMap = new ConcurrentHashMap<>(); + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + if (modelMap.containsKey(settings)) + return modelMap.get(settings); + BakedModel model = new ForgeCoffeeBasicTableModel(settings, modelParts); + modelMap.put(settings, model); + return model; + } +} diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java new file mode 100644 index 000000000..b2fbd82ca --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java @@ -0,0 +1,111 @@ +package com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.forge; + +import com.unlikepaladin.pfm.blocks.ClassicCoffeeTableBlock; +import com.unlikepaladin.pfm.blocks.models.forge.ModelBitSetProperty; +import com.unlikepaladin.pfm.blocks.models.forge.PFMForgeBakedModel; +import net.minecraft.block.BlockState; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.texture.Sprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockRenderView; +import net.minecraftforge.client.model.data.IModelData; +import net.minecraftforge.client.model.data.ModelDataMap; +import net.minecraftforge.client.model.data.ModelProperty; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.*; + +public class ForgeClassicCoffeeTableModel extends PFMForgeBakedModel { + public ForgeClassicCoffeeTableModel(ModelBakeSettings settings, List parts) { + super(settings, parts); + } + + public static ModelProperty CONNECTIONS = new ModelProperty<>(); + @Override + public void appendProperties(ModelDataMap.Builder builder) { + super.appendProperties(builder); + builder.withProperty(CONNECTIONS); + } + + @NotNull + @Override + public IModelData getModelData(@NotNull BlockRenderView world, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull IModelData tileData) { + if (state.getBlock() instanceof ClassicCoffeeTableBlock) { + ModelDataMap.Builder builder = new ModelDataMap.Builder(); + appendProperties(builder); + + IModelData data = builder.build(); + super.getModelData(world, pos, state, data); + + ClassicCoffeeTableBlock block = (ClassicCoffeeTableBlock) state.getBlock(); + boolean north = block.canConnect(world.getBlockState(pos.north())); + boolean east = block.canConnect(world.getBlockState(pos.east())); + boolean west = block.canConnect(world.getBlockState(pos.west())); + boolean south = block.canConnect(world.getBlockState(pos.south())); + BitSet set = new BitSet(); + set.set(0, north); + set.set(1, east); + set.set(2, west); + set.set(3, south); + data.setData(CONNECTIONS, new ModelBitSetProperty(set)); + return data; + } + return tileData; + } + + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull Random rand, @NotNull IModelData extraData) { + if (state != null && state.getBlock() instanceof ClassicCoffeeTableBlock && extraData.getData(CONNECTIONS) != null && extraData.getData(CONNECTIONS).connections != null) { + BitSet set = extraData.getData(CONNECTIONS).connections; + List baseQuads = new ArrayList<>(); + List secondaryQuads = new ArrayList<>(); + + boolean north = set.get(0); + boolean east = set.get(1); + boolean west = set.get(2); + boolean south = set.get(3); + baseQuads.addAll(getTemplateBakedModels().get(0).getQuads(state, side, rand, extraData)); + if (!north && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, side, rand, extraData)); + } + if (!north && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, side, rand, extraData)); + } + if (!south && !west) { + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); + } + if (!south && !east) { + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData)); + } + + List spriteList = getSpriteList(state); + List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); + quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + return quads; + } + return Collections.emptyList(); + } + + @Override + public List getQuads(ItemStack stack, @Nullable BlockState state, @Nullable Direction face, Random random) { + // base + List baseQuads = new ArrayList<>(getTemplateBakedModels().get(0).getQuads(state, face, random)); + + List secondaryQuads = new ArrayList<>(); + // legs + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, face, random)); + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, face, random)); + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, face, random)); + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, face, random)); + + List spriteList = getSpriteList(stack); + List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); + quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + return quads; + } +} \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java new file mode 100644 index 000000000..309cf0373 --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java @@ -0,0 +1,20 @@ +package com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.forge; + +import com.unlikepaladin.pfm.blocks.models.classicTable.forge.ForgeClassicTableModel; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class UnbakedClassicCoffeeTableModelImpl { + static Map modelMap = new ConcurrentHashMap<>(); + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + if (modelMap.containsKey(settings)) + return modelMap.get(settings); + BakedModel model = new ForgeClassicCoffeeTableModel(settings, modelParts); + modelMap.put(settings, model); + return model; + } +} diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java index 196b58cb6..e53c9a872 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java @@ -39,6 +39,8 @@ public PFMForgeBakedModel(ModelBakeSettings settings, List templateB } public static ModelProperty STATE = new ModelProperty<>(); + public static boolean forceReload; + @NotNull @Override public IModelData getModelData(@NotNull BlockRenderView world, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull IModelData tileData) { @@ -114,6 +116,7 @@ else if (quadToTransformedQuad.containsKey(quadKey) && !PaladinFurnitureMod.isOp transformedQuads.add(quadToTransformedQuad.get(quadKey)); } else { + int[] vertexData = new int[quad.getVertexData().length]; System.arraycopy(quad.getVertexData(), 0, vertexData, 0, vertexData.length); float[][] uv = new float[4][2]; diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java new file mode 100644 index 000000000..823778e32 --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java @@ -0,0 +1,100 @@ +package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.forge; + +import com.unlikepaladin.pfm.blocks.ModernCoffeeTableBlock; +import com.unlikepaladin.pfm.blocks.models.forge.ModelBitSetProperty; +import com.unlikepaladin.pfm.blocks.models.forge.PFMForgeBakedModel; +import net.minecraft.block.BlockState; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.texture.Sprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockRenderView; +import net.minecraftforge.client.model.data.IModelData; +import net.minecraftforge.client.model.data.ModelDataMap; +import net.minecraftforge.client.model.data.ModelProperty; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.*; + +public class ForgeModernCoffeeTableModel extends PFMForgeBakedModel { + public ForgeModernCoffeeTableModel(ModelBakeSettings settings, List modelList) { + super(settings, modelList); + } + + public static ModelProperty CONNECTIONS = new ModelProperty<>(); + @Override + public void appendProperties(ModelDataMap.Builder builder) { + super.appendProperties(builder); + builder.withProperty(CONNECTIONS); + } + + @NotNull + @Override + public IModelData getModelData(@NotNull BlockRenderView world, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull IModelData tileData) { + if (state.getBlock() instanceof ModernCoffeeTableBlock) { + ModelDataMap.Builder builder = new ModelDataMap.Builder(); + appendProperties(builder); + + IModelData data = builder.build(); + super.getModelData(world, pos, state, data); + + ModernCoffeeTableBlock block = (ModernCoffeeTableBlock) state.getBlock(); + Direction.Axis dir = state.get(ModernCoffeeTableBlock.AXIS); + boolean left = block.isTable(world, pos, dir, -1); + boolean right = block.isTable(world, pos, dir, 1); + BitSet set = new BitSet(); + set.set(0, left); + set.set(1, right); + data.setData(CONNECTIONS, new ModelBitSetProperty(set)); + return data; + } + return tileData; + } + + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull Random rand, @NotNull IModelData extraData) { + if (state != null && state.getBlock() instanceof ModernCoffeeTableBlock && extraData.getData(CONNECTIONS) != null && extraData.getData(CONNECTIONS).connections != null) { + List baseQuads = new ArrayList<>(); + List secondaryQuads = new ArrayList<>(); + + BitSet set = extraData.getData(CONNECTIONS).connections; + boolean left = set.get(0); + boolean right = set.get(1); + baseQuads.addAll(getTemplateBakedModels().get(0).getQuads(state, side, rand, extraData)); + if (left && right) { + secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, side, rand, extraData)); + } + if (!left && right) { + secondaryQuads.addAll(getTemplateBakedModels().get(1).getQuads(state, side, rand, extraData)); + } + if (!right && left) { + secondaryQuads.addAll(getTemplateBakedModels().get(2).getQuads(state, side, rand, extraData)); + } + if (!right && !left) { + secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); + } + List spriteList = getSpriteList(state); + List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); + quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + return quads; + } + return Collections.emptyList(); + } + + @Override + public List getQuads(ItemStack stack, @Nullable BlockState state, @Nullable Direction face, Random random) { + // base + List baseQuads = new ArrayList<>(getTemplateBakedModels().get(0).getQuads(state, face, random)); + // legs + List secondaryQuads = new ArrayList<>(getTemplateBakedModels().get(3).getQuads(state, face, random)); + + List spriteList = getSpriteList(stack); + List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); + quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + return quads; + } +} \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java new file mode 100644 index 000000000..b14b7858e --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java @@ -0,0 +1,20 @@ +package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.forge; + +import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.forge.ForgeModernDinnerTableModel; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class UnbakedModernCoffeeTableModelImpl { + static Map modelMap = new ConcurrentHashMap<>(); + public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + if (modelMap.containsKey(settings)) + return modelMap.get(settings); + BakedModel model = new ForgeModernCoffeeTableModel(settings, modelParts); + modelMap.put(settings, model); + return model; + } +} diff --git a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/PaladinFurnitureModClientForge.java b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/PaladinFurnitureModClientForge.java index a42393704..0190495bd 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/PaladinFurnitureModClientForge.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/PaladinFurnitureModClientForge.java @@ -1,5 +1,6 @@ package com.unlikepaladin.pfm.client.forge; +import com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.UnbakedCoffeeBasicTableModel; import com.unlikepaladin.pfm.blocks.models.basicLamp.UnbakedBasicLampModel; import com.unlikepaladin.pfm.blocks.models.basicTable.UnbakedBasicTableModel; import com.unlikepaladin.pfm.blocks.models.bed.UnbakedBedModel; @@ -7,6 +8,7 @@ import com.unlikepaladin.pfm.blocks.models.chairClassic.UnbakedChairClassicModel; import com.unlikepaladin.pfm.blocks.models.chairDinner.UnbakedChairDinnerModel; import com.unlikepaladin.pfm.blocks.models.chairModern.UnbakedChairModernModel; +import com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.UnbakedClassicCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.classicNightstand.UnbakedClassicNightstandModel; import com.unlikepaladin.pfm.blocks.models.classicStool.UnbakedClassicStoolModel; import com.unlikepaladin.pfm.blocks.models.classicTable.UnbakedClassicTableModel; @@ -26,6 +28,7 @@ import com.unlikepaladin.pfm.blocks.models.logStool.UnbakedLogStoolModel; import com.unlikepaladin.pfm.blocks.models.logTable.UnbakedLogTableModel; import com.unlikepaladin.pfm.blocks.models.mirror.UnbakedMirrorModel; +import com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.UnbakedModernCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.UnbakedModernDinnerTableModel; import com.unlikepaladin.pfm.blocks.models.modernStool.UnbakedModernStoolModel; import com.unlikepaladin.pfm.blocks.models.simpleStool.UnbakedSimpleStoolModel; @@ -151,6 +154,15 @@ public static void registerExtraModels(ModelRegistryEvent event) { for (Identifier id : UnbakedLadderModel.LADDER_PARTS_BASE) { ModelLoader.addSpecialModel(id); } + for (Identifier id : UnbakedCoffeeBasicTableModel.BASIC_MODEL_PARTS_BASE) { + ModelLoader.addSpecialModel(id); + } + for (Identifier id : UnbakedModernCoffeeTableModel.MODERN_COFFEE_MODEL_PARTS_BASE) { + ModelLoader.addSpecialModel(id); + } + for (Identifier id : UnbakedClassicCoffeeTableModel.CLASSIC_MODEL_PARTS_BASE) { + ModelLoader.addSpecialModel(id); + } UnbakedMirrorModel.ALL_MODEL_IDS.forEach(ModelLoader::addSpecialModel); UnbakedIronFridgeModel.ALL_MODEL_IDS.forEach(ModelLoader::addSpecialModel); UnbakedFridgeModel.ALL_MODEL_IDS.forEach(ModelLoader::addSpecialModel); diff --git a/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMModelLoaderMixin.java b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMModelLoaderMixin.java index a8d744a81..a4a27792c 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMModelLoaderMixin.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMModelLoaderMixin.java @@ -1,6 +1,7 @@ package com.unlikepaladin.pfm.mixin.forge; +import com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.UnbakedCoffeeBasicTableModel; import com.unlikepaladin.pfm.blocks.models.basicLamp.UnbakedBasicLampModel; import com.unlikepaladin.pfm.blocks.models.basicTable.UnbakedBasicTableModel; import com.unlikepaladin.pfm.blocks.models.bed.UnbakedBedModel; @@ -8,6 +9,7 @@ import com.unlikepaladin.pfm.blocks.models.chairClassic.UnbakedChairClassicModel; import com.unlikepaladin.pfm.blocks.models.chairDinner.UnbakedChairDinnerModel; import com.unlikepaladin.pfm.blocks.models.chairModern.UnbakedChairModernModel; +import com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.UnbakedClassicCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.classicNightstand.UnbakedClassicNightstandModel; import com.unlikepaladin.pfm.blocks.models.classicStool.UnbakedClassicStoolModel; import com.unlikepaladin.pfm.blocks.models.classicTable.UnbakedClassicTableModel; @@ -29,6 +31,7 @@ import com.unlikepaladin.pfm.blocks.models.mirror.UnbakedMirrorModel; import com.unlikepaladin.pfm.blocks.models.ModelHelper; +import com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.UnbakedModernCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.UnbakedModernDinnerTableModel; import com.unlikepaladin.pfm.blocks.models.modernStool.UnbakedModernStoolModel; import com.unlikepaladin.pfm.blocks.models.simpleStool.UnbakedSimpleStoolModel; @@ -233,5 +236,23 @@ else if (UnbakedLadderModel.LADDER_MODEL_IDS.contains(modifiedId)){ this.modelsToBake.put(resourceId, model); ci.cancel(); } + else if (UnbakedCoffeeBasicTableModel.MODEL_IDS.contains(modifiedId)){ + UnbakedModel model = new UnbakedCoffeeBasicTableModel(); + this.unbakedModels.put(resourceId, model); + this.modelsToBake.put(resourceId, model); + ci.cancel(); + } + else if (UnbakedModernCoffeeTableModel.TABLE_MODEL_IDS.contains(modifiedId)){ + UnbakedModel model = new UnbakedModernCoffeeTableModel(); + this.unbakedModels.put(resourceId, model); + this.modelsToBake.put(resourceId, model); + ci.cancel(); + } + else if (UnbakedClassicCoffeeTableModel.MODEL_IDS.contains(modifiedId)){ + UnbakedModel model = new UnbakedClassicCoffeeTableModel(); + this.unbakedModels.put(resourceId, model); + this.modelsToBake.put(resourceId, model); + ci.cancel(); + } } } \ No newline at end of file From d5593351f54557c55cbf6f16946dd64500280e6b Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sun, 19 May 2024 20:16:56 -0600 Subject: [PATCH 03/17] Stone Furniture is now also dynamic and registry driven --- .../pfm/PaladinFurnitureMod.java | 3 + .../pfm/blocks/models/AbstractBakedModel.java | 4 - .../pfm/blocks/models/ModelHelper.java | 3 +- .../UnbakedCoffeeBasicTableModel.java | 3 +- .../basicTable/UnbakedBasicTableModel.java | 3 +- .../models/chair/UnbakedChairModel.java | 3 +- .../UnbakedChairClassicModel.java | 4 +- .../chairDinner/UnbakedChairDinnerModel.java | 6 +- .../chairModern/UnbakedChairModernModel.java | 4 +- .../UnbakedClassicCoffeeTableModel.java | 3 +- .../UnbakedClassicNightstandModel.java | 3 +- .../UnbakedClassicStoolModel.java | 4 +- .../UnbakedClassicTableModel.java | 3 +- .../dinnerTable/UnbakedDinnerTableModel.java | 3 +- .../UnbakedKitchenCabinetModel.java | 5 +- .../UnbakedKitchenCounterModel.java | 5 +- .../UnbakedKitchenCounterOvenModel.java | 5 +- .../UnbakedKitchenDrawerModel.java | 5 +- .../kitchenSink/UnbakedKitchenSinkModel.java | 4 +- .../UnbakedKitchenWallCounterModel.java | 4 +- .../UnbakedKitchenWallDrawerModel.java | 5 +- .../UnbakedKitchenWallDrawerSmallModel.java | 9 +- .../models/ladder/UnbakedLadderModel.java | 9 +- .../models/logStool/UnbakedLogStoolModel.java | 6 +- .../models/logTable/UnbakedLogTableModel.java | 3 +- .../UnbakedModernCoffeeTableModel.java | 6 +- .../UnbakedModernDinnerTableModel.java | 3 +- .../modernStool/UnbakedModernStoolModel.java | 7 +- .../simpleStool/UnbakedSimpleStoolModel.java | 6 +- .../data/materials/DynamicBlockRegistry.java | 33 +++- .../pfm/data/materials/StoneVariant.java | 180 +++++++++++------- .../data/materials/StoneVariantRegistry.java | 109 +++++++++++ .../data/materials/VariantRegistryBase.java | 4 +- .../registry/dynamic/LateBlockRegistry.java | 34 ++-- .../assets/PFMBlockstateModelProvider.java | 12 +- .../pfm/runtime/assets/PFMLangProvider.java | 6 +- .../pfm/runtime/data/PFMRecipeProvider.java | 11 +- .../main/resources/assets/pfm/lang/en_us.json | 5 - 38 files changed, 326 insertions(+), 199 deletions(-) create mode 100644 common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariantRegistry.java diff --git a/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureMod.java b/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureMod.java index 44235746f..74058e83f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureMod.java +++ b/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureMod.java @@ -11,6 +11,7 @@ import com.unlikepaladin.pfm.config.PaladinFurnitureModConfig; import com.unlikepaladin.pfm.data.materials.DynamicBlockRegistry; +import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import com.unlikepaladin.pfm.mixin.PFMPointOfInterestTypeAccessor; import com.unlikepaladin.pfm.registry.BlockEntityRegistry; @@ -52,6 +53,8 @@ public void commonInit() { updateChecker = new PaladinFurnitureModUpdateChecker(); updateChecker.checkForUpdates(getPFMConfig()); DynamicBlockRegistry.addBlockSetContainer(WoodVariantRegistry.INSTANCE.getType(), WoodVariantRegistry.INSTANCE); + DynamicBlockRegistry.addBlockSetContainer(StoneVariantRegistry.INSTANCE.getType(), StoneVariantRegistry.INSTANCE); + if (getModList().contains("cookingforblockheads")) pfmModCompatibilities.add(PFMCookingForBlockheads.getInstance()); if (getModList().contains("farmersdelight")) diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java index 9b63069aa..1fc642db9 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java @@ -1,19 +1,15 @@ package com.unlikepaladin.pfm.blocks.models; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.blocks.KitchenCounterBlock; import com.unlikepaladin.pfm.blocks.LogStoolBlock; import com.unlikepaladin.pfm.blocks.SimpleBedBlock; import com.unlikepaladin.pfm.data.materials.BlockType; -import com.unlikepaladin.pfm.data.materials.StoneVariant; import com.unlikepaladin.pfm.data.materials.VariantBase; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems; import com.unlikepaladin.pfm.runtime.data.PFMRecipeProvider; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.entity.BedBlockEntity; import net.minecraft.client.render.TexturedRenderLayers; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedQuad; diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java index 1ab1c9cf3..15df269ab 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java @@ -103,8 +103,7 @@ public static ExtraCounterVariant getExtraCounterType(Identifier identifier) { @Nullable public static StoneVariant getStoneType(Identifier identifier) { - for (StoneVariant variant: - StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { if (identifier.getPath().contains(variant.getPath()) && getBlockType(identifier) == BlockType.BLOCK) { return variant; } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java index 7b988a2dd..c3fa164b4 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java @@ -3,6 +3,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -51,7 +52,7 @@ public class UnbakedCoffeeBasicTableModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_basic")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_basic")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java index ae8f3b3bd..7a2a4bfe7 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import net.minecraft.util.math.AffineTransformation; import org.jetbrains.annotations.Nullable; import java.util.*; @@ -47,7 +46,7 @@ public class UnbakedBasicTableModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_table_basic")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_basic")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java index f772810f9..7f1c3111a 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java @@ -3,6 +3,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -34,7 +35,7 @@ public class UnbakedChairModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java index cb8a2b17f..fe4ea4ca7 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java @@ -3,6 +3,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -34,8 +35,7 @@ public class UnbakedChairClassicModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair_classic")); } - for(StoneVariant variant : StoneVariant.values()){ - + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair_classic")); } add(CHAIR_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java index cca714948..590056a07 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java @@ -2,9 +2,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.StoneVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.data.materials.*; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -34,7 +32,7 @@ public class UnbakedChairDinnerModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair_dinner")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair_dinner")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java index 14ac2f47f..96f9741d2 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java @@ -3,6 +3,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -34,8 +35,7 @@ public class UnbakedChairModernModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair_modern")); } - for(StoneVariant variant : StoneVariant.values()){ - + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair_modern")); } add(CHAIR_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java index 42b3be168..db01b0a0e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java @@ -3,6 +3,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -41,7 +42,7 @@ public class UnbakedClassicCoffeeTableModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_classic")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_classic")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java index 61747c162..62fca7518 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java @@ -9,7 +9,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -39,7 +38,7 @@ public class UnbakedClassicNightstandModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_classic_nightstand")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_classic_nightstand")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java index 97518d9c2..f560a4f5d 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java @@ -2,8 +2,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.ExtraStoolVariant; import com.unlikepaladin.pfm.data.materials.StoneVariant; +import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -34,7 +34,7 @@ public class UnbakedClassicStoolModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_classic_stool")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_classic_stool")); } add(STOOL_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java index 316cc30a5..a0146058f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java @@ -11,7 +11,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -40,7 +39,7 @@ public class UnbakedClassicTableModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_table_classic")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_classic")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java index d3bb35e3e..59c2b0e68 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -37,7 +36,7 @@ public class UnbakedDinnerTableModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_table_dinner")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_dinner")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java index 6f082be16..ba93a568e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -43,8 +42,8 @@ public class UnbakedKitchenCabinetModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_cabinet")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_cabinet")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java index 7f4942a0d..fece8f9ed 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -41,8 +40,8 @@ public class UnbakedKitchenCounterModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_counter")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_counter")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java index 9f7d06f3d..3488d009f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java @@ -11,7 +11,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -40,8 +39,8 @@ public class UnbakedKitchenCounterOvenModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_counter_oven")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_counter_oven")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java index f73fdbf48..806573921 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -47,8 +46,8 @@ public class UnbakedKitchenDrawerModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_drawer")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_drawer")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java index 59adc8ff7..decf7e75e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java @@ -36,8 +36,8 @@ public class UnbakedKitchenSinkModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_sink")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_sink")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java index b5e7d1b06..59393d996 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java @@ -37,8 +37,8 @@ public class UnbakedKitchenWallCounterModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_wall_counter")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_wall_counter")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java index 0c94bf51f..769ac611e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -44,8 +43,8 @@ public class UnbakedKitchenWallDrawerModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_wall_drawer")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_wall_drawer")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java index 2fc3ea970..1fad2ebae 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java @@ -1,10 +1,7 @@ package com.unlikepaladin.pfm.blocks.models.kitchenWallDrawerSmall; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.ExtraCounterVariant; -import com.unlikepaladin.pfm.data.materials.StoneVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.data.materials.*; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -37,8 +34,8 @@ public class UnbakedKitchenWallDrawerSmallModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_wall_small_drawer")); } - for(StoneVariant variant : StoneVariant.values()){ - if (variant.equals(StoneVariant.QUARTZ)) + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ + if (variant.identifier.getPath().equals("quartz")) continue; add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_wall_small_drawer")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java index 845c974a1..ee0db5de7 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java @@ -2,9 +2,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.StoneVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.data.materials.*; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -29,15 +27,10 @@ public class UnbakedLadderModel implements UnbakedModel { public static final List LADDER_MODEL_IDS = new ArrayList<>() { { for(WoodVariant variant : WoodVariantRegistry.getVariants()){ - add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_simple_bunk_ladder")); if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_simple_bunk_ladder")); } - for(StoneVariant variant : StoneVariant.values()){ - - add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_simple_bunk_ladder")); - } add(LADDER_MODEL_ID); } }; diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java index 389650014..dfa0d97b4 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java @@ -2,9 +2,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.StoneVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.data.materials.*; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -34,7 +32,7 @@ public class UnbakedLogStoolModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_" + logType + "_stool")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_log_stool")); } add(STOOL_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java index 5fb44fda1..58c1f3c53 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -41,7 +40,7 @@ public class UnbakedLogTableModel implements UnbakedModel { add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_raw_table_" + logType)); } } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_natural")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java index 767b749b6..f0cd655a4 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java @@ -1,9 +1,7 @@ package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.StoneVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.data.materials.*; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -40,7 +38,7 @@ public class UnbakedModernCoffeeTableModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_modern")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_modern")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java index 823f30513..fc94fbfde 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -39,7 +38,7 @@ public class UnbakedModernDinnerTableModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_table_modern_dinner")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_modern_dinner")); } add(TABLE_MODEL_ID); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java index d8ee10e04..840a79a52 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java @@ -2,10 +2,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.ExtraStoolVariant; -import com.unlikepaladin.pfm.data.materials.StoneVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.data.materials.*; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -34,7 +31,7 @@ public class UnbakedModernStoolModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_modern_stool")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_modern_stool")); } for(ExtraStoolVariant variant : ExtraStoolVariant.values()){ diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java index da390cf5d..035933902 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java @@ -2,9 +2,7 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.data.materials.StoneVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.data.materials.*; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -34,7 +32,7 @@ public class UnbakedSimpleStoolModel implements UnbakedModel { if (variant.hasStripped()) add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_simple_stool")); } - for(StoneVariant variant : StoneVariant.values()){ + for(StoneVariant variant : StoneVariantRegistry.getVariants()){ add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_simple_stool")); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/DynamicBlockRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/DynamicBlockRegistry.java index c51b7bc7c..b00ba78f6 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/data/materials/DynamicBlockRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/data/materials/DynamicBlockRegistry.java @@ -1,12 +1,5 @@ package com.unlikepaladin.pfm.data.materials; -import com.unlikepaladin.pfm.PaladinFurnitureMod; -import com.unlikepaladin.pfm.blocks.BasicChairBlock; -import com.unlikepaladin.pfm.blocks.DinnerChairBlock; -import com.unlikepaladin.pfm.registry.dynamic.FurnitureEntry; -import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems; -import com.unlikepaladin.pfm.registry.dynamic.LateBlockRegistry; -import net.minecraft.block.AbstractBlock; import net.minecraft.util.Identifier; import java.util.Map; @@ -148,6 +141,32 @@ public static void compatInit() { clutteredFloweringYellow.addChild("button", "luphie_flowering_yellow_button"); addBlockTypeFinder(WoodVariant.class, clutteredFloweringYellow); + + // Stones + StoneVariant.Finder calcite = StoneVariant.Finder.simple( + "minecraft", "calcite", "calcite", "stripped_warped_stem"); + + addBlockTypeFinder(StoneVariant.class, calcite); + + StoneVariant.Finder lightWood = StoneVariant.Finder.simple( + "minecraft", "light_wood", "quartz_block", "stripped_oak_log"); + + addBlockTypeFinder(StoneVariant.class, lightWood); + + StoneVariant.Finder darkWood = StoneVariant.Finder.simple( + "minecraft", "dark_wood", "quartz_block", "stripped_dark_oak_log"); + + addBlockTypeFinder(StoneVariant.class, darkWood); + + StoneVariant.Finder quartz = StoneVariant.Finder.simple( + "minecraft", "quartz", "quartz_block", "quartz_block"); + + addBlockTypeFinder(StoneVariant.class, quartz); + + StoneVariant.Finder netherite = StoneVariant.Finder.simple( + "minecraft", "netherite", "netherite_block", "ancient_debris"); + + addBlockTypeFinder(StoneVariant.class, netherite); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariant.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariant.java index 118426917..acfc85348 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariant.java +++ b/common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariant.java @@ -1,91 +1,75 @@ package com.unlikepaladin.pfm.data.materials; +import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.blocks.models.ModelHelper; +import com.unlikepaladin.pfm.registry.BlockItemRegistry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.Material; -import net.minecraft.client.render.block.BlockModels; import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; -import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.function.Supplier; public class StoneVariant extends VariantBase { - public static StoneVariant QUARTZ = new StoneVariant(Blocks.QUARTZ_BLOCK, Blocks.QUARTZ_BLOCK, "quartz"); - public static StoneVariant NETHERITE = new StoneVariant(Blocks.NETHERITE_BLOCK, Blocks.ANCIENT_DEBRIS,"netherite"); - public static StoneVariant LIGHT_WOOD = new StoneVariant(Blocks.QUARTZ_BLOCK, Blocks.STRIPPED_OAK_LOG, "light_wood"); - public static StoneVariant DARK_WOOD = new StoneVariant(Blocks.QUARTZ_BLOCK, Blocks.STRIPPED_DARK_OAK_LOG,"dark_wood"); - public static StoneVariant GRANITE = new StoneVariant(Blocks.POLISHED_GRANITE, Blocks.GRANITE,"granite"); - public static StoneVariant CALCITE = new StoneVariant(Blocks.CALCITE, Blocks.STRIPPED_WARPED_STEM,"calcite"); - public static StoneVariant ANDESITE = new StoneVariant(Blocks.POLISHED_ANDESITE, Blocks.ANDESITE, "andesite"); - public static StoneVariant DIORITE = new StoneVariant(Blocks.POLISHED_DIORITE, Blocks.DIORITE,"diorite"); - public static StoneVariant DEEPSLATE = new StoneVariant(Blocks.POLISHED_DEEPSLATE, Blocks.DEEPSLATE,"deepslate"); - public static StoneVariant BLACKSTONE = new StoneVariant(Blocks.POLISHED_BLACKSTONE, Blocks.BLACKSTONE,"blackstone"); - public static StoneVariant STONE = new StoneVariant(Blocks.STONE, Blocks.COBBLESTONE, "stone"); - - static final List DEFAULT_VARIANTS = new ArrayList<>(); - - static { - DEFAULT_VARIANTS.add(QUARTZ); - DEFAULT_VARIANTS.add(NETHERITE); - DEFAULT_VARIANTS.add(LIGHT_WOOD); - DEFAULT_VARIANTS.add(DARK_WOOD); - DEFAULT_VARIANTS.add(GRANITE); - DEFAULT_VARIANTS.add(CALCITE); - DEFAULT_VARIANTS.add(ANDESITE); - DEFAULT_VARIANTS.add(DIORITE); - DEFAULT_VARIANTS.add(DEEPSLATE); - DEFAULT_VARIANTS.add(BLACKSTONE); - DEFAULT_VARIANTS.add(STONE); - } - - public static List values() { - return DEFAULT_VARIANTS; - } - private final String name; - private final Block baseBlock; - private final Block secondaryBlock; - StoneVariant(Identifier identifier, Block baseBlock, Block secondaryBlock) { + private final Block polishedBlock; + private final Block rawBlock; + private final Material vanillaMaterial; + + StoneVariant(Identifier identifier, Block polishedBlock, Block rawBlock) { super(identifier); - this.name = identifier.getPath(); - this.baseBlock = baseBlock; - this.secondaryBlock = secondaryBlock; + this.polishedBlock = polishedBlock; + this.rawBlock = rawBlock; + this.vanillaMaterial = polishedBlock.getDefaultState().getMaterial(); } - StoneVariant(Block baseBlock, Block secondaryBlock, String name) { - this(new Identifier("", name), baseBlock, secondaryBlock); - } @Override public String asString() { - return name; + String postfix = this.isVanilla() ? "" : "_"+this.getNamespace(); + return this.identifier.getPath()+postfix; } + @Environment(EnvType.CLIENT) @Override - public Block getBaseBlock() { - return baseBlock; + public Identifier getTexture(BlockType type) { + if (type == BlockType.SECONDARY) + return ModelHelper.getTextureId(rawBlock); + return ModelHelper.getTextureId(polishedBlock); } @Override - public Block getSecondaryBlock() { - return secondaryBlock; + public String getPath() { + return this.identifier.getPath(); } @Override - public boolean isNetherWood() { - return false; + public Block getBaseBlock() { + return this.polishedBlock; } @Override - public Material getVanillaMaterial() { - return baseBlock.getDefaultState().getMaterial(); + public Block getSecondaryBlock() { + return rawBlock; } - @Override - public StoneVariant getVariantType() { - return this; + public Block getRawBlock() { + return rawBlock; + } + + public String toString() { + return this.identifier.toString(); + } + + public boolean isNetherWood() { + return this.identifier.getPath().contains("warped") || this.identifier.getPath().contains("crimson"); + } + + public Material getVanillaMaterial() { + return vanillaMaterial; } @Override @@ -94,30 +78,80 @@ public boolean isVanilla() { } @Override - public void initializeChildrenBlocks() { - + public StoneVariant getVariantType() { + return StoneVariant.this; } @Override - public void initializeChildrenItems() { - + public void initializeChildrenBlocks() { + this.addChild("slab", this.findRelatedEntry("slab", Registry.BLOCK)); + this.addChild("stairs", this.findRelatedEntry("stairs", Registry.BLOCK)); + this.addChild("wall", this.findRelatedEntry("fence", Registry.BLOCK)); } @Override - public Block mainChild() { - return STONE.baseBlock; + public void initializeChildrenItems() { } - @Environment(EnvType.CLIENT) - @Override - public Identifier getTexture(BlockType type) { - if (type == BlockType.SECONDARY) - return ModelHelper.getTextureId(secondaryBlock); - return ModelHelper.getTextureId(baseBlock); + public boolean hasStripped() { + Object child = this.getChild("stripped_log"); + return child != null && child != this.getBaseBlock(); } - @Override - public String getPath() { - return this.identifier.getPath(); + public Block mainChild() { + return this.polishedBlock; + } + + public static class Finder implements SetFinder { + + private final Map childNames = new HashMap<>(); + private final Supplier polishedFinder; + private final Supplier rawFinder; + private final Identifier id; + + public Finder(Identifier id, Supplier polished, Supplier raw) { + this.id = id; + this.polishedFinder = polished; + this.rawFinder = raw; + } + + public static Finder simple(String modId, String stoneTypeName, String polishedName, String rawName) { + return simple(new Identifier(modId, stoneTypeName), new Identifier(modId, polishedName), new Identifier(modId, rawName)); + } + + public static Finder simple(Identifier stoneTypeName, Identifier polishedName, Identifier rawName) { + return new Finder(stoneTypeName, + () -> Registry.BLOCK.get(polishedName), + () -> Registry.BLOCK.get(rawName)); + } + + public void addChild(String childType, String childName) { + addChild(childType, new Identifier(id.getNamespace(), childName)); + } + + public void addChild(String childType, Identifier childName) { + this.childNames.put(childType, childName); + } + + public Optional get() { + if (BlockItemRegistry.isModLoaded(id.getNamespace())) { + try { + Block plank = polishedFinder.get(); + Block log = rawFinder.get(); + Block d = Registry.BLOCK.get(new Identifier("minecraft","air")); + if (plank != d && log != d && plank != null && log != null) { + StoneVariant w = new StoneVariant(id, plank, log); + for (Map.Entry entry : childNames.entrySet()){ + Object child = Registry.BLOCK.getOrEmpty(entry.getValue()).isPresent() ? Registry.BLOCK.get(entry.getValue()) : Registry.ITEM.get(entry.getValue()); + w.addChild(entry.getKey(), child); + } + return Optional.of(w); + } + } catch (Exception ignored) { + } + PaladinFurnitureMod.GENERAL_LOGGER.warn("Failed to find custom stone type {}", id); + } + return Optional.empty(); + } } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariantRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariantRegistry.java new file mode 100644 index 000000000..b038a8d4b --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/data/materials/StoneVariantRegistry.java @@ -0,0 +1,109 @@ +package com.unlikepaladin.pfm.data.materials; + +import net.minecraft.block.*; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import org.jetbrains.annotations.Nullable; + +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; +import java.util.stream.Collectors; + +public class StoneVariantRegistry extends VariantRegistryBase { + public static final StoneVariant STONE = new StoneVariant(new Identifier("stone"), Blocks.STONE, Blocks.COBBLESTONE); + public static final StoneVariantRegistry INSTANCE = new StoneVariantRegistry(); + public static Collection getNamespaces() { + return INSTANCE.variants.values().stream().map(VariantBase::getNamespace).collect(Collectors.toUnmodifiableList()); + }; + + public static Collection getVariants() { + return Collections.unmodifiableCollection(INSTANCE.variants.values()); + } + @Nullable + public static StoneVariant getVariant(Identifier name) { + return INSTANCE.variants.getOrDefault(name, STONE); + } + + /** + * Simplified Wood/Block detection based on MoonlightLib... + */ + public Optional getVariantFromBlock(Block baseBlock, Identifier blockId) { + String name = null; + String path = blockId.getPath(); + if (path.endsWith("_polished")) { + name = path.substring(0, path.length() - "_polished".length()); + } else if (path.startsWith("polished_")) { + name = path.substring("polished_".length()); + } else if (path.endsWith("_polish")) { + name = path.substring(0, path.length() - "_polish".length()); + } else if (path.startsWith("polish_")) { + name = path.substring("polish_".length()); + } + String namespace = blockId.getNamespace(); + if (!namespace.equals("cozy_home") && name != null && !namespace.equals("securitycraft") && + !namespace.equals("absentbydesign") && !namespace.equals("chipped")) { + + BlockState state = baseBlock.getDefaultState(); + // can't check if the block is a full one, so I do this. Adding some checks here + if (state.getProperties().size() <= 2 && !(baseBlock instanceof SlabBlock)) { + // needs to use wood sound type + // if (state.getSoundType() == SoundType.WOOD) { //wood from tcon has diff sounds + Material mat = state.getMaterial(); + // and have correct material + if (mat == Material.STONE) { + // we do not allow "/" in the wood name + name = name.replace("/", "_"); + Identifier id = new Identifier(blockId.getNamespace(), name); + Block rawBlock = findRaw(id); + if (rawBlock != null) { + return Optional.of(new StoneVariant(id, baseBlock, rawBlock)); + } + } + } + } + return Optional.empty(); + } + + @Override + public StoneVariant getDefaultType() { + return STONE; + } + + @Override + public Class getType() { + return StoneVariant.class; + } + + @Nullable + private static Block findRaw(Identifier id) { + Identifier[] test = { + new Identifier(id.getNamespace(), id.getPath()), + new Identifier(id.getNamespace(), id.getPath() + "raw"), + new Identifier(id.getNamespace(), id.getPath() + "_raw"), + new Identifier(id.getNamespace(), "raw_" + id.getPath()), + new Identifier(id.getNamespace(), "raw" + id.getPath()), + new Identifier(id.getNamespace(), id.getPath() + "_cobble"), + new Identifier(id.getNamespace(), id.getPath() + "cobble"), + new Identifier(id.getNamespace(), "cobble_" + id.getPath()), + new Identifier(id.getNamespace(), "cobble" + id.getPath()), + new Identifier(id.getPath()), + new Identifier(id.getPath() + "raw"), + new Identifier(id.getPath() + "_raw"), + new Identifier("raw_" + id.getPath()), + new Identifier("raw" + id.getPath()), + new Identifier(id.getPath() + "_cobble"), + new Identifier(id.getPath() + "cobble"), + new Identifier("cobble_" + id.getPath()), + new Identifier("cobble" + id.getPath()) + }; + Block temp = null; + for (Identifier r : test) { + if (Registry.BLOCK.containsId(r)) { + temp = Registry.BLOCK.get(r); + break; + } + } + return temp; + } +} diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/VariantRegistryBase.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/VariantRegistryBase.java index 583e48568..cbdab166a 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/data/materials/VariantRegistryBase.java +++ b/common/src/main/java/com/unlikepaladin/pfm/data/materials/VariantRegistryBase.java @@ -33,8 +33,8 @@ protected void finalizeAndFreeze() { if (Objects.equals(entry.getNamespace(), modId)) { if (!linkedHashMap.containsKey(entry.getIdentifier())) { linkedHashMap.put(entry.getIdentifier(), entry); - }else if (entry.getIdentifier() != WoodVariantRegistry.OAK.getIdentifier()) { - PaladinFurnitureMod.GENERAL_LOGGER.warn("Found block type with duplicate id ({}), skipping",entry.identifier); + } else if (entry.getIdentifier() != WoodVariantRegistry.OAK.getIdentifier()) { + PaladinFurnitureMod.GENERAL_LOGGER.warn("Found block type with duplicate id ({}), skipping", entry.identifier); } } }); diff --git a/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java index 566290d5c..85d4b956c 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java @@ -56,7 +56,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(DinnerChairBlock.class, new FurnitureEntry<>() {{ @@ -65,7 +65,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicChairBlock.class, new FurnitureEntry<>() {{ @@ -74,7 +74,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicChairDyeableBlock.class, new FurnitureEntry<>() {{ @@ -89,7 +89,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(FroggyChairBlock.class, new FurnitureEntry<>() {{ @@ -119,7 +119,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicTableBlock.class, new FurnitureEntry<>() {{ @@ -128,7 +128,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); @@ -139,7 +139,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_" + postfix, () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_natural", () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); @@ -157,7 +157,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ModernDinnerTableBlock.class, new FurnitureEntry<>() {{ @@ -166,7 +166,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(BasicCoffeeTableBlock.class, new FurnitureEntry<>() {{ @@ -175,7 +175,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ModernCoffeeTableBlock.class, new FurnitureEntry<>() {{ @@ -184,7 +184,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicCoffeeTableBlock.class, new FurnitureEntry<>() {{ @@ -193,7 +193,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicNightstandBlock.class, new FurnitureEntry<>() {{ @@ -202,7 +202,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(SimpleBedBlock.class, new FurnitureEntry<>() {{ @@ -233,7 +233,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureModBlocksItems.furnitureEntryMap.put(ClassicStoolBlock.class, new FurnitureEntry<>() {{ @@ -242,7 +242,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); @@ -252,7 +252,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat if (variant.hasStripped()) this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } - for (StoneVariant variant : StoneVariant.values()) { + for (StoneVariant variant : StoneVariantRegistry.getVariants()) { this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); } for (ExtraStoolVariant variant : ExtraStoolVariant.values()) { @@ -288,7 +288,7 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat PaladinFurnitureModBlocksItems.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } } - for (StoneVariant variant : StoneVariant.values()) {if (variant == StoneVariant.QUARTZ) + for (StoneVariant variant : StoneVariantRegistry.getVariants()) {if (variant.identifier.getPath().equals("quartz")) continue; this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); PaladinFurnitureModBlocksItems.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java index 2783ad7a0..8bc8dd96a 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java @@ -9,8 +9,6 @@ import com.unlikepaladin.pfm.blocks.models.basicLamp.UnbakedBasicLampModel; import com.unlikepaladin.pfm.data.materials.StoneVariant; import com.unlikepaladin.pfm.data.materials.VariantBase; -import com.unlikepaladin.pfm.data.materials.WoodVariant; -import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; import com.unlikepaladin.pfm.mixin.PFMTextureKeyFactory; import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems; import com.unlikepaladin.pfm.registry.TriFunc; @@ -251,20 +249,20 @@ public static Texture createPlankLogBlockTexture(Boolean stripped, VariantBase variantBase) { Identifier counterBase = stripped ? ModelHelper.getTextureId((Block) variantBase.getChild("stripped_log")) : ModelHelper.getTextureId(variantBase.getBaseBlock()); Identifier counterTop = stripped ? ModelHelper.getTextureId(variantBase.getBaseBlock()) : ModelHelper.getTextureId(variantBase.getSecondaryBlock()); - if (variantBase == StoneVariant.GRANITE) { + if (variantBase.identifier.getPath().equals("granite")) { counterTop = ModelHelper.getTextureId(Blocks.POLISHED_GRANITE); counterBase = ModelHelper.getTextureId(Blocks.WHITE_TERRACOTTA); - } else if (variantBase == StoneVariant.CALCITE || variantBase == StoneVariant.NETHERITE) { + } else if (variantBase.identifier.getPath().equals("calcite") || variantBase.identifier.getPath().equals("netherite")) { Identifier temp = counterBase; counterBase = counterTop; counterTop = temp; - } else if (variantBase == StoneVariant.ANDESITE) { + } else if (variantBase.identifier.getPath().equals("andesite")) { counterTop = ModelHelper.getTextureId(Blocks.POLISHED_ANDESITE); counterBase = ModelHelper.getTextureId(Blocks.STRIPPED_OAK_LOG); - } else if (variantBase == StoneVariant.DEEPSLATE) { + } else if (variantBase.identifier.getPath().equals("deepslate")) { counterTop = ModelHelper.getTextureId(Blocks.POLISHED_DEEPSLATE); counterBase = ModelHelper.getTextureId(Blocks.DARK_OAK_PLANKS); - } else if (variantBase == StoneVariant.BLACKSTONE) { + } else if (variantBase.identifier.getPath().equals("blackstone")) { counterTop = ModelHelper.getTextureId(Blocks.POLISHED_BLACKSTONE); counterBase = ModelHelper.getTextureId(Blocks.CRIMSON_PLANKS); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java index 93bcbb44f..15a537c11 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java @@ -281,7 +281,11 @@ public void generateTranslationForVariantBlockMap(Map, ? extends throw new RuntimeException(e); } } else { - String translatedVariantName = translate("block.pfm.variant."+variant.getIdentifier().getPath()); + String key = "block.pfm.variant."+variant.getIdentifier().getPath(); + String translatedVariantName = translate(key); + if (translatedVariantName.equals(key)) { + translatedVariantName = getTranslatedVariantName(variant); + } String translatedFurnitureName = StringUtils.normalizeSpace(blockStringStringStringStringQuadFunc.apply(block, furnitureKey, "", translatedVariantName)); try { writer.write(String.format(" \"%1$s\": \"%2$s\",", block.getTranslationKey(), translatedFurnitureName)); diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java index 809eab441..a1647f822 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java @@ -6,7 +6,6 @@ import com.unlikepaladin.pfm.blocks.*; import com.unlikepaladin.pfm.blocks.models.ModelHelper; import com.unlikepaladin.pfm.data.FurnitureBlock; -import com.unlikepaladin.pfm.data.materials.StoneVariant; import com.unlikepaladin.pfm.data.materials.VariantBase; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; @@ -697,20 +696,20 @@ public static Pair getCounterMaterials(VariantBase variantBase) Block counterTop = variantBase.getSecondaryBlock(); Block counterBase = variantBase.getBaseBlock(); - if (variantBase == StoneVariant.GRANITE) { + if (variantBase.identifier.getPath().equals("granite")) { counterTop = Blocks.POLISHED_GRANITE; counterBase = Blocks.WHITE_TERRACOTTA; - } else if (variantBase == StoneVariant.CALCITE || variantBase == StoneVariant.NETHERITE) { + } else if (variantBase.identifier.getPath().equals("calcite") || variantBase.identifier.getPath().equals("netherite")) { Block temp = counterBase; counterBase = counterTop; counterTop = temp; - } else if (variantBase == StoneVariant.ANDESITE) { + } else if (variantBase.identifier.getPath().equals("andesite")) { counterTop = Blocks.POLISHED_ANDESITE; counterBase = Blocks.STRIPPED_OAK_LOG; - } else if (variantBase == StoneVariant.DEEPSLATE) { + } else if (variantBase.identifier.getPath().equals("deepslate")) { counterTop = Blocks.POLISHED_DEEPSLATE; counterBase = Blocks.DARK_OAK_PLANKS; - } else if (variantBase == StoneVariant.BLACKSTONE) { + } else if (variantBase.identifier.getPath().equals("blackstone")) { counterTop = Blocks.POLISHED_BLACKSTONE; counterBase = Blocks.CRIMSON_PLANKS; } diff --git a/common/src/main/resources/assets/pfm/lang/en_us.json b/common/src/main/resources/assets/pfm/lang/en_us.json index a03b5e184..5e8a1e93d 100644 --- a/common/src/main/resources/assets/pfm/lang/en_us.json +++ b/common/src/main/resources/assets/pfm/lang/en_us.json @@ -300,13 +300,8 @@ "block.pfm.variant.netherite": "Netherite", "block.pfm.variant.light_wood": "Light Wood", "block.pfm.variant.dark_wood": "Dark Wood", - "block.pfm.variant.granite": "Granite", "block.pfm.variant.calcite": "Calcite", - "block.pfm.variant.andesite": "Andesite", "block.pfm.variant.stone": "Stone", - "block.pfm.variant.diorite": "Diorite", - "block.pfm.variant.deepslate": "Deepslate", - "block.pfm.variant.blackstone": "Blackstone", "block.pfm.variant.dark_concrete": "Dark Concrete", "block.pfm.variant.concrete": "Concrete", "block.pfm.variant.smooth_stone": "Smooth Stone", From fb681b200b80f1b9444257441193c51ce2f14223 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:29:01 -0600 Subject: [PATCH 04/17] Rewrote the Caching System to Fix Texture issues Overhauled mesh trashcan model --- .../pfm/blocks/models/AbstractBakedModel.java | 2 + .../pfm/blocks/models/ModelHelper.java | 4 +- .../UnbakedCoffeeBasicTableModel.java | 17 ++-- .../basicLamp/UnbakedBasicLampModel.java | 17 ++-- .../basicTable/UnbakedBasicTableModel.java | 16 ++-- .../blocks/models/bed/UnbakedBedModel.java | 17 ++-- .../models/chair/UnbakedChairModel.java | 17 ++-- .../UnbakedChairClassicModel.java | 17 ++-- .../chairDinner/UnbakedChairDinnerModel.java | 17 ++-- .../chairModern/UnbakedChairModernModel.java | 17 ++-- .../UnbakedClassicCoffeeTableModel.java | 17 ++-- .../UnbakedClassicNightstandModel.java | 17 ++-- .../UnbakedClassicStoolModel.java | 17 ++-- .../UnbakedClassicTableModel.java | 17 ++-- .../dinnerTable/UnbakedDinnerTableModel.java | 17 ++-- .../UnbakedKitchenCabinetModel.java | 17 ++-- .../UnbakedKitchenCounterModel.java | 16 ++-- .../UnbakedKitchenCounterOvenModel.java | 17 ++-- .../UnbakedKitchenDrawerModel.java | 17 ++-- .../kitchenSink/UnbakedKitchenSinkModel.java | 17 ++-- .../UnbakedKitchenWallCounterModel.java | 17 ++-- .../UnbakedKitchenWallDrawerModel.java | 17 ++-- .../UnbakedKitchenWallDrawerSmallModel.java | 17 ++-- .../models/ladder/UnbakedLadderModel.java | 17 ++-- .../models/logStool/UnbakedLogStoolModel.java | 17 ++-- .../models/logTable/UnbakedLogTableModel.java | 17 ++-- .../UnbakedModernCoffeeTableModel.java | 17 ++-- .../UnbakedModernDinnerTableModel.java | 17 ++-- .../modernStool/UnbakedModernStoolModel.java | 17 ++-- .../simpleStool/UnbakedSimpleStoolModel.java | 17 ++-- .../pfm/client/screens/PFMBookScreen.java | 28 +++++++ .../client/screens/PFMGeneratingOverlay.java | 26 ++++++ .../pfm/client/screens/book/PFMPage.java | 5 ++ ...PFMReloadableResourceManagerImplMixin.java | 22 +++++ .../pfm/runtime/PFMAssetGenerator.java | 22 +++++ .../pfm/runtime/PFMBakedModelContainer.java | 35 ++++++++ .../pfm/runtime/PFMDataGenerator.java | 22 +++++ .../pfm/runtime/PFMGenerator.java | 4 +- .../pfm/runtime/PFMResourceProgress.java | 7 ++ .../pfm/runtime/PFMRuntimeResources.java | 8 +- .../assets/PFMBlockstateModelProvider.java | 1 + .../pfm/runtime/assets/PFMLangProvider.java | 1 + .../runtime/data/PFMLootTableProvider.java | 1 + .../pfm/runtime/data/PFMMCMetaProvider.java | 1 + .../pfm/runtime/data/PFMRecipeProvider.java | 1 + .../pfm/runtime/data/PFMTagProvider.java | 1 + .../pfm/models/block/mesh_trashcan.json | 78 +++++++---------- .../pfm/models/block/trashcan/trashcan.json | 22 ++--- .../src/main/resources/pfm-common.mixins.json | 3 +- .../UnbakedCoffeeBasicTableModelImpl.java | 12 +-- .../fabric/UnbakedBasicLampModelImpl.java | 12 +-- .../fabric/UnbakedBasicTableModelImpl.java | 14 ++-- .../bed/fabric/UnbakedBedModelImpl.java | 14 ++-- .../chair/fabric/UnbakedChairModelImpl.java | 15 ++-- .../fabric/UnbakedChairClassicModelImpl.java | 12 +-- .../fabric/UnbakedChairDinnerModelImpl.java | 12 +-- .../fabric/UnbakedChairModernModelImpl.java | 12 +-- .../UnbakedClassicCoffeeTableModelImpl.java | 15 ++-- .../UnbakedClassicNightstandModelImpl.java | 12 +-- .../fabric/UnbakedClassicStoolModelImpl.java | 12 +-- .../fabric/UnbakedClassicTableModelImpl.java | 12 +-- .../fabric/UnbakedDinnerTableModelImpl.java | 12 +-- .../UnbakedKitchenCabinetModelImpl.java | 14 ++-- .../UnbakedKitchenCounterModelImpl.java | 15 ++-- .../UnbakedKitchenCounterOvenModelImpl.java | 12 +-- .../fabric/UnbakedKitchenDrawerModelImpl.java | 14 ++-- .../fabric/UnbakedKitchenSinkModelImpl.java | 14 ++-- .../UnbakedKitchenWallCounterModelImpl.java | 14 ++-- .../UnbakedKitchenWallDrawerModelImpl.java | 16 ++-- ...nbakedKitchenWallDrawerSmallModelImpl.java | 14 ++-- .../ladder/fabric/UnbakedLadderModelImpl.java | 11 ++- .../fabric/UnbakedLogStoolModelImpl.java | 14 ++-- .../fabric/UnbakedLogTableModelImpl.java | 14 ++-- .../UnbakedModernCoffeeTableModelImpl.java | 15 ++-- .../UnbakedModernDinnerTableModelImpl.java | 14 ++-- .../fabric/UnbakedModernStoolModelImpl.java | 14 ++-- .../fabric/UnbakedSimpleStoolModelImpl.java | 14 ++-- .../PaladinFurnitureModClientFabric.java | 1 + .../PFMModResourcePackCreatorMixin.java | 2 + .../forge/ForgeCoffeeBasicTableModel.java | 8 +- .../UnbakedCoffeeBasicTableModelImpl.java | 12 +-- .../forge/UnbakedBasicLampModelImpl.java | 14 ++-- .../forge/ForgeBasicTableModel.java | 8 +- .../forge/UnbakedBasicTableModelImpl.java | 14 ++-- .../models/bed/forge/UnbakedBedModelImpl.java | 14 ++-- .../chair/forge/UnbakedChairModelImpl.java | 14 ++-- .../forge/UnbakedChairClassicModelImpl.java | 12 +-- .../forge/UnbakedChairDinnerModelImpl.java | 12 +-- .../forge/UnbakedChairModernModelImpl.java | 12 +-- .../forge/ForgeClassicCoffeeTableModel.java | 8 +- .../UnbakedClassicCoffeeTableModelImpl.java | 16 ++-- .../UnbakedClassicNightstandModelImpl.java | 13 +-- .../forge/UnbakedClassicStoolModelImpl.java | 14 ++-- .../forge/ForgeClassicTableModel.java | 8 +- .../forge/UnbakedClassicTableModelImpl.java | 12 +-- .../forge/ForgeDinnerTableModel.java | 8 +- .../forge/UnbakedDinnerTableModelImpl.java | 13 +-- .../models/forge/PFMForgeBakedModel.java | 84 +++++++++++++++---- .../forge/UnbakedKitchenCabinetModelImpl.java | 14 ++-- .../forge/UnbakedKitchenCounterModelImpl.java | 12 +-- .../UnbakedKitchenCounterOvenModelImpl.java | 12 +-- .../forge/UnbakedKitchenDrawerModelImpl.java | 12 +-- .../forge/UnbakedKitchenSinkModelImpl.java | 14 ++-- .../UnbakedKitchenWallCounterModelImpl.java | 16 ++-- .../UnbakedKitchenWallDrawerModelImpl.java | 14 ++-- ...nbakedKitchenWallDrawerSmallModelImpl.java | 14 ++-- .../models/ladder/forge/ForgeLadderModel.java | 4 +- .../ladder/forge/UnbakedLadderModelImpl.java | 11 ++- .../forge/UnbakedLogStoolModelImpl.java | 14 ++-- .../logTable/forge/ForgeLogTableModel.java | 8 +- .../forge/UnbakedLogTableModelImpl.java | 12 +-- .../forge/ForgeModernCoffeeTableModel.java | 8 +- .../UnbakedModernCoffeeTableModelImpl.java | 15 ++-- .../forge/ForgeModernDinnerTableModel.java | 8 +- .../UnbakedModernDinnerTableModelImpl.java | 14 ++-- .../forge/UnbakedModernStoolModelImpl.java | 14 ++-- .../forge/UnbakedSimpleStoolModelImpl.java | 14 ++-- 117 files changed, 1043 insertions(+), 629 deletions(-) create mode 100644 common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMBookScreen.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/client/screens/book/PFMPage.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/mixin/PFMReloadableResourceManagerImplMixin.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/runtime/PFMBakedModelContainer.java create mode 100644 common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java index 1fc642db9..dc6292f45 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java @@ -32,6 +32,8 @@ public abstract class AbstractBakedModel implements BakedModel { protected final ModelBakeSettings settings; private final List templateBakedModels; + + public static boolean reloading = false; public AbstractBakedModel(ModelBakeSettings settings, List templateBakedModels) { this.settings = settings; this.templateBakedModels = templateBakedModels; diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java index 15df269ab..bb03f9a11 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java @@ -79,8 +79,8 @@ public static BlockType getBlockType(Identifier identifier) { return BlockType.BLOCK; } - public static VariantBase getVariant(Identifier identifier) { - VariantBase var = getExtraCounterType(identifier); + public static VariantBase getVariant(Identifier identifier) { + VariantBase var = getExtraCounterType(identifier); if (var == null) { var = getStoneType(identifier); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java index c3fa164b4..e389085db 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java @@ -6,6 +6,8 @@ import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -68,23 +70,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : BASIC_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/UnbakedBasicLampModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/UnbakedBasicLampModel.java index 5a4b5edbb..5a5105c5f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/UnbakedBasicLampModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/UnbakedBasicLampModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -70,23 +72,26 @@ public Collection getModelDependencies() { return Collections.singleton(PARENT); } - public static final Map> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(LAMP_MODEL_IDS.get(0)) && PFMRuntimeResources.modelCacheMap.get(LAMP_MODEL_IDS.get(0)).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(LAMP_MODEL_IDS.get(0), rotationContainer, PFMRuntimeResources.modelCacheMap.get(LAMP_MODEL_IDS.get(0)).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(LAMP_MODEL_IDS.get(0))) + PFMRuntimeResources.modelCacheMap.put(LAMP_MODEL_IDS.get(0), new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : ALL_MODEL_IDS) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(LAMP_MODEL_IDS.get(0)).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(LAMP_MODEL_IDS.get(0), rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java index 7a2a4bfe7..c6338641c 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -66,19 +68,23 @@ public Collection getTextureDependencies(Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : BASIC_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/UnbakedBedModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/UnbakedBedModel.java index 74d7542c4..9b4a5ce14 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/UnbakedBedModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/UnbakedBedModel.java @@ -4,6 +4,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -78,23 +80,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(BED_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(BED_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(BED_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(BED_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(BED_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(BED_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : BED_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(BED_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(BED_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier model, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java index 7f1c3111a..34143d522 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java @@ -6,6 +6,8 @@ import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -53,23 +55,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(CHAIR_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CHAIR_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier model, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java index fe4ea4ca7..0cc2f40c0 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java @@ -6,6 +6,8 @@ import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -52,23 +54,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(CHAIR_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CHAIR_CLASSIC_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java index 590056a07..c19747013 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -50,23 +52,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(CHAIR_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CHAIR_DINNER_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java index 96f9741d2..f8f4aa5a9 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java @@ -6,6 +6,8 @@ import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -52,23 +54,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(CHAIR_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(CHAIR_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CHAIR_MODERN_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(CHAIR_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(CHAIR_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java index db01b0a0e..28ff204da 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java @@ -6,6 +6,8 @@ import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -58,23 +60,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CLASSIC_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java index 62fca7518..d7b3013f4 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -56,23 +58,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(NIGHTSTAND_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(NIGHTSTAND_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(NIGHTSTAND_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(NIGHTSTAND_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(NIGHTSTAND_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(NIGHTSTAND_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : NIGHTSTAND_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(NIGHTSTAND_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(NIGHTSTAND_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java index f560a4f5d..e23de6397 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java @@ -6,6 +6,8 @@ import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry; import com.unlikepaladin.pfm.data.materials.WoodVariant; import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -51,23 +53,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(STOOL_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(STOOL_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CLASSIC_STOOL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(STOOL_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java index a0146058f..9643fce26 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -55,23 +57,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CLASSIC_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java index 59c2b0e68..966097e77 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -53,23 +55,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : DINNER_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java index ba93a568e..b2a1eb49e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -64,23 +66,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(CABINET_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(CABINET_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(CABINET_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(CABINET_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(CABINET_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(CABINET_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : CABINET_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(CABINET_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(CABINET_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java index fece8f9ed..acadf2c86 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -66,19 +68,23 @@ public Collection getTextureDependencies(Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(COUNTER_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(COUNTER_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(COUNTER_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(COUNTER_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(COUNTER_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(COUNTER_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : COUNTER_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(COUNTER_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(COUNTER_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java index 3488d009f..f07e5b96b 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -61,23 +63,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(OVEN_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(OVEN_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(OVEN_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(OVEN_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(OVEN_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(OVEN_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : OVEN_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(OVEN_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(OVEN_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java index 806573921..d4b2a829e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -68,23 +70,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(DRAWER_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(DRAWER_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(DRAWER_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(DRAWER_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : COUNTER_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(DRAWER_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java index decf7e75e..2f0676d1d 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -58,23 +60,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(SINK_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(SINK_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(SINK_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(SINK_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(SINK_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(SINK_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : SINK_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(SINK_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(SINK_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java index 59393d996..a090f2216 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -59,23 +61,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(COUNTER_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(COUNTER_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(COUNTER_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(COUNTER_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(COUNTER_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(COUNTER_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : COUNTER_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(COUNTER_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(COUNTER_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java index 769ac611e..99d115eb4 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -65,23 +67,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(DRAWER_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(DRAWER_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(DRAWER_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(DRAWER_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : COUNTER_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(DRAWER_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java index 1fad2ebae..bd998931e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/UnbakedKitchenWallDrawerSmallModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -56,23 +58,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(DRAWER_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(DRAWER_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(DRAWER_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(DRAWER_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : DRAWER_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(DRAWER_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(DRAWER_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java index ee0db5de7..b08e10834 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/UnbakedLadderModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -45,23 +47,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(LADDER_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(LADDER_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(LADDER_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(LADDER_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(LADDER_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(LADDER_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : LADDER_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(LADDER_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(LADDER_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java index dfa0d97b4..ee7f5defd 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/UnbakedLogStoolModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -49,23 +51,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(STOOL_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(STOOL_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : LOG_STOOL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(STOOL_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java index 58c1f3c53..41c21fada 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/UnbakedLogTableModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -57,23 +59,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : LOG_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java index f0cd655a4..78a2b602c 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/UnbakedModernCoffeeTableModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -55,23 +57,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : MODERN_COFFEE_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java index fc94fbfde..9cb989d6e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/UnbakedModernDinnerTableModel.java @@ -2,6 +2,8 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -55,23 +57,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(TABLE_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(TABLE_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(TABLE_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : MODERN_DINNER_MODEL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(TABLE_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(TABLE_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java index 840a79a52..8f59d65db 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/UnbakedModernStoolModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -51,23 +53,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(STOOL_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(STOOL_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : MODERN_STOOL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(STOOL_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java index 035933902..45d823298 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/UnbakedSimpleStoolModel.java @@ -3,6 +3,8 @@ import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.data.materials.*; +import com.unlikepaladin.pfm.runtime.PFMBakedModelContainer; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; @@ -50,23 +52,26 @@ public Collection getTextureDependencies(Function> CACHED_MODELS = new ConcurrentHashMap<>(); @Nullable @Override public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { - if (CACHED_MODELS.containsKey(rotationContainer)) - return getBakedModel(rotationContainer, CACHED_MODELS.get(rotationContainer)); + if (PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID) && PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().containsKey(rotationContainer)) + return getBakedModel(STOOL_MODEL_ID, rotationContainer, PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().get(rotationContainer)); + + if (!PFMRuntimeResources.modelCacheMap.containsKey(STOOL_MODEL_ID)) + PFMRuntimeResources.modelCacheMap.put(STOOL_MODEL_ID, new PFMBakedModelContainer()); List bakedModelList = new ArrayList<>(); for (Identifier modelPart : SIMPLE_STOOL_PARTS_BASE) { bakedModelList.add(loader.bake(modelPart, rotationContainer)); } - CACHED_MODELS.put(rotationContainer, bakedModelList); - return getBakedModel(rotationContainer, bakedModelList); + + PFMRuntimeResources.modelCacheMap.get(STOOL_MODEL_ID).getCachedModelParts().put(rotationContainer, bakedModelList); + return getBakedModel(STOOL_MODEL_ID, rotationContainer, bakedModelList); } @ExpectPlatform - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { throw new RuntimeException("Method wasn't replaced correctly"); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMBookScreen.java b/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMBookScreen.java new file mode 100644 index 000000000..fa6535b85 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMBookScreen.java @@ -0,0 +1,28 @@ +package com.unlikepaladin.pfm.client.screens; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class PFMBookScreen extends Screen { + public PFMBookScreen(Text title) { + super(title); + } + + public static final Identifier BOOK_TEXTURE = new Identifier("pfm", "textures/gui/book_orange.png"); + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.renderBackground(matrices); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.setShaderTexture(0, BOOK_TEXTURE); + + super.render(matrices, mouseX, mouseY, delta); + } + + + +} diff --git a/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java b/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java new file mode 100644 index 000000000..27970a0ab --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java @@ -0,0 +1,26 @@ +package com.unlikepaladin.pfm.client.screens; + +import com.unlikepaladin.pfm.runtime.PFMResourceProgress; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Overlay; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Util; + +public class PFMGeneratingOverlay extends Overlay { + private long reloadCompleteTime = -1L; + private long reloadStartTime = -1L; + private final boolean reloading; + + PFMGeneratingOverlay(Overlay parent, PFMResourceProgress resourceProgress, MinecraftClient client, boolean reloading) { + this.reloading = reloading; + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + long l = Util.getMeasuringTimeMs(); + if (this.reloading && this.reloadStartTime == -1L) { + this.reloadStartTime = l; + } + } +} diff --git a/common/src/main/java/com/unlikepaladin/pfm/client/screens/book/PFMPage.java b/common/src/main/java/com/unlikepaladin/pfm/client/screens/book/PFMPage.java new file mode 100644 index 000000000..07c06b49c --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/client/screens/book/PFMPage.java @@ -0,0 +1,5 @@ +package com.unlikepaladin.pfm.client.screens.book; + +public class PFMPage { + +} diff --git a/common/src/main/java/com/unlikepaladin/pfm/mixin/PFMReloadableResourceManagerImplMixin.java b/common/src/main/java/com/unlikepaladin/pfm/mixin/PFMReloadableResourceManagerImplMixin.java new file mode 100644 index 000000000..adf198713 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/mixin/PFMReloadableResourceManagerImplMixin.java @@ -0,0 +1,22 @@ +package com.unlikepaladin.pfm.mixin; + +import com.unlikepaladin.pfm.client.PathPackRPWrapper; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; +import net.minecraft.resource.ReloadableResourceManagerImpl; +import net.minecraft.resource.ResourcePack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +import java.util.ArrayList; +import java.util.List; + +@Mixin(value = ReloadableResourceManagerImpl.class) +public class PFMReloadableResourceManagerImplMixin { + + @ModifyVariable(at = @At(value = "HEAD"), method = "reload", argsOnly = true) + private List createReload(List packs) { + PFMRuntimeResources.modelCacheMap.clear(); + return packs; + } +} \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java index cfebd3381..896a499e5 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java @@ -21,8 +21,12 @@ public class PFMAssetGenerator extends PFMGenerator { public static boolean FROZEN = false; + private int count; + private String progress; + public PFMAssetGenerator(Path output, boolean logOrDebug) { super(output, logOrDebug, LogManager.getLogger("PFM-Asset-Generation")); + count = 0; } public void run() throws IOException { @@ -62,12 +66,14 @@ public void run() throws IOException { log("Starting provider: {}", "PFM Asset MC Meta"); stopwatch2.start(); new PFMMCMetaProvider(this).run(PackType.RESOURCE, "PFM-Assets"); + count++; stopwatch2.stop(); log("{} finished after {} ms", "PFM Asset MC Meta", stopwatch2.elapsed(TimeUnit.MILLISECONDS)); log("Starting provider: {}", "PFM Blockstates and Models"); stopwatch2.start(); new PFMBlockstateModelProvider(this).run(dataCache); + count++; stopwatch2.stop(); log("{} finished after {} ms", "PFM Blockstates and Models", stopwatch2.elapsed(TimeUnit.MILLISECONDS)); stopwatch2.reset(); @@ -75,6 +81,7 @@ public void run() throws IOException { log("Starting provider: {}", "PFM Lang"); stopwatch2.start(); new PFMLangProvider(this).run(); + count++; stopwatch2.stop(); log("{} finished after {} ms", "PFM Lang", stopwatch2.elapsed(TimeUnit.MILLISECONDS)); stopwatch2.reset(); @@ -96,4 +103,19 @@ public void run() throws IOException { setAssetsRunning(false); } } + + @Override + public int getProgress() { + return count / 3; + } + + @Override + public void setProgress(String progress) { + this.progress = progress; + } + + @Override + public String getProgressString() { + return progress; + } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMBakedModelContainer.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMBakedModelContainer.java new file mode 100644 index 000000000..9ec68a4c0 --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMBakedModelContainer.java @@ -0,0 +1,35 @@ +package com.unlikepaladin.pfm.runtime; + +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +public class PFMBakedModelContainer { + public Map getBakedModels() { + return bakedModels; + } + + final Map bakedModels = new ConcurrentHashMap<>(); + + final Map> cachedModelParts = new ConcurrentHashMap<>(); + + public Map> getCachedModelParts() { + return cachedModelParts; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof PFMBakedModelContainer that)) return false; + return Objects.equals(bakedModels, that.bakedModels) && Objects.equals(cachedModelParts, that.cachedModelParts); + } + + @Override + public int hashCode() { + return Objects.hash(bakedModels, cachedModelParts); + } +} diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java index eb5f99eda..7f19c718d 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java @@ -24,6 +24,9 @@ public class PFMDataGenerator extends PFMGenerator { public static boolean FROZEN = false; + private int count; + private String progress; + public PFMDataGenerator(Path output, boolean logOrDebug) { super(output, logOrDebug, LogManager.getLogger("PFM-DataGen")); } @@ -62,6 +65,7 @@ public void run() throws IOException { log("Starting provider: {}", "PFM PFMTags"); stopwatch2.start(); new PFMTagProvider(this).run(dataCache); + count++; stopwatch2.stop(); log("{} finished after {} ms", "PFM PFMTags", stopwatch2.elapsed(TimeUnit.MILLISECONDS)); stopwatch2.reset(); @@ -69,6 +73,7 @@ public void run() throws IOException { log("Starting provider: {}", "PFM Drops"); stopwatch2.start(); new PFMLootTableProvider(this).run(dataCache); + count++; stopwatch2.stop(); log("{} finished after {} ms", "PFM Drops", stopwatch2.elapsed(TimeUnit.MILLISECONDS)); stopwatch2.reset(); @@ -76,6 +81,7 @@ public void run() throws IOException { log("Starting provider: {}", "PFM Recipes"); stopwatch2.start(); new PFMRecipeProvider(this).run(dataCache); + count++; stopwatch2.stop(); log("{} finished after {} ms", "PFM Recipes", stopwatch2.elapsed(TimeUnit.MILLISECONDS)); stopwatch2.reset(); @@ -83,6 +89,7 @@ public void run() throws IOException { log("Starting provider: {}", "PFM MC Meta"); stopwatch2.start(); new PFMMCMetaProvider(this).run(PackType.DATA, "PFM-Data"); + count++; stopwatch2.stop(); log("{} finished after {} ms", "PFM MC Meta", stopwatch2.elapsed(TimeUnit.MILLISECONDS)); @@ -104,4 +111,19 @@ public void run() throws IOException { setDataRunning(false); } } + + @Override + public int getProgress() { + return count / 4; + } + + @Override + public void setProgress(String progress) { + this.progress = progress; + } + + @Override + public String getProgressString() { + return progress; + } } \ No newline at end of file diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMGenerator.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMGenerator.java index 53e16a0ae..271ecf866 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMGenerator.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMGenerator.java @@ -14,7 +14,7 @@ import java.nio.file.Path; import java.util.*; -public abstract class PFMGenerator { +public abstract class PFMGenerator implements PFMResourceProgress { protected final Path output; private final boolean logOrDebug; private final Logger logger; @@ -122,4 +122,6 @@ private void collectFiles(File directory, List hashList, } } } + + abstract public void setProgress(String message); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java new file mode 100644 index 000000000..4d5f33bbf --- /dev/null +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java @@ -0,0 +1,7 @@ +package com.unlikepaladin.pfm.runtime; + +public interface PFMResourceProgress { + int getProgress(); + + String getProgressString(); +} diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java index c9db54abe..c5713dd10 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java @@ -2,8 +2,11 @@ import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.utilities.PFMFileUtil; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.resource.DirectoryResourcePack; import net.minecraft.resource.ResourcePack; +import net.minecraft.util.Identifier; import java.io.IOException; import java.nio.file.FileAlreadyExistsException; @@ -11,7 +14,10 @@ import java.nio.file.Path; import java.util.Base64; import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; public class PFMRuntimeResources { public static final String base64Icon = "/9j/4AAQSkZJRgABAQAASABIAAD/2wBDABwcHBwcHDAcHDBEMDAwRFxEREREXHRcXFxcXHSMdHR0dHR0jIyMjIyMjIyoqKioqKjExMTExNzc3Nzc3Nzc3Nz/2wBDASIkJDg0OGA0NGDmnICc5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ub/wAARCAEAAQADASIAAhEBAxEB/8QAGQABAAMBAQAAAAAAAAAAAAAAAAEDBAUC/8QAKBABAQABAwQBBAIDAQAAAAAAAAECAxExBCEycVESIjNBYYETkaGx/8QAGAEBAAMBAAAAAAAAAAAAAAAAAAEDBAL/xAAcEQEBAAMBAQEBAAAAAAAAAAAAAQIDETEhUUH/2gAMAwEAAhEDEQA/ANADG2gAAAAAAAAAAAAAAt/w6n0/V9NVFliJZfAASAAAAAAAAAAAAAAAAAAAAAAAADRp9Nnn3y+2Nuno4afE7/LvHXary2SMWn02effL7Y26ejhp8Tv8rkWxdjhIpyztSo1NLTz5ndbvUOrHMci9rshN5qGRrABIAAAAAAAAAAAAAAAAAANGn02efe/bG3DRw0+J3+XeOu1XlskYsOmzz737Y26ejhp8Tv8AK5FsXY4SKcs7UotkRah05TbUAkAEJci81CbzUMjUACQAAAAAAAAAAAAAAABM5iEzmEQ6szs/l7mUsUveLWy2PdqASgAAAAAQlyLzUJvNQyNQAJAAAAAAAAAAAAAAAAEzmITOYRDpPeLw94tbNXoBLkAAAAAQlyLzUJvNQyNQAJAAAAAAAAAAAAAAAAEzmITOYRDpPeLw94tbNXoBLkAAAAAQlyLzUJvNQyNQAJAAAAAAAAAAAAAAAAEzmITOYRDpPeLw94tbNXoBLkAAAAAQlyLzULM8MsLfqn9q2SzjVKACQAAAAAAAAAAAAAAABM5iEzmEQ6T3i8PeLWzV6AS5AAASCEiQRtLNqzanTY3vh2v/ABqEWS+pmVnjkZ6eeF+6f28O1tLNqy6nS45d8O3/AIpy1/i3Hb+uePeennp37p/bwqs4tl6ACQAAAAAAAAAAABM5iEzmEQ6T3i8PeLWzV6BKXKEiQQkABIAAAACLJZtWXU6XHLvh2/j9NYi4y+pmVnjj56eendsps8O1ZLNqwdRo4YT6se3dRlr59i7HZ35WQBWtAAAAAAAAAAEzmIBDpnDLhr2ds/8AbTLvN40zKVRZxZMvl7m14Upls4dOeLh4mfy9zvwlykAAAAAQAi0SlFrzvuIDfdm6n8f9tFsnesfUauOWP049+7nO/HeE+sgDM0gAAAAAAAAAAADo4+M9Oc6OPjPS3Ur2Pcm6LNk48rFynqpMtnCvU1MdPKS8WPUsym8u6OxPFsz+VnLOmWzhLmxePEz+XrdKOJRa827iA33EW7cvE1ccrZj32Op4sFdtr3OA48av48vTlupq/jy9OWp2rtYAqWgAAAAAAAAAAADo4+M9Oc6OPjPS3Ur2PePKxXjysXKKw9V5z0zTK43eXZp6rznplZsvWjDxqw1/1n/tollm87ua0dP5X07wzvjnLD+taxWsnC5VUs2fUY49se9/4vy8b6clXsys8d4Yy+rM9TPPyv8AS3p/2zNPT/tXhe5fVmU5GpZOFaycNCivGr+PL05bqav48vTlqdq3WAKloAAAAAAAAAAAA6OPjPTnNenrY2THLss12Sq851px5WK8eU56mOE3yq/qmxk6rznplW6up/ky3k22VM2V7WjGcg0dP530ztHT+d9GHpl41rJwrWThpZ6jLxvpyXWy8b6clTtWahp6f9szR09ktlvLjD1Zl41rJwrWThpZ68av48vTlunrWTTu95jmKNvq3X4AK1oAAAAAAAAAAAAAD3jnnj43Z5ttu97oDqOAAkaOn876Z2jp/O+nWHrnLxrWThWsnDSz1GXjfTkutl4305Knas1ACpctw1sse17xbl1N22wm381lHUzrm4yptuV3t3qAcpABIAAAAAAAAAAAAAAAAAAu0LJld7tvFImXl6izs46aycOZjqZYcXt8Lr1N22xm1XTZFNwrVqZTHG73bs5ablcrvld0Ks8urMMeADl2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//2Q=="; @@ -19,6 +25,7 @@ public class PFMRuntimeResources { public static final DirectoryResourcePack DATA_PACK = new DirectoryResourcePack(getDataPackDirectory().toFile()); public static volatile List RESOURCE_PACK_LIST; + public static Map modelCacheMap = new ConcurrentHashMap<>(); public static byte[] getImageData() { return Base64.getDecoder().decode(base64Icon); @@ -97,5 +104,4 @@ public static void runAsyncResourceGen() { if (future != null && !future.isDone()) future.join(); } - } diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java index 8bc8dd96a..cc2a4ff5e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMBlockstateModelProvider.java @@ -39,6 +39,7 @@ public class PFMBlockstateModelProvider extends PFMProvider { public PFMBlockstateModelProvider(PFMGenerator parent) { super(parent); + parent.setProgress("Generating Blockstates and Models"); } public void run(DataCache cache) { diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java index 15a537c11..e0c7924c4 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java @@ -37,6 +37,7 @@ public class PFMLangProvider extends PFMProvider { public PFMLangProvider(PFMGenerator parent) { super(parent); + parent.setProgress("Generating Language Resources"); } public void run() { diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMLootTableProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMLootTableProvider.java index 24c9843c9..54fc7a294 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMLootTableProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMLootTableProvider.java @@ -39,6 +39,7 @@ public class PFMLootTableProvider extends PFMProvider { public PFMLootTableProvider(PFMGenerator parent) { super(parent); + parent.setProgress("Generating Loot Tables"); } public void run(DataCache cache) { diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMMCMetaProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMMCMetaProvider.java index c1806c53d..7efd01155 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMMCMetaProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMMCMetaProvider.java @@ -17,6 +17,7 @@ public class PFMMCMetaProvider extends PFMProvider { public PFMMCMetaProvider(PFMGenerator parent) { super(parent); + parent.setProgress("Generating Minecraft Metadata"); } public void run(PackType type, String description) { diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java index a1647f822..29c971cb9 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java @@ -50,6 +50,7 @@ public class PFMRecipeProvider extends PFMProvider { public PFMRecipeProvider(PFMGenerator parent) { super(parent); + parent.setProgress("Generating Recipes"); } public void run(DataCache cache) { diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java index 8d82126b6..56a404dd7 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java @@ -36,6 +36,7 @@ public class PFMTagProvider extends PFMProvider { public PFMTagProvider(PFMGenerator parent) { super(parent); + parent.setProgress("Generating Tags"); } protected void generateTags() { diff --git a/common/src/main/resources/assets/pfm/models/block/mesh_trashcan.json b/common/src/main/resources/assets/pfm/models/block/mesh_trashcan.json index 0b3a15e95..452fd854f 100644 --- a/common/src/main/resources/assets/pfm/models/block/mesh_trashcan.json +++ b/common/src/main/resources/assets/pfm/models/block/mesh_trashcan.json @@ -6,8 +6,8 @@ }, "elements": [ { - "from": [12, 11, 3.25], - "to": [12.5, 11.5, 12.75], + "from": [12, 11, 3], + "to": [13, 12, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.25, 2]}, "faces": { "north": {"uv": [1, 0, 1.5, 0.5], "texture": "#2"}, @@ -19,19 +19,9 @@ } }, { - "from": [12.5, 0, 3.5], - "to": [12.5, 11, 12.5], - "faces": { - "east": {"uv": [1, 0, 10, 11], "texture": "#2"}, - "west": {"uv": [0, 1, 9, 12], "texture": "#2"}, - "up": {"uv": [2, 0, 2, 9], "texture": "#2"}, - "down": {"uv": [0, 1, 0, 10], "texture": "#2"} - } - }, - { - "from": [3.5, 11, 3.75], - "to": [4, 11.5, 12.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.25, 2]}, + "from": [3, 11, 4], + "to": [4, 12, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 11.25, 2]}, "faces": { "north": {"uv": [1, 0, 1.5, 0.5], "texture": "#2"}, "east": {"uv": [1, 0, 1.5, 0.5], "texture": "#2"}, @@ -42,29 +32,30 @@ } }, { - "from": [3.5, 0, 3.5], - "to": [3.5, 11, 12.5], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 5.5, 8]}, + "from": [3, 0, 3], + "to": [13, 11, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [4.5, 5.5, 8.5]}, "faces": { + "north": {"uv": [0, 1, 10, 12], "texture": "#2"}, "east": {"uv": [0, 1, 9, 12], "texture": "#2"}, - "west": {"uv": [0, 2, 9, 13], "texture": "#2"}, - "up": {"uv": [2, 0, 2, 9], "texture": "#2"}, - "down": {"uv": [1, 0, 1, 9], "texture": "#2"} + "south": {"uv": [0, 1, 10, 12], "texture": "#2"}, + "west": {"uv": [0, 2, 10, 13], "texture": "#2"} } }, { - "from": [3.5, 0, 12.5], - "to": [12.5, 11, 12.5], + "from": [13, 11, 13], + "to": [3, 0, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [14.5, 16.5, 18.5]}, "faces": { - "north": {"uv": [0, 1, 9, 12], "texture": "#2"}, - "south": {"uv": [0, 0, 9, 11], "texture": "#2"}, - "up": {"uv": [0, 1, 9, 1], "texture": "#2"}, - "down": {"uv": [1, 0, 10, 0], "texture": "#2"} + "north": {"uv": [0, 1, 10, 12], "texture": "#2"}, + "east": {"uv": [0, 1, 9, 12], "texture": "#2"}, + "south": {"uv": [0, 1, 10, 12], "texture": "#2"}, + "west": {"uv": [0, 2, 10, 13], "texture": "#2"} } }, { - "from": [3.5, 11, 12.25], - "to": [12, 11.5, 12.75], + "from": [4, 11, 12], + "to": [12, 12, 13], "faces": { "north": {"uv": [1, 0, 1.5, 0.5], "texture": "#2"}, "east": {"uv": [1, 0, 1.5, 0.5], "texture": "#2"}, @@ -75,8 +66,9 @@ } }, { - "from": [3.5, 11, 3.25], - "to": [12, 11.5, 3.75], + "from": [3, 11, 3], + "to": [12, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, -0.2]}, "faces": { "north": {"uv": [1, 0, 1.5, 0.5], "texture": "#2"}, "east": {"uv": [1, 0, 1.5, 0.5], "texture": "#2"}, @@ -87,18 +79,8 @@ } }, { - "from": [3.5, 0, 3.5], - "to": [12.5, 11, 3.5], - "faces": { - "north": {"uv": [0, 0, 9, 11], "texture": "#2"}, - "south": {"uv": [0, 0, 9, 11], "texture": "#2"}, - "up": {"uv": [1, 1, 10, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 9, 0], "texture": "#2"} - } - }, - { - "from": [3.46875, 0, 3.48438], - "to": [12.52344, 0.3, 12.53906], + "from": [3.01, 0, 3.01], + "to": [12.99, 0.3, 12.99], "faces": { "north": {"uv": [14, 15, 14.5, 15.5], "texture": "#2"}, "east": {"uv": [14, 15, 14.5, 15.5], "texture": "#2"}, @@ -160,27 +142,27 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [0, 1] + "children": [0] }, { "name": "group", "origin": [5, 5.5, 8], "color": 0, - "children": [2, 3] + "children": [1, 2, 3] }, { "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [4, 5] + "children": [4] }, { "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [6, 7] + "children": [5] }, - 8 + 6 ] } ] diff --git a/common/src/main/resources/assets/pfm/models/block/trashcan/trashcan.json b/common/src/main/resources/assets/pfm/models/block/trashcan/trashcan.json index bd3a25781..a0f2399f4 100644 --- a/common/src/main/resources/assets/pfm/models/block/trashcan/trashcan.json +++ b/common/src/main/resources/assets/pfm/models/block/trashcan/trashcan.json @@ -21,10 +21,10 @@ }, { "from": [1, 12, 1], - "to": [14, 16, 14], + "to": [14, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.75, 7.5]}, "faces": { - "north": {"uv": [13, 0, 6.5, 2], "texture": "#3"}, + "north": {"uv": [13, 0, 6.5, 1.5], "texture": "#3"}, "east": {"uv": [13, 0, 6.5, 2], "texture": "#3"}, "south": {"uv": [13, 0, 6.5, 2], "texture": "#3"}, "west": {"uv": [6.5, 0, 13, 2], "texture": "#3"}, @@ -33,9 +33,9 @@ } }, { - "from": [10.5, 16, 6.5], - "to": [11.5, 17, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.75, 7.5]}, + "from": [11.5, 15, 6.5], + "to": [11.5, 16, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 14.75, 7.5]}, "faces": { "north": {"uv": [7, 2, 7.5, 2.5], "texture": "#3"}, "east": {"uv": [7, 2, 8, 2.5], "texture": "#3"}, @@ -46,9 +46,9 @@ } }, { - "from": [3.5, 16, 6.5], - "to": [4.5, 17, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.75, 7.5]}, + "from": [3.5, 15, 6.5], + "to": [3.5, 16, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 14.75, 7.5]}, "faces": { "north": {"uv": [7, 2, 7.5, 2.5], "texture": "#3"}, "east": {"uv": [7, 2, 8, 2.5], "texture": "#3"}, @@ -59,9 +59,9 @@ } }, { - "from": [3.5, 17, 6.5], - "to": [11.5, 18, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 15.75, 7.5]}, + "from": [3.5, 16, 6.5], + "to": [11.5, 16, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 14.75, 7.5]}, "faces": { "north": {"uv": [7, 2, 11, 2.5], "texture": "#3"}, "east": {"uv": [9.5, 2, 10.5, 2.5], "texture": "#3"}, diff --git a/common/src/main/resources/pfm-common.mixins.json b/common/src/main/resources/pfm-common.mixins.json index 713eaa5e8..435b0d8dc 100644 --- a/common/src/main/resources/pfm-common.mixins.json +++ b/common/src/main/resources/pfm-common.mixins.json @@ -17,7 +17,8 @@ "PFMItemRendererMixin", "PFMLanguageManagerAccessor", "PFMMixinClientPacketListener", - "PFMRenderLayersMixin" + "PFMRenderLayersMixin", + "PFMReloadableResourceManagerImplMixin" ], "injectors": { "defaultRequire": 1 diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java index 4ad9b76f3..c5bf17aa0 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/fabric/UnbakedCoffeeBasicTableModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedCoffeeBasicTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricCoffeeBasicTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/fabric/UnbakedBasicLampModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/fabric/UnbakedBasicLampModelImpl.java index 3a7677f7e..66405fa86 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/fabric/UnbakedBasicLampModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/fabric/UnbakedBasicLampModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.basicLamp.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedBasicLampModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricBasicLampModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/fabric/UnbakedBasicTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/fabric/UnbakedBasicTableModelImpl.java index 7d4142fe1..c0cb1deaf 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/fabric/UnbakedBasicTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/fabric/UnbakedBasicTableModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.basicTable.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedBasicTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricBasicTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/fabric/UnbakedBedModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/fabric/UnbakedBedModelImpl.java index 95dae06bb..7b9a1d85a 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/fabric/UnbakedBedModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/fabric/UnbakedBedModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.bed.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedBedModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricBedModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/fabric/UnbakedChairModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/fabric/UnbakedChairModelImpl.java index 8cfc302dc..1156e8d99 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/fabric/UnbakedChairModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/fabric/UnbakedChairModelImpl.java @@ -1,20 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.chair.fabric; -import com.unlikepaladin.pfm.blocks.models.classicNightstand.fabric.FabricClassicNightstandModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricChairModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/fabric/UnbakedChairClassicModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/fabric/UnbakedChairClassicModelImpl.java index c6d3065cb..4ce734c1b 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/fabric/UnbakedChairClassicModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/fabric/UnbakedChairClassicModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.chairClassic.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairClassicModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricChairClassicModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/fabric/UnbakedChairDinnerModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/fabric/UnbakedChairDinnerModelImpl.java index 31ca1a653..ecd5be5d2 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/fabric/UnbakedChairDinnerModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/fabric/UnbakedChairDinnerModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.chairDinner.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairDinnerModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricChairDinnerModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/fabric/UnbakedChairModernModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/fabric/UnbakedChairModernModelImpl.java index 358e63747..80a39a7ad 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/fabric/UnbakedChairModernModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/fabric/UnbakedChairModernModelImpl.java @@ -1,20 +1,22 @@ package com.unlikepaladin.pfm.blocks.models.chairModern.fabric; import com.unlikepaladin.pfm.blocks.models.chairDinner.fabric.FabricChairDinnerModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairModernModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricChairModernModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java index 712438809..2b3b01f61 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/fabric/UnbakedClassicCoffeeTableModelImpl.java @@ -1,20 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.fabric; -import com.unlikepaladin.pfm.blocks.models.classicTable.fabric.FabricClassicTableModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicCoffeeTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricClassicCoffeeTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/fabric/UnbakedClassicNightstandModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/fabric/UnbakedClassicNightstandModelImpl.java index 7a9e93e7f..761df57a5 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/fabric/UnbakedClassicNightstandModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/fabric/UnbakedClassicNightstandModelImpl.java @@ -1,20 +1,22 @@ package com.unlikepaladin.pfm.blocks.models.classicNightstand.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.texture.Sprite; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicNightstandModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricClassicNightstandModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/fabric/UnbakedClassicStoolModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/fabric/UnbakedClassicStoolModelImpl.java index fba7cebfc..134cd4da8 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/fabric/UnbakedClassicStoolModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/fabric/UnbakedClassicStoolModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.classicStool.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricClassicStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/fabric/UnbakedClassicTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/fabric/UnbakedClassicTableModelImpl.java index 63aef9372..9890d9397 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/fabric/UnbakedClassicTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/fabric/UnbakedClassicTableModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.classicTable.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricClassicTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/fabric/UnbakedDinnerTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/fabric/UnbakedDinnerTableModelImpl.java index 32e7db85e..182ba6675 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/fabric/UnbakedDinnerTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/fabric/UnbakedDinnerTableModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.dinnerTable.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedDinnerTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricDinnerTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/fabric/UnbakedKitchenCabinetModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/fabric/UnbakedKitchenCabinetModelImpl.java index 61ff40ca6..9917f4c8e 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/fabric/UnbakedKitchenCabinetModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/fabric/UnbakedKitchenCabinetModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenCabinet.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenCabinetModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenCabinetModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/fabric/UnbakedKitchenCounterModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/fabric/UnbakedKitchenCounterModelImpl.java index bf87ed32a..16ee8d7a6 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/fabric/UnbakedKitchenCounterModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/fabric/UnbakedKitchenCounterModelImpl.java @@ -1,20 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenCounter.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; -import net.minecraft.client.texture.Sprite; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenCounterModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenCounterModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/fabric/UnbakedKitchenCounterOvenModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/fabric/UnbakedKitchenCounterOvenModelImpl.java index ea802ced7..e1bea6ec8 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/fabric/UnbakedKitchenCounterOvenModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/fabric/UnbakedKitchenCounterOvenModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.kitchenCounterOven.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenCounterOvenModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenCounterOvenModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/fabric/UnbakedKitchenDrawerModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/fabric/UnbakedKitchenDrawerModelImpl.java index 7a3ced25c..a03545378 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/fabric/UnbakedKitchenDrawerModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/fabric/UnbakedKitchenDrawerModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenDrawer.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenDrawerModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenDrawerModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/fabric/UnbakedKitchenSinkModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/fabric/UnbakedKitchenSinkModelImpl.java index ed2b65c88..762374765 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/fabric/UnbakedKitchenSinkModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/fabric/UnbakedKitchenSinkModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenSink.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenSinkModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenSinkModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/fabric/UnbakedKitchenWallCounterModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/fabric/UnbakedKitchenWallCounterModelImpl.java index 009e18d60..ffa4d9283 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/fabric/UnbakedKitchenWallCounterModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/fabric/UnbakedKitchenWallCounterModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenWallCounter.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenWallCounterModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenWallCounterModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/fabric/UnbakedKitchenWallDrawerModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/fabric/UnbakedKitchenWallDrawerModelImpl.java index b286608bb..704682a35 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/fabric/UnbakedKitchenWallDrawerModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/fabric/UnbakedKitchenWallDrawerModelImpl.java @@ -1,21 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenWallDrawer.fabric; -import com.unlikepaladin.pfm.blocks.models.kitchenDrawer.fabric.FabricKitchenDrawerModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; -import net.minecraft.client.texture.Sprite; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenWallDrawerModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenWallDrawerModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/fabric/UnbakedKitchenWallDrawerSmallModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/fabric/UnbakedKitchenWallDrawerSmallModelImpl.java index 1e4678f42..722beaf8d 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/fabric/UnbakedKitchenWallDrawerSmallModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/fabric/UnbakedKitchenWallDrawerSmallModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenWallDrawerSmall.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenWallDrawerSmallModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricKitchenWallDrawerSmallModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/fabric/UnbakedLadderModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/fabric/UnbakedLadderModelImpl.java index 0f30d9109..e7db91d66 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/fabric/UnbakedLadderModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/fabric/UnbakedLadderModelImpl.java @@ -1,12 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.ladder.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; public class UnbakedLadderModelImpl { - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - return new FabricLadderModel(settings, modelParts); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + + BakedModel model = new FabricLadderModel(settings, modelParts); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); + return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/fabric/UnbakedLogStoolModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/fabric/UnbakedLogStoolModelImpl.java index 7534d914a..ded919355 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/fabric/UnbakedLogStoolModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/fabric/UnbakedLogStoolModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.logStool.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedLogStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricLogStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/fabric/UnbakedLogTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/fabric/UnbakedLogTableModelImpl.java index d900e3f12..28dfd9f93 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/fabric/UnbakedLogTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/fabric/UnbakedLogTableModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.logTable.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedLogTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricLogTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java index 24e4d7472..2d95ec49a 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/fabric/UnbakedModernCoffeeTableModelImpl.java @@ -1,20 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.fabric; -import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.fabric.FabricModernDinnerTableModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedModernCoffeeTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricModernCoffeeTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/fabric/UnbakedModernDinnerTableModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/fabric/UnbakedModernDinnerTableModelImpl.java index 2461ce18e..1680ff638 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/fabric/UnbakedModernDinnerTableModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/fabric/UnbakedModernDinnerTableModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.modernDinnerTable.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedModernDinnerTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricModernDinnerTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/fabric/UnbakedModernStoolModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/fabric/UnbakedModernStoolModelImpl.java index ebe4a2307..9be954ba9 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/fabric/UnbakedModernStoolModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/fabric/UnbakedModernStoolModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.modernStool.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedModernStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricModernStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/fabric/UnbakedSimpleStoolModelImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/fabric/UnbakedSimpleStoolModelImpl.java index 2b8c1df81..d60cf77f2 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/fabric/UnbakedSimpleStoolModelImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/fabric/UnbakedSimpleStoolModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.simpleStool.fabric; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedSimpleStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new FabricSimpleStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PaladinFurnitureModClientFabric.java b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PaladinFurnitureModClientFabric.java index fe5699185..a28ddb8c3 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PaladinFurnitureModClientFabric.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/PaladinFurnitureModClientFabric.java @@ -12,6 +12,7 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; +import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; import org.apache.logging.log4j.LogManager; diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMModResourcePackCreatorMixin.java b/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMModResourcePackCreatorMixin.java index b8a58acc0..bd8e4d875 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMModResourcePackCreatorMixin.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMModResourcePackCreatorMixin.java @@ -2,6 +2,7 @@ import com.google.common.base.Suppliers; import com.mojang.bridge.game.PackType; +import com.unlikepaladin.pfm.blocks.models.AbstractBakedModel; import com.unlikepaladin.pfm.client.PathPackRPWrapper; import com.unlikepaladin.pfm.runtime.PFMDataGenerator; import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; @@ -30,6 +31,7 @@ public class PFMModResourcePackCreatorMixin { @Inject(method = "register(Ljava/util/function/Consumer;Lnet/minecraft/resource/ResourcePackProfile$Factory;)V", at = @At("TAIL")) private void addPFMResources(Consumer consumer, ResourcePackProfile.Factory factory, CallbackInfo ci) { if (type == ResourceType.CLIENT_RESOURCES) { + AbstractBakedModel.reloading = true; PackResourceMetadata packResourceMetadata = new PackResourceMetadata(new LiteralText("Runtime Generated Assets for PFM"), SharedConstants.getGameVersion().getPackVersion(PackType.RESOURCE)); consumer.accept(factory.create("pfm-asset-resources", new LiteralText("PFM Assets"), true, () -> new PathPackRPWrapper(Suppliers.memoize(() -> { diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java index d95dd4010..031f29d9f 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/ForgeCoffeeBasicTableModel.java @@ -198,8 +198,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction } } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -222,8 +222,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu secondaryQuads.addAll(getTemplateBakedModels().get(7).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java index 55dd8aac0..f7655a27f 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/forge/UnbakedCoffeeBasicTableModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.basicCoffeeTable.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedCoffeeBasicTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeCoffeeBasicTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/forge/UnbakedBasicLampModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/forge/UnbakedBasicLampModelImpl.java index 3412042b3..165efe90a 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/forge/UnbakedBasicLampModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicLamp/forge/UnbakedBasicLampModelImpl.java @@ -1,15 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.basicLamp.forge; -import com.unlikepaladin.pfm.data.materials.WoodVariant; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; -import net.minecraft.client.texture.Sprite; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; public class UnbakedBasicLampModelImpl { - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - return new ForgeBasicLampModel(settings, modelParts); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + + BakedModel model = new ForgeBasicLampModel(settings, modelParts); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); + return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/ForgeBasicTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/ForgeBasicTableModel.java index b251cc287..1feba20a8 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/ForgeBasicTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/ForgeBasicTableModel.java @@ -199,8 +199,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction } } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -223,8 +223,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu secondaryQuads.addAll(getTemplateBakedModels().get(7).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/UnbakedBasicTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/UnbakedBasicTableModelImpl.java index c31845be0..57f19280c 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/UnbakedBasicTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/forge/UnbakedBasicTableModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.basicTable.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedBasicTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeBasicTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/forge/UnbakedBedModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/forge/UnbakedBedModelImpl.java index b08c211e8..7582f4bba 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/forge/UnbakedBedModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/bed/forge/UnbakedBedModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.bed.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedBedModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeBedModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/forge/UnbakedChairModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/forge/UnbakedChairModelImpl.java index 0de1596ad..4bce34d44 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/forge/UnbakedChairModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/forge/UnbakedChairModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.chair.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeChairModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/forge/UnbakedChairClassicModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/forge/UnbakedChairClassicModelImpl.java index 66a6f7447..acecc8da4 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/forge/UnbakedChairClassicModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/forge/UnbakedChairClassicModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.chairClassic.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairClassicModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeChairClassicModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/forge/UnbakedChairDinnerModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/forge/UnbakedChairDinnerModelImpl.java index 8dd579ee0..d473d9ff5 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/forge/UnbakedChairDinnerModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/forge/UnbakedChairDinnerModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.chairDinner.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairDinnerModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeChairDinnerModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/forge/UnbakedChairModernModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/forge/UnbakedChairModernModelImpl.java index 57c7f19c2..c6a2d1b31 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/forge/UnbakedChairModernModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/forge/UnbakedChairModernModelImpl.java @@ -1,20 +1,22 @@ package com.unlikepaladin.pfm.blocks.models.chairModern.forge; import com.unlikepaladin.pfm.blocks.models.chairDinner.forge.ForgeChairDinnerModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedChairModernModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeChairModernModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java index b2fbd82ca..160e2edd1 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/ForgeClassicCoffeeTableModel.java @@ -84,8 +84,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -104,8 +104,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java index 309cf0373..9b4c81ee8 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicCoffeeTable/forge/UnbakedClassicCoffeeTableModelImpl.java @@ -1,20 +1,20 @@ package com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.forge; -import com.unlikepaladin.pfm.blocks.models.classicTable.forge.ForgeClassicTableModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicCoffeeTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeClassicCoffeeTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/forge/UnbakedClassicNightstandModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/forge/UnbakedClassicNightstandModelImpl.java index 0e66b54cd..16ce49883 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/forge/UnbakedClassicNightstandModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicNightstand/forge/UnbakedClassicNightstandModelImpl.java @@ -1,21 +1,24 @@ package com.unlikepaladin.pfm.blocks.models.classicNightstand.forge; +import com.unlikepaladin.pfm.blocks.models.classicCoffeeTable.forge.ForgeClassicCoffeeTableModel; import com.unlikepaladin.pfm.blocks.models.classicTable.forge.ForgeClassicTableModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.texture.Sprite; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicNightstandModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeClassicNightstandModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/forge/UnbakedClassicStoolModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/forge/UnbakedClassicStoolModelImpl.java index dd8269033..fd1b7eec8 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/forge/UnbakedClassicStoolModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicStool/forge/UnbakedClassicStoolModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.classicStool.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeClassicStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/ForgeClassicTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/ForgeClassicTableModel.java index 4d4b74f00..3aeb2ba86 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/ForgeClassicTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/ForgeClassicTableModel.java @@ -85,8 +85,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -105,8 +105,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu secondaryQuads.addAll(getTemplateBakedModels().get(4).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/UnbakedClassicTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/UnbakedClassicTableModelImpl.java index 53d30cf77..0962eafa0 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/UnbakedClassicTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/classicTable/forge/UnbakedClassicTableModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.classicTable.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedClassicTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeClassicTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/ForgeDinnerTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/ForgeDinnerTableModel.java index e379f3699..11ce0438f 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/ForgeDinnerTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/ForgeDinnerTableModel.java @@ -79,8 +79,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -94,8 +94,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu List secondaryQuads = new ArrayList<>(getTemplateBakedModels().get(3).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/UnbakedDinnerTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/UnbakedDinnerTableModelImpl.java index 68347ffb3..e2ec3fc5b 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/UnbakedDinnerTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/forge/UnbakedDinnerTableModelImpl.java @@ -1,19 +1,22 @@ package com.unlikepaladin.pfm.blocks.models.dinnerTable.forge; +import com.unlikepaladin.pfm.blocks.models.classicTable.forge.ForgeClassicTableModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedDinnerTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeDinnerTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java index e53c9a872..293d8df0f 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/forge/PFMForgeBakedModel.java @@ -1,6 +1,5 @@ package com.unlikepaladin.pfm.blocks.models.forge; -import com.google.common.collect.Iterables; import com.mojang.datafixers.util.Pair; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.blocks.models.AbstractBakedModel; @@ -26,6 +25,7 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.IntStream; public abstract class PFMForgeBakedModel extends AbstractBakedModel implements PFMBakedModelGetQuadsExtension { @@ -48,7 +48,7 @@ public IModelData getModelData(@NotNull BlockRenderView world, @NotNull BlockPos return tileData; } - Map> separatedQuads = new ConcurrentHashMap<>(); + Map, List> separatedQuads = new ConcurrentHashMap<>(); public List getQuadsWithTexture(List quads, List toReplace, List replacements) { if (quads == null) return Collections.emptyList(); @@ -65,31 +65,41 @@ public List getQuadsWithTexture(List quads, List t if (toReplace.equals(replacements)) return quads; - for (BakedQuad quad : quads) { - Identifier sprite = quad.getSprite().getId(); - if (separatedQuads.containsKey(sprite)) { - if (!separatedQuads.get(sprite).contains(quad)) { - List newQuadList = new ArrayList<>(separatedQuads.get(sprite)); + for (BakedQuad quad : quads) { + SpriteData sprite = new SpriteData(quad.getSprite()); + Pair pair = new Pair<>(sprite.getId(), sprite); + if (separatedQuads.containsKey(pair)) { + if (!separatedQuads.get(pair).contains(quad)) { + List newQuadList = new ArrayList<>(separatedQuads.get(pair)); newQuadList.add(quad); - separatedQuads.put(sprite, newQuadList); + separatedQuads.put(pair, newQuadList); } continue; + } else if (!separatedQuads.isEmpty()) { + AtomicReference> del = new AtomicReference<>(null); + separatedQuads.keySet().forEach(identifierSpriteDataPair -> { + if (identifierSpriteDataPair != null && sprite.getId().equals(identifierSpriteDataPair.getFirst())){ + del.set(identifierSpriteDataPair); + } + }); + if (del.get() != null) + separatedQuads.remove(del.get()); } List list = new ArrayList<>(); list.add(quad); - separatedQuads.put(sprite, list); + separatedQuads.put(pair, list); } List transformedQuads = new ArrayList<>(quads.size()); - for (Map.Entry> entry : separatedQuads.entrySet()) { - Identifier keyId = entry.getKey(); + for (Map.Entry, List> entry : separatedQuads.entrySet()) { + Identifier keyId = entry.getKey().getFirst(); int index = IntStream.range(0, toReplace.size()) .filter(i -> keyId.equals(toReplace.get(i).getId())) .findFirst() .orElse(-1); if (index != -1) { - Sprite replacement = Iterables.get(replacements, index, toReplace.get(index)); + SpriteData replacement = new SpriteData(replacements.get(index)); transformedQuads.addAll(getQuadsWithTexture(entry.getValue().stream().filter(quads::contains).toList(), replacement)); } else { transformedQuads.addAll(entry.getValue().stream().filter(quads::contains).toList()); @@ -98,8 +108,8 @@ public List getQuadsWithTexture(List quads, List t return transformedQuads; } - Map, BakedQuad> quadToTransformedQuad = new ConcurrentHashMap<>(); - public List getQuadsWithTexture(List quads, Sprite sprite) { + Map, BakedQuad> quadToTransformedQuad = new ConcurrentHashMap<>(); + public List getQuadsWithTexture(List quads, SpriteData spriteData) { List transformedQuads = new ArrayList<>(quads.size()); // UV Element index @@ -107,15 +117,17 @@ public List getQuadsWithTexture(List quads, Sprite sprite) // I basically have to disable caching if Optifine is present, otherwise it breaks uvs quads.forEach(quad -> { - Pair quadKey = new Pair<>(sprite.getId(), quad); - if (quad.getSprite().getId() == sprite.getId() && !quadToTransformedQuad.containsKey(quadKey) && !PaladinFurnitureMod.isOptifineLoaded()) { + Pair quadKey = new Pair<>(spriteData, quad); + + if (quad.getSprite().getId() == spriteData.getId() && !quadToTransformedQuad.containsKey(quadKey)) { quadToTransformedQuad.put(quadKey, quad); transformedQuads.add(quad); } - else if (quadToTransformedQuad.containsKey(quadKey) && !PaladinFurnitureMod.isOptifineLoaded()) { + else if (quadToTransformedQuad.containsKey(quadKey)) { transformedQuads.add(quadToTransformedQuad.get(quadKey)); } else { + Sprite sprite = spriteData.getSprite(); int[] vertexData = new int[quad.getVertexData().length]; System.arraycopy(quad.getVertexData(), 0, vertexData, 0, vertexData.length); @@ -169,4 +181,42 @@ public Sprite getParticleSprite() { public void appendProperties(ModelDataMap.Builder builder) { builder.withProperty(STATE); } + + + + public static class SpriteData { + float minU, maxU, minV, maxV; + int x, y; + Identifier id; + Sprite sprite; + + public SpriteData(Sprite sprite) { + this.sprite = sprite; + this.minU = sprite.getMinU(); + this.maxU = sprite.getMaxU(); + this.minV = sprite.getMinV(); + this.maxV = sprite.getMaxV(); + this.x = sprite.getX(); + this.y = sprite.getY(); + this.id = sprite.getId(); + } + + @Override + public boolean equals(Object obj) { + return obj instanceof SpriteData && ((SpriteData) obj).id == id && ((SpriteData) obj).minV == minV && ((SpriteData) obj).maxV == maxV && ((SpriteData) obj).minU == minU && ((SpriteData) obj).maxU == maxU && ((SpriteData) obj).x == x && ((SpriteData) obj).y == y; + } + + public Sprite getSprite() { + return sprite; + } + + public Identifier getId() { + return id; + } + + @Override + public int hashCode() { + return Objects.hash(minU, maxU, minV, maxV, x, y, id); + } + } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/forge/UnbakedKitchenCabinetModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/forge/UnbakedKitchenCabinetModelImpl.java index d3321462f..d28b139ca 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/forge/UnbakedKitchenCabinetModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/forge/UnbakedKitchenCabinetModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenCabinet.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenCabinetModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenCabinetModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/forge/UnbakedKitchenCounterModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/forge/UnbakedKitchenCounterModelImpl.java index b1446b9de..170a6e781 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/forge/UnbakedKitchenCounterModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/forge/UnbakedKitchenCounterModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.kitchenCounter.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenCounterModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenCounterModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/forge/UnbakedKitchenCounterOvenModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/forge/UnbakedKitchenCounterOvenModelImpl.java index 78ba420da..6d2e556f3 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/forge/UnbakedKitchenCounterOvenModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenCounterOven/forge/UnbakedKitchenCounterOvenModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.kitchenCounterOven.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenCounterOvenModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenCounterOvenModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/forge/UnbakedKitchenDrawerModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/forge/UnbakedKitchenDrawerModelImpl.java index bbe97353a..db4c45a19 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/forge/UnbakedKitchenDrawerModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/forge/UnbakedKitchenDrawerModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.kitchenDrawer.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenDrawerModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenDrawerModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/forge/UnbakedKitchenSinkModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/forge/UnbakedKitchenSinkModelImpl.java index bb7d87d9b..e5eca30e1 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/forge/UnbakedKitchenSinkModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/forge/UnbakedKitchenSinkModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenSink.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenSinkModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenSinkModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/forge/UnbakedKitchenWallCounterModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/forge/UnbakedKitchenWallCounterModelImpl.java index 9b559f013..99da9d449 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/forge/UnbakedKitchenWallCounterModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallCounter/forge/UnbakedKitchenWallCounterModelImpl.java @@ -1,21 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenWallCounter.forge; -import com.unlikepaladin.pfm.blocks.models.kitchenDrawer.forge.ForgeKitchenDrawerModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; -import net.minecraft.client.texture.Sprite; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenWallCounterModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenWallCounterModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/forge/UnbakedKitchenWallDrawerModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/forge/UnbakedKitchenWallDrawerModelImpl.java index 33c483354..60842eea9 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/forge/UnbakedKitchenWallDrawerModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/forge/UnbakedKitchenWallDrawerModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenWallDrawer.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenWallDrawerModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenWallDrawerModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/forge/UnbakedKitchenWallDrawerSmallModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/forge/UnbakedKitchenWallDrawerSmallModelImpl.java index 5d4a5d2a1..e1dacb705 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/forge/UnbakedKitchenWallDrawerSmallModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/kitchenWallDrawerSmall/forge/UnbakedKitchenWallDrawerSmallModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.kitchenWallDrawerSmall.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedKitchenWallDrawerSmallModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeKitchenWallDrawerSmallModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/ForgeLadderModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/ForgeLadderModel.java index 523cfefa9..4b1a29973 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/ForgeLadderModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/ForgeLadderModel.java @@ -33,7 +33,7 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction if (state != null && state.getBlock() instanceof SimpleBunkLadderBlock) { int offset = state.get(SimpleBunkLadderBlock.UP) ? 1 : 0; Sprite sprite = getSpriteList(state).get(0); - return getQuadsWithTexture(getTemplateBakedModels().get(offset).getQuads(state, side, rand, extraData), sprite); + return getQuadsWithTexture(getTemplateBakedModels().get(offset).getQuads(state, side, rand, extraData), new SpriteData(sprite)); } return Collections.emptyList(); } @@ -46,6 +46,6 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction @Override public List getQuads(ItemStack stack, @Nullable BlockState state, @Nullable Direction face, Random random) { Sprite sprite = getSpriteList(stack).get(0); - return getQuadsWithTexture(getTemplateBakedModels().get(0).getQuads(state, face, random), sprite); + return getQuadsWithTexture(getTemplateBakedModels().get(0).getQuads(state, face, random), new SpriteData(sprite)); } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/UnbakedLadderModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/UnbakedLadderModelImpl.java index d61375a67..08dc7f5bf 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/UnbakedLadderModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/ladder/forge/UnbakedLadderModelImpl.java @@ -1,12 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.ladder.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; public class UnbakedLadderModelImpl { - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - return new ForgeLadderModel(settings, modelParts); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + + BakedModel model = new ForgeLadderModel(settings, modelParts); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); + return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/forge/UnbakedLogStoolModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/forge/UnbakedLogStoolModelImpl.java index bc6e1b9c2..946266d5e 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/forge/UnbakedLogStoolModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logStool/forge/UnbakedLogStoolModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.logStool.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedLogStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeLogStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/ForgeLogTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/ForgeLogTableModel.java index 64724b3bb..b06738a2a 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/ForgeLogTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/ForgeLogTableModel.java @@ -78,8 +78,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -93,8 +93,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu List secondaryQuads = new ArrayList<>(getTemplateBakedModels().get(3).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/UnbakedLogTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/UnbakedLogTableModelImpl.java index 9cc756c27..d3f71cba6 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/UnbakedLogTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/logTable/forge/UnbakedLogTableModelImpl.java @@ -1,19 +1,21 @@ package com.unlikepaladin.pfm.blocks.models.logTable.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class UnbakedLogTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeLogTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java index 823778e32..da3f497d4 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/ForgeModernCoffeeTableModel.java @@ -78,8 +78,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -93,8 +93,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu List secondaryQuads = new ArrayList<>(getTemplateBakedModels().get(3).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java index b14b7858e..5d1d884e1 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernCoffeeTable/forge/UnbakedModernCoffeeTableModelImpl.java @@ -1,20 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.modernCoffeeTable.forge; -import com.unlikepaladin.pfm.blocks.models.modernDinnerTable.forge.ForgeModernDinnerTableModel; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedModernCoffeeTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeModernCoffeeTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java index 2e8737418..6fcfb2d95 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/ForgeModernDinnerTableModel.java @@ -79,8 +79,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction secondaryQuads.addAll(getTemplateBakedModels().get(3).getQuads(state, side, rand, extraData)); } List spriteList = getSpriteList(state); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } return Collections.emptyList(); @@ -94,8 +94,8 @@ public List getQuads(ItemStack stack, @Nullable BlockState state, @Nu List secondaryQuads = new ArrayList<>(getTemplateBakedModels().get(3).getQuads(state, face, random)); List spriteList = getSpriteList(stack); - List quads = getQuadsWithTexture(baseQuads, spriteList.get(0)); - quads.addAll(getQuadsWithTexture(secondaryQuads, spriteList.get(1))); + List quads = getQuadsWithTexture(baseQuads, new SpriteData(spriteList.get(0))); + quads.addAll(getQuadsWithTexture(secondaryQuads, new SpriteData(spriteList.get(1)))); return quads; } } \ No newline at end of file diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/UnbakedModernDinnerTableModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/UnbakedModernDinnerTableModelImpl.java index 053ecafbe..de81d8bb2 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/UnbakedModernDinnerTableModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernDinnerTable/forge/UnbakedModernDinnerTableModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.modernDinnerTable.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedModernDinnerTableModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeModernDinnerTableModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/forge/UnbakedModernStoolModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/forge/UnbakedModernStoolModelImpl.java index 252689923..7b2bd4482 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/forge/UnbakedModernStoolModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/modernStool/forge/UnbakedModernStoolModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.modernStool.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedModernStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeModernStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/forge/UnbakedSimpleStoolModelImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/forge/UnbakedSimpleStoolModelImpl.java index 93547a119..6354fd096 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/forge/UnbakedSimpleStoolModelImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/blocks/models/simpleStool/forge/UnbakedSimpleStoolModelImpl.java @@ -1,19 +1,19 @@ package com.unlikepaladin.pfm.blocks.models.simpleStool.forge; +import com.unlikepaladin.pfm.runtime.PFMRuntimeResources; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.util.Identifier; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class UnbakedSimpleStoolModelImpl { - static Map modelMap = new ConcurrentHashMap<>(); - public static BakedModel getBakedModel(ModelBakeSettings settings, List modelParts) { - if (modelMap.containsKey(settings)) - return modelMap.get(settings); + public static BakedModel getBakedModel(Identifier modelId, ModelBakeSettings settings, List modelParts) { + if (PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().containsKey(settings)) + return PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().get(settings); + BakedModel model = new ForgeSimpleStoolModel(settings, modelParts); - modelMap.put(settings, model); + PFMRuntimeResources.modelCacheMap.get(modelId).getBakedModels().put(settings,model); return model; } } From 95ba136094fe7851f2c3f63ce964ff38cf1d65d3 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:35:39 -0600 Subject: [PATCH 05/17] Update to Github Actions v4 --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d52bc98c7..f56e0345d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,11 +19,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} - name: make gradle wrapper executable @@ -33,13 +33,13 @@ jobs: run: ./gradlew build - name: capture fabric build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Fabric-Artifacts path: fabric/build/libs/ - name: capture forge build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Forge-Artifacts path: forge/build/libs/ From 2fdb53f8a4fd9110f1e34ee4671cec5437c0f6d4 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:36:35 -0600 Subject: [PATCH 06/17] Forgot distribution in actions --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f56e0345d..2f265641c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: - name: setup jdk ${{ matrix.java }} uses: actions/setup-java@v4 with: + distribution: temurin java-version: ${{ matrix.java }} - name: make gradle wrapper executable if: ${{ runner.os != 'Windows' }} From 11724973d799954334d00993c48e66605b7499ce Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sun, 29 Sep 2024 22:13:27 -0600 Subject: [PATCH 07/17] Update trashcan collision to match new appearance Add loading overlay, disabled for now. --- .../pfm/blocks/TrashcanBlock.java | 2 +- .../client/screens/PFMGeneratingOverlay.java | 153 +++++++++++++++++- .../screens/widget/PFMOptionListWidget.java | 1 + .../pfm/runtime/PFMAssetGenerator.java | 10 +- .../pfm/runtime/PFMDataGenerator.java | 9 +- .../pfm/runtime/PFMResourceProgress.java | 2 +- .../pfm/runtime/PFMRuntimeResources.java | 11 +- 7 files changed, 174 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/TrashcanBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/TrashcanBlock.java index 7fae5afe4..1502a4145 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/TrashcanBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/TrashcanBlock.java @@ -40,7 +40,7 @@ public BlockRenderType getRenderType(BlockState state) { return BlockRenderType.MODEL; } - public static final VoxelShape TRASHCAN = VoxelShapes.union(createCuboidShape(2, 0, 2, 13, 13, 13), createCuboidShape(1, 12, 1, 14, 16, 14), createCuboidShape(3.5, 16, 6.5,11.5, 18, 8.5)); + public static final VoxelShape TRASHCAN = VoxelShapes.union(createCuboidShape(2, 0, 2, 13, 13, 13), createCuboidShape(1, 12, 1, 14, 15, 14), createCuboidShape(3.5, 14.9, 6.5,11.5, 16, 8.5)); public static final VoxelShape TRASHCAN_OPEN = VoxelShapes.union(createCuboidShape(2, 0, 2, 13, 13, 13), createCuboidShape(10.5, 0, 0, 19.5, 13, 14)); @Override diff --git a/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java b/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java index 27970a0ab..e868240f8 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java +++ b/common/src/main/java/com/unlikepaladin/pfm/client/screens/PFMGeneratingOverlay.java @@ -1,19 +1,82 @@ package com.unlikepaladin.pfm.client.screens; +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; +import com.unlikepaladin.pfm.runtime.PFMGenerator; import com.unlikepaladin.pfm.runtime.PFMResourceProgress; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.hud.BackgroundHelper; import net.minecraft.client.gui.screen.Overlay; -import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.SplashOverlay; +import net.minecraft.client.resource.metadata.TextureResourceMetadata; +import net.minecraft.client.texture.NativeImage; +import net.minecraft.client.texture.ResourceTexture; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.resource.DefaultResourcePack; +import net.minecraft.resource.ResourceManager; +import net.minecraft.resource.ResourceType; +import net.minecraft.util.Identifier; import net.minecraft.util.Util; +import net.minecraft.util.math.MathHelper; +import org.lwjgl.opengl.GL11; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Base64; public class PFMGeneratingOverlay extends Overlay { private long reloadCompleteTime = -1L; private long reloadStartTime = -1L; private final boolean reloading; + private static final String logo = "iVBORw0KGgoAAAANSUhEUgAAAwAAAAFACAMAAAA8mOv5AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAMAUExURUdwTAAAAAAAAAAAAAAAAAAAAAIBAQAAAAAAAAAAAAEAAAEBAAEAAAAAAAAAAAAAAAQDAwQCAgAAAAMCAgMCAgIBAQAAAAAAAAEBAQIBAQAAAAEAAAIBAQICAQIBAAIBAQEAAAAAAAQDAwEAAAICAQAAAAQDAwAAACkpKTcYAJaWlsyENc5MB3p6eigoKCoqKouLi5GRkYSEhHx8fM1uI4mJiYeHh4WFhYyMjIKCgoaGhpKSkpOTk816LX9/f42NjYiIiJSUlM1eF46Ojn5+fn19fcyBMoCAgM1mHQICAYqKipCQkM1wJZWVlY+Pj81/Mc18Ls1yJj07OkAdAgQDAoGBgc13K81oHnd3d81hGc1+MM10KAEBAHt7ezQXAc1kGzEXAjsaAc1XED4YBc5QCs5SC81qIMyCM81ZEnR0dBAQEIODg85PCs12KRsNAsyDNM5NCM5SDc1jGwcGBU0kBQcHB2RkZM11KXh4eEgiBwUEBM5VDxwbGsZKCB8dHc1fFxEJAw8ODSQRAs1vJM1bFCUkI81VD0sjBgkEABgLAs1rIRkYGBQTEy0tLUQeAxcWFSIhIQoJCC8VAiEOAQ0GAiAfHiwTACgTBGtra85UDhUJAG9vb2BgYA0MCz8dBFpZWctLB8yAMTc2NTobA2dnZyMiIiYlJWhoaFZWVsNyKc1dFjgcCF1dXDUZBUZGRmkqBh4PBEFBQUIdAjkZAHJycc15LIs5CUNDQ3V1dT09PD4gCXEvBm1sbIpLFywVBb5YFlRTUlElBkA/Pzo5OTIxMUlJSU5OTZxUG5I6CYM1B2NjYmMsB79ICFwvD1UkBW42DpJKFa1lJLdGCXtAE4JAEchcFqldH7lUFFolBalJD7ZZGT4aAYFJGnM8EpJVHWAnBalVGFAhBLZhH0keAnkxB5o/CqNACGovCbpzLMBnIU0pEqBJEVcpCa5DCGMzD8h0KrtrJbdOELVqJjsYBHs4C0ggBMdrIsJ2LcRSEEUnEsRjHSkoJsl7LyspKK9uLQsKCR1PBlIAAAAndFJOUwAvBT0zOvmV9Cjp94M2EAmrdk9D07ccVt6cK13EbL/wjRWkZn0izvB2BTsAAG14SURBVHja7JzNTxtJFsA9jDZDmATyyc7mQ5nN7o5XSN7QID5CtQItgkbGKg6ISDnAHxDnaBkhCyHNISdAJIdISICQrDjhYCEhIQESB2Qgh/mXcsh2Vb1X1e2haEhbKMbvR2y3y9Wv3nv1XnV3dXUSCYIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCOIbabv2U71x1W7Nve9Lz5u1EnU90fTvi1X+ZqMkwNXmZL1x327N/e9IzeZ7bQ9qJet6ovXOxWp/t6lBEuBe3SVA+lqdJMDVtloFbaH1wgeq39oaJAFuF+ruCPCT3Zqb35GaLe3tv9RKVFvibz9frPZ3GiUBbqXrLgFu2K259h2peaetvaVGoh4kEg8vuJ+arzZIAlyru/gX4VAfCVCz05bHF27ZRPMPDZIAv9ZfAtypjwT47Ye/1+q05ddE4vEFa3/lxwZJgMf1lwAtTXWRAFceNU/WSNStROKXC9Z+8naDJMCD+kuA5ta6OJ6lJ9K1G42bWi5a+4cNkgByZFkYj8NhTrosd3SOfb74Lp4LlcyC5+et+yxi39gT4CdZIV88hyalv2iyBO3MfqtDivlwMGWtNeciayymxR2FROuVaGGzkTXO2J8yca81yI1gObKMd8SBfVV+7znHPu5qZdkNlexB9+1Y9/mECXArIgEWzqVJubId1uQQ2jn+VoeMLoQTYNGz1TyIrDGSl1OSt7SwkrXZ48gaZ+zPLFx4NwJqZDmO5bB+dQSYH4slZTEy7D5EJ4C6olnoj6VJ7AQYXAonwP9cW811jFlrjd/9BHjwz1Zzg2PB2uwG1uAxM2A+YrL5MvGjjKj1WP56qvw+58QRwiEBJj9bq5QxBuynpzdUKmZi2VOMmwCZ+XACvGVRJr23+q5vze+fXNJcTixYDxarWIPFTICPchKrQe6DSZdNx/JXt/L7Ey+OEPcNJMB65AiXvPm9J8D7cAK8t+ozjZcb1ho92aqr07VM1Cniu8GYCSAd0NIYCSAXzxS2Y/lrWfm9GOvI62DQlDuiTpiT/4hIgNl4CXAYeTVyVlsiw3sfJkqX+s96PZHMWavu4iliZ8wE2BFSHrU2RALIc8t8dyx/waG3EktIBuYw0tORF3nJuzZrmm5EjLhn4ihuArDDkgQH7yXrkLwykYy4bEe/mPnJzogjcTL5LGYCHETMtV0imuRVY7Yvlr82YsZL6FCf/mStUtFrIWwLtdogAeKdBOPl+Na3i/AkeIZvH9+3IQHsM2jVR5Nk2jpa9eGFwkzMBJB6p683xBHgbg1mTWBkPqhNAqxEJ4B1pWKTuq33pjYJsNlRi0A6dXzfzcGJ/Qvr0eRN9S0qawJ05iLHkDOe04pMKtxqiNsAMmLexpq/wRn81VhCXq/B0vdd6zzRnllobLNHLcB/4tYkASq1SgD7+N4Nt8y+PrceSxarjwDLtqpj4MLknzH1Vmn5r4ZIgDun34Y5T8B8iCXkOYRCfipqovS0pbotydrZEz8BcI5nre+v8wM8bHV3tNXIZ9tkg4vXHBsx9VZaNcRDkf9RN4K57BHx18HxJYq4KpIdwTt4qO9EdVHI2X/VyPRKFXkcZXAlFOuK6ua7kaHqTuFYOGIagJ/kfsGxsPl6VAJwZQ3synWLuMW5Vko1EdCpKgG4EsID3uH6FXCIUVoLxzmetafahx0h7/BnYHVuV/uGB4SINjYWkbewUrnyqjfjGiu0PD4bOHfjIUejymiBh04F4zo8o1sHH8qePtd2iVAr1je5vGYT71xtyi2uC2W59FqwEvwEs97pKVnO9c/Dq+V1yQBXReLjmSpan5byUIr/9qqAweKp3vFUiyDOL2BP9FnA7agEQANA4RS2CgKlKdNQ2M09jubKDZ0ARj8PbDMaoQu4MYFjIfoQ53jWnqMDPe1NVasPBu2JbXBsyOfYFa4rXyt6sX52/uPR3vHBci/DHpH1S3j1zlEG50ZJrk1RHg6YEWhZfAzOnzrXdqluBMsV6+sm6rGTsSNc6A/X84LhgFEpNjvVTHV6FF2oesMbyYv7l4XC5L5n2EgX0j7JWexi6CQdLNkhzt3ADiajHH05mL5/egIcaamg76ZotVBIz7vGAjYnSvwfNrgXNN/TR5o9zCCu4yUgkweCmnsuBBAPegBtynfDvm4wKsVnr770N2NBYBQBaZCxUyAtn5/Qt4WL5ZFBHdc4f1vEbNSJACEfyCncxw2lrzInUzp1ru0ycVvOnE3744vr6X/yw1NlaoPJH+QLNzzuv0Q5g07M9ftfGdM7ey9zeHj392AgDm9mlbgb5sMkJoCrekcIEQ34Ml1ZOXB/1XZ6CouGi56SCR+uh/NHc0wZJwQyXK+w4QZr+43qBJA6M2O6xDdSaobVladc7UGwVWzqBJhSe/o+Y8aJYs8hPfkrJUNzHlRSlRmo5b1QdZdHZlb+LB+PFxeLPnvHu8IcqQTewl4UO3EGbpR/UifZOUZdNE962cWWBIsN81TwQ3X2DvYz4QIGvSy+wrsb6P3AB3wZUeex2TG1lxLkv0z3g2DxU0Uvf4S21G+uq+fMO7F9rRRsDL+P/H8h1NrW5CEL6Mv8pMRWS4yhaQwTIL1hqqo/fQoUiAzmGlWNckH9XP2r/mW3gEMAC7lQCnMz/X1T67hwumz2Dfldu9T/61EjSko7kzGIZijYQjOHXbN/WLGwASg7qLeQtXf6XNslQj1B9QIDlAnUu+oGp7O3d7Srt7drlOl4hRfWc2dUJ847OooUOKav/Y6V0bXyLIUZGcLvuC5ydhg6N5B8Kmw7l4LPyJ68tlUlQIWZIJLyTQK4DAsZzpmsuzotlDKYAIfYtOMXO0pb/c9IwmBjrkl09fPLPJ7hg2hwg/9vZPOotJTN6zVuZYho7Xmmd4EmXTaqEmDf1d7UNqpKeKs8vyKPUy7oCdkbEusyB3ZHw1xjFdtsmMfi5Y3gdz2OIxwh3v1P9SG+M2fsjX++Lk7as2PMwUL4VL7TI33JUTu7QoCQp2fB+xyo6YPBNa7bE/v4YOe9HXZExEmFsIaqNmSWhdmuz1rVU+gVVwqXAmQXmwTwS1FBnQABi2SrqGMRtFCyHGO5C9qBivCDo7VGaTOYACuOjCzt2O4vuaq5zQMwVgjXrtVbasdBpfG07C3HKMawYb1aML/+eqBvoK+ra2BgoLenMyN/DWrAjM0OM92DFklBPzfCrWC5dCA7DA5VoSg7W22xnnl99qxKQ/mhvkyrkf4JBjNGwEZOMTuEgeI4mSMo3ERJTlUCPBlmqAX2MPRzn0kA20rF1hwcAUxkSF22oNWPDFPOf81CYRmCAEwOJQCa7FRtORmBeA97LAhjKUiA9D76DqxZ2dwqLpYW/tD/J1P6mGHuYCiyYGdIO8aUA8oQ+lo7nQDlZGCeaCGrWJqf/TL+Cj09MDMzk/Jfz2bkW0p887dTqSl/I/UsJb/NyASYaISnglvUQn4rAxh0HxmzVEG3F8OljtM5pOjJBMpHobC/WswOXhxkHJNqIXmvs5GPxUMCbLGqiEVVOoMioWxosFoVnQB2v7ycN5Qztlp4n1cM2gGjIHKZO/h0E2scO9HAVctBlWOMo5ZPeAh/MrewU97Vhk8XVNanxVtwO4cF4ptKzPuXP/5bH8kHluw+f/4VE6C731bnM0w+26V0f5hWPLfXwTXIxehwsi/VhQQ4JZpSoMmHU1Q5QwLsBp76/bpi9R4eAVZtNcbw3sbWGRLAmYuwbn8iEPnvFkrFveON1e3XQY/un+Ox+Aa4FdwuL8IOz9LRhT9Ki4fH5U+vno9W1dmMGsPYIQw1hbK1Tgan8I6sCZAyQZe2TFC0q6Hrs92gPRzrDmIlwMvgY+/ZlKXWC1icky7Hacv48WNEruDSumT2cGO7d+ykg/bM+f43osuOeh5s0+5znMpMliqVra2tncrO5ufV7hPH7nW7lKKe64jqXH/gGt86KK90RQSd5fqsXcXbaQmgrzpF1p2ci+dNgOTbvpNrdWUj7R4/RwJk1I0u+3ilrzlC7YnrFHnF8n/yruU1juSMg/NgSUIeh5C1TchhE8YXWy2Z6in1QVXQY5bphj4EG3Sw/gCNjkJCCLPgw54ksfbBIBgZgYksHYRAILAMOhjrcdC/lMOm6ntVlWZG2s36NCp7uruqvvrev35UP+SX7Z/xqZZb8Fr8fZwIx1yo66apw8UdbPBl1fN9aXOlgV9D23QU36qvlIY3JvkWffc/UfdkIJmMaFpuL9btvj3tm5iXO1moj8LMyahHdX/NyR0pQIrjBWvDWHRG+7bJ2CxOlACAevKKqpM0KgVA9/3Bwafd2YWpdruttNbGNDBGALBdDy+TNQPyAYpuSAJIouSdpGpT9/d9OfGun4wd7CPnG6bfCuDEKrRRuOWvv8gnKMek3PknPj3rE79xhbO68VDwDQ1PrD3frYkGaGscAW1437zVPeFhdcOE7t/C48czM/yQVne/05mZgW4SUxO7upEXnzBC3R+3SRfk5Er/6Y2nQPcIADgOzeHhTd6Zm+vIA3XnnU5nrgw2C/yb6AhQs36NWI9bK0uDp8yLvV7PXxS/ePPfwz6MknmrCzKkrmWDBPME7ftaRKDSqTxSTpxRJ7TczIDrXjA6YqZAons/HQBfj/8RAF6HWe2zk0r8leDW0rfw5ORq39VKciSsy5LTHOcmFo9KoCibAB9HurHqihx2u67y1kpKlsAKqxyYt2fn25cnszPfViiQQ1c30SXeqNf16Os5e3VJeSLsnVHnXnqYeHS1132UUZbwq0meAKBpovFNjIMhAPC7iaerS0u9V2cXKwZY5es8yVnXJTGJivNhw5NfOwEYpejN6CvjXUrExBMHoDSNTFqfI5tS6EpgaprGnL25UvD2YncpKeDq3439sxD4AtXSSpkUE23z3MzSrGuGDmNS6pL2KUBxdbgxEwNZ0ssiSYbJZc/0yRATE2vTuPXy8xs/jkgA2IdRXlMDAkDn5nxAlcW+wb7EpggAsaJeCV6UD1MALG28Ozy/2N7a7B+vPKtMQ6Ypvnd90IhDTGJ4c8E3wPUV/5PdTcmizRD/lqI8OKzih0VOm6uBkJqyV8qcP+Q+PZ+dXYkKnCn+duzfCv4jfBex9yTExpgmyW7OX6KJA8QJahcTCpOEunozkHXrnJxh4X6W51svJWW9LgwEn8j7rRtvhBEALoHeBFXg/8EQADjuDcoykl5mEACNMU2SUekR4OwhiQh7B8+1ydn6A8rAdO/hR/DDgeua7DVxf6A30aIxKAuqWhBVGj0hmptISIgVuzMOsrl0CDhHhq5o469hLq470Ry3twHW2yVb78xPiuZL0/VpqJeeQCe0+hmeVfSeQZ/bkWkfSwPXgiZfG8i6N5pHw4bGZcHvsy5rTW2pOqXZvvkD6QSALeZMopDfEACcsAQNZCVuCABibzCQMEfiI0D3XU6tCAMYVXqZigHwWfPIjCzWmGqlAECRlsaRatE78VVJI5FAi5dKPwTYsebvQ0CRNKrFFiOSPrd6bZ1Ql9utW/FW8K/gu4ivrHiDnaMxnFpOTNashkJJSxRQZukpzoIii2Ejt08PXnPtSPw5wn7xjK8TjiW6WnIAa3s3z0/8jY4AAqKQSVoPAmCpz+nB5iRp9C7TPJZ00FyLAfDRSkoREcsUAAAnQ1oxO1jx19xe5lry3YhXjLAj1gHYpLmOwmE0zyl9p0VVHQxLUCAONnr+6aloRhFZ7t6KW8H34ax6IgO7/TKTGGM153m1R8q3ZDoL3TyKvkf2xvo2E432iydvB7JuI8uYAFZQy+QGzbGLADJ3KwP9GVJF5/B/vm5at9VazqIEyDKqfRgGAOxEOSDKNUQAIEsjvyDV48iuI0MiTETnbchiALAWQGOQMMvMJd9OngIKQ/yNISe5TfalG+WGZZzXHAKDPH3NMADWKVYZO5j3XplOCgrJJpYF/ETeX7wVbwXjw9CnEhwIv69llA3TPGmyUWF7yH2kdAsK4YSSXM2YlcvrwdkSToYsjoHmr5q1VkhIRuIy5Jole/BRfybvG5yyWhY9aDSI+DwIgHk2W2fBPgHAWSatRECm6QQAfcoytFg4uWr1IOEU/iHSfBu/N7/axsbAQYsDovbI7yFOJE+HfQQcT0IY2cbEI9HWZpvNYyKM29h/If0uftCK4yEekE1Jy49RM5PQak927FeG+zLvHPniUSjuyPpvyo7gbV/k0+cd6tI68MJYH9x8j/Ib+nBIoqGmzDp1J/07jyYmHuFvDQCQqospQwDong3zCurSCad23d1sVFF8UToR80lkbjKbTqZTKZHukSm8c0nYCaL4imKxHRulw3KgQGs10DxzK16Lv/NXnDUfGcBsYXd305Xd3ZXRNDSR93Fo5+ZTnyCyoy9etloHQwllTzg1UtDnm0+B6CPix0PHv/NTsKFseQAMJQynQCPLTASA5ZFUFQPg+5Ek88zlOPsCha8oVud+IaP2D7fitXh8f2rrl/mK8vLz8LzuJuk4tdjqnl8buh9HA+BdAMDd/xMA6ypU90cBoPqZALgcDYCNGwEgx9gvAoDlLwWnAq5exv2PZeP7U91+5Y+BlV/SVuVrWbSM1xX/pzb6FMGnwfC733YajIcOD9uBWySJD969fFQyVQEAz//wkwBQJcooD4BI7+0bAXA2aM8QAFy3A2FOOyMp5OL/6MakrG7OWzmebHIkQxwH62EZahRcPHn7eszvhN3Dqcc5Vamq8gurlDfe13zVb1SygZtuG1uAyjfSYX4Pq0imeH1yeHi4UEnXtKv2XSXDwcAL2cl8uPUaYCvEi7SpVPYgAODv1z7b1D1mRXAkMds+PLwgzXyrU+3DE5GDeMygJgAQWr9ErUCzTH2bAMCTZeQOllxVeefoFd/ndYwVAV7BErllVafLxxHfhR4nnVSsGdc5Vlnwc8Z9WSUfSN9ydUuEpJIi/sTeb9tMYXzZVxL56uw2vBaPs+avpzCfhxTMc2UrpnBOvdKrCrpXtlUFNhgbBAklIA2kQCKZrWRExhN4a0FuxTQ0dCcA4P71AJgPStqgKYHSMvSqqkpNIdXthkx9ia6V8PJLWyVHgJQL7EaUuvz4Q3h6dU1V1JPKUmp6cRgXBq6S/Q16PvW/OFkWHZ6128M+R2/F+qthHRZsqcAHJr66N94A+AuddFRRrvCG87TlgNsouJZSgHxm7QLd6z0iQuZho0S3Ku5iBjYIs5XcwpE2dTVdAgBGfRmOALA6x5omYbWeJSah73Rb1ucH/EMTUaaNjgBirhVNgVcMgH0SgqnG1AcvdsKX/deDb6vgBN+4kADAIkws7xxs6lTQHvFF1sTGxXA6r8CayhLsLO9skLnlkNqBnR61wBH592P+x7LvUsrZPLfu5x3jtvhpKbeF7fiz0JFTa2inVOjOewLf67MKx9OKWAoviAIRQIvnzU/d7aigQyLH5gEAX/3mWotWOzBC5YEJvZ2syA6yMY86UQbkhhwBVLAhRy/5/HCbCQC22TmWOCgv2lEXH+QNLfEZ+zQHqtzyR7FbeygF+5Ei9RB7QmGzG42RyEVubuX560PhxS9mSyw5jjbEkcJkQ7wVTkqM+WvxOAv6vTfYu9yXoqBtawu3Ktx2oWxRKN+XQx+5CKru9xAj2H1GEXNxp7gVOfrdDS5cg/s5Pgp5gBxiCS08YfjAYqsbAyOAD8oMfyto5KEZAdCa8oP9QLLGrVQBaheWuBZoJGsBGxbUUaLLBikLnewFTL/oPkBrD9MdeFpL7BwvZaf4ur03halVkK+LnO1vyyP8OWrouShr2TNAWgRFWWuL0UKTKHpu2ZPHMziQBbAtPCmCwFuhUAnL3gdmNg/F7t6Ct4Lv4B/VPbWJH/KQGIyFKFWLyEf4m8d7va8XMFjo1YIHFehaG9ZFAYmSU1iIUVuSLsguRA4GMuTcP/41zJw7d/6EkF5c4ICKZQXlEGGC0qNgEU6TILaQIwCkI+4HLMEfUi7P4yPApyJoGXvP8eQTu5cLBQLMijeYiBmdg8ZF6u5cdje2YE3iqCA39Chw5aPkRiHe5706mQ4rDkweABQiBPLmr/0C31hdBH/w+Ye56xdtWsOqDXsQyNMCm3Arl5bihJ6GnqZ25JETB6STNXF2y3ZOPSA6n3rEc+8YnTaOwsMM5s3U/8i7dtZGlizM3mSWZYPZYHbv3bt3dpcNpMQSdIObUlBRN4XSxQUTjH6A1aG5RghjmMCRbWYmuCCwjcHYYwXGIDBIBgXGr8B/aRi8dZ7d7Qdj39lIU5K6qqvP4zunzumX+lFKgF/+9vN/fvkLlhcvfvrp5ctXr169fvX69T8pATwpSURbAiYyHl4icdCiYCjsCS1NRk6ZYBCyw0aFjSlvAc7m1cp5tpuht+Rqf0bEXhU/44wIOi/5tsXIKp5DPvgmhRz1Lk80AeqRjtJ8yU5xSGV0WjwGLfIRcdn+d/BXMF483D4PDiCfwsPEWjw03AN1ooPHc4m0Qlwk+3Qeb6PCV7DMi0Qa80KTBgFWuVw2NgIMSVLoTTAJQ9u/e/zmverzcG496kkK1KVmpVFCRHGARS9gkOVqmbrHly7zvk5EQwjOst8STYC+pyxCR5Q0hk4J2XNSUuASPyhGNWk+KeMvVk+tRI/fV/NikCqI1PZ58Cx20GSevc7G0gMtXs72LtC/aPO8mGABTyRREkVJUVqVNlAEgoRGhgtfpX/QEvoIJq2ICaJCjIznPemhdhJQY+ZqCSbl9UtPvZf1nSvbkBTKyUhGSlhbaC9apnA0ARC+9AsnynaldzdeFXjvlEj+3ejP3SWQ2UgS4FSGQJnvsKD+6uC0SnUE9MVBx9H2U8okKdwRqdgIZrqzf1fwX//EzlqmUY0i8m8ko6xDoaNVEGgPj3EDl9FiDKmooIvui2SqSAgyORa8ih5Mv0AdPzkBuo6wMFzRXsEePWRPi+gkARpJsUooyYruJMC41B9VBItzau03UQVFyUbda4+S6srnDsqIkUTRQ5nGJK3RMx77U2v3r1lYKyq8xXoPZv9l2T/LTeY7w56JikKDTs1yd9FQglDxNZp7PDgPMCT3Ragi6e7oyZBENJTYsfmm//QEiO7DSMqgC0MKJIkukwT4JNvDEgquygkwkkXJPQvlJrb2iS6961w5+GnmD6ApYU+SB72asEROjuPas8r44VGC9ubsvyz7z6VVwUZjdLSVRb+j8LVwp9E3lYmeDn+U5OTJw9o13wZGEuDz4ySudK/z+eNk5QR4pMhbXeqPgs5P8a3bT/Lw8HkJcPG4JDyB1f9OEgDPY64eT39PtFzquuRbyok80+z/kQAb34YlL7YA35oAeh//owlgZK/9g/kKnoOnYN99XgJ8eVwSbUv+/h0kQH/n/eZ4uN/Jc5PnUZgEl4c2TM3XixzEDSNDPFLC2IYvtUAutw2owJ4IlbGmLXmS/lFO1MyXSyvKn/5Y1/eq1xisQSXLo9qU2lQb/FJPkQCAJGIMQgvCKwlwilyAURCbnPTmmgCDSCxCW6JcJctfBb+ZwmL0UqFsU9IacsRExuA0GIFT1mbQgpuFZyXAAcIuxkg8k/O2pD3Tt8XTSaD17UmGoZx7nC5bie28dzW6Gh+Hzxga4+NQxqHGvuMxf3jnfahc+DUwTtLjDfdVS7lrwDv4C4d5gaVKuP3kYV3R1M0NC8pz7/O8ohN0VPty7M29JkAFdMWKSgJUDK0UxXwjKAohHmZyI4etK7YCriyFnh/anZ4F54+vrodHgy2Xkk1MKZP8cOlZCbCh+nJfUgoot9sz/7Jsum5grzpufm9Lm9ODer1ZbzQadS2N8Kk3uBkW1uv8isgb9Jo3RoW5yHic2R9yOSzc60154s0yr7mWBt6hlEIMk+TL71eqZT0kzdIDDzSrrd7LNlaZm3hXwKReoDqPWrgVCMsJ4PmjggiZu7rQMtR+0avo9/WZkKyBLSIaJJcE2Ojl5k4C+UADxKf8KLvaAll5++vtu/XTRYHliRJaTrakb3dWnlLWbDFg3pQNNfv9mb8t/iXtwQYfk/8w1PynXYyWEIfuaL1JQc4x32wWSUDNUNHpkP7AgxCYOMMhTMPnzaWeLsHIcORtGG7HCeP97lt5ToMDCR6LRAG34qzTyfAXx/Cb26y1l7e4TMN3OqUXqR4UI6rB5rHpF3fevuVnPXrnS3mIlcM4LhIA5xz0O2yiX9C6YKQWzzCdQ9uJBk31utt2RO5FUzxZjbTOHWsCSLKTIwE8etBpjqxuT9HOYGn4Lgoo/BA8IwnQHqfZXPDSXEzeglq8Jz/o8+UVEiojdN6TpBeznwBnMJTGWRpLa9avYQBxZrij6/1mQ+Nf0gHDv1lfW9DAtRACgdtbCAdrHAaFkXhqH0PH4Grv8nMoXy4v90bj4e5g2gv0Q31QCcqwEmGWZBG20LIQXNAdWvaqtgYEgB36vU/pnOKBtxKbKAOXG+SVAKm1A2DXuznfawKYzcu9i1HYtzjcAiK9kxcwoA1e1dNc0EpJQNgsuQ4DWrRi0QTYFUBsTcAKmIMU+bO4OylSyqA2J4bzsx6+ZEGPsRatM5bFETKchq6eXg4Ki+CDX5SEiDFrSDh505fxghRSG1YVs35X8A+UAEcYZKk4wXbH4AB077j/qY6hD+v7UDc17nVHqNmkBHh3oiGXwvBBK8Xg80YvY752vev6Dr+6qrsTtrHtWrv/6/pxz0oC7Jx4jV4aEBxsr0npLQ43TP2wfeZcikSYENbpFiBVZkoACNpQUk2A/pY9OV75uNOFT7d7Cxv89sLS7cFRx8mtZ2teOD3lHKekNZ5qr0ZbiVbMT0cYndd3uw8NwSHPWPgaiuShvmcGFQBKTmiUC6T8d9qVcSnaD9JT1IgMoTckH3RbrwlwwS6gr3WcdpZH29IqA/hT72jEUGeKOsMikvT6hxlOgH/QI/tTmzmXQXSE4npLo+CTFMfhtP2h2NWpN3jHB5rNJm8EGg1KgLD+QpbUMW+QAcEZaitXObwdTr40hycdKb3p7sUqZsHtujxFtttDvpT4RSLhI6mEE5qDle4itjLHWjM6NP3EcZQ51E8xhVKKLcDS1uHK3v4iQ8k6k+Xh5XrIR3gTjvwnseaYuWyXtdVWRpgElWIExakmwFla5SpoNQGmgNjClkE1ElXK5zbHjr0K/E59DD+Wl6ax/EH3WbWBWEUEYnmBjLpYRNpIXijZh5l/WfaPtCtgK2WrPXLius3ae97hoa1As0EHxE06EMCEaBzg2YKNCQ/FvZ/VCyfbu4uHYb4SSnPb65VXlnQnOmoPl1QnWxu1zay0IGibo+H/VGEgJDxTSoDpSZpWCd+cbVTOkaxVJFR/5UTAmQJzVvRqAlw/apHu/A0e9SCfTD21mf1aiWVze1Dx2GTrUaemFadmqjXD7eCP/57hBMBLgT52INsz+KY2TrOb2igNzTj0xp9rt3q0Wy/2gGSTQPN03/dvHZAS/AfSqEKpIEau4lxYDg4OC7HbxjbOgLazO27c6tWc6xNkBSKQgJQZ4YEa+FP69dZqC4cWxYU5qnu0sWkiBoLB6khamk51F2gxZayZJakw92Z4/qF4lt0B8TI7uuguCrSaMIi8wg+ZPZHLN0aWIYCPGRPUWXrEK4ClQwWaCj9RpfzsvT02IpOayK04Ckosu2/rgE+WZINd9kecoXBybNk4VEosLPly5l+WjQnQjTMscRZDHGW7tVHGXb2VWh8in/d7cANQPgigJq90Yygpc6aUUMHbQaq+uW1pn4MVKFM8OREWA99gJK9MX+lgJwoJVUrNLGW5OB/kBtZRu/3fGFu8MJQJrcEv41i7QBmiAU1ZXCTACUhTOpCMeLK5/dOPRQJQn+BETTHwIXmclWQwkFjRgI16/dI58GRoEJyXQccQ1Q1bvrCdAQ2hwHM34COc5afmbaZZrHoUMeLJ1BA5gN9gUlJ0NGKccUbBH5NnoWKjMrKHf6GN/z788Q8zfAyACbASdzAWOxgpWXyNCYDNSdh3Wa3f/ROgyedDwwweCNBKdxO4LQQJcmNNv/ikrRt5XsxxKTkQqo5cx/7bnDDj0pgWi0woHZyPr9oLF3O4AEMbAjHOJl1+XL+wpTEHnMga6C7Q9H/cXb1rK8sVh0eKvISXFCF5afIeISTaZmaK7VO9W6h9uFDh/QNWrbAwQhhcqLKN7cIgsIxAyCsX5sIFga/BhfG1Xfhfulyc8z2z66+bXNJoLcn7cebMmTPnd+bM7MxuLibBvEkLvO/Ui54KqOmXv8QlLd8vWky0LUEFn8J/Bv5LFlUp38V0c8VIb382PRYF5UmxAbXSSxju7Azpu+fowvKKcZkzuCljfeneo4pAOd6zT8jzRLusu3dJTfGQqez/cvfa4wdWYfsDPRt9BD3AvEALYPO6bF8QHmB3CZ3BXQn4LQjSsVAvw6BhX52uWWguHGWzocCTK74qVOBs0dro6N+ngpLK6VXEZBFrLDcRae+mt3axSbyAys4LAGZgH44hXVAmSMGfCIBlg2cULAIgcmYO7wqzKr3i8ERBX9ViUnan1v0rn5VMqGQgJCoq3rttb48uEvUUkm+RHzff7LjzkYjGt1F4VpMzAPTKqMc8v9zqRMp3sbapQIVdcXlSjTT21F7hJ6R/3xbLVTsEZbt81rouXO5wdwHG8ggmriEQ9YZtAEh7wwyAS5cXrnCQEtgUpEjnyGzcg3Vwl8AXKhRJc8yD/2ESZ0v5nFYF8yIeDrYcZWIZ4VPO58fMH/MsiBrIlwyAT3hUxDIVXECkmvdsiUrOKQsUmKnI6uCsAYCloCLlIjkVjvgXwrPgvPEjBWJTQqGdvvdmxhCiL2mF8kUyg2T33BUsiisSSvh+bM5v2F+iMtxk+9iJFKR3lECfD92+EgEpt1l3SVDiipFS4S6Vhip8s2NaIsJisuqrgn/g3pkTKyyobl3WPoMaJZ1M1sBOKq9BkE/uhCX9YLa595jEDJdqUUwgn0YAODR6gRebNtUSHOvo3R7XGRl9IZDCD6ZjJKCYeMSgYNt0fOgEAJcCHy2a5gZfnXIBABBmDADJhlMkAGB5nRoK7TmGRMFakrO8y/QmnTMA3DL3KJF6AWcAuOeLrH1GguKhCYCTY8rjfG0qTkdldO7ept8RF3ENWW+h2RN9rnuifkh8/l6BzBouxqv+suwfVe3ptnkwmOv+GTYRR9j3zewOAA58RkRgUMRjPGdqlLWNKt2mqO+U7sXN7t+8SJG7t7erEwX1S5sBoP1KHhEAja0oOnfjrxHkSbluX6Q41rsOdy8XtPmanZMrOj0FqDdlN3czTeWetS/ekvTDVlOwwYqvCqbnwrWv66Ve7m6MdZ+cya5Ohgvi8W0gSDrEvSfqbmzmk47ctwDgazYZ43kFAJN6C/D89iIAIP1g9lWS9C9ubi7ge2ih3Uvb0iYvvK0de7HHWIz9qUrPnwOA+9Tavnpd4PxLr+mfHlf7Zdnf0XKAwaRe6IcBBiriE2g0Ien0ppPhbD4oA6D/smp1wnvLv0zT0VDh8psAMH4TAOc2Jvu/AeC6FfXz2jYVt9F6DgCL8r8EQPNNg725AODxiTD2wo20aS+gKr9svi7xaev6Odit8KrgP/Ptl3qhP7V2Tae0Vqld6WQ46P5mKRqkIehJxPni9qn1phd0S7XLm/83ANa+DQDvW2vnXwsA2EbPgn+vKp8BwCvY32quZmcZzlrt/osAuGm0woPrtwAwey7X363sZKDvfqKO6TE5YCe/5+1W1bF64jm4etPXZ2kkZB1hmcbv8PXKHeDRgc/mJnHjj82GnlEe+sfUQIn/dD0M+i1Kz0nlqv455Z/y6SgdstngqcBOuKQSMfVZAgDihFfSHPDX1wHA3Pn6Xqt96aLsJkFHSJzoYcrqsXmAp1oedgkHpSodgs6oHkyJ6dPy4f5pAwBrZ9IcIWo6Kg1p7bhXCyZFduwZ9KY1tZlGZW/YGn5M9ew419+u7KrgP/6LR2Y6ndJ1Svp1Z91We+pwH/9Y7V27FSaLYbgxsMlwbE6dBgCQZ4mqLM2fQpVgHpAX/RJ1ublkANikMVeKuYJIyEfJkXGHz5a0FwEgdEDUJwCs33FGIlH5LAAelYkCQHKoA6DEDFHG0vH1Id6qUNmplJKsJJISrwkAUF22bmxIFyEFKnYCTEoihs9Hm75GfCl9WUrZSiqsGzWfA4Zq6pRn0EU7lrJxvsBv28bTkD9qBnaoa3x4HpVWquoSAGw8yHkiKNlztVd2VfDfaS7cltYbKOvjHXiPXbJ9Uju3zYfeYh6dEkoNgEyT5iruQnKsEqyw8nr2oc+GQees9i4dHaO1UFUz6CjN3LpupXEiaqjVJVsfn3WOv51lR/ODy8tNMgiN8O/pCKnLcvxhdnbMxoa013pP6cSVIh/boeRA5yqzWqdX0TiXm0scGHvs0DHYCeVC6jNgkviwM+VWMgJg6UTRSPPremt0LHAxAFRO9SK/zB0BettcynhPho3vfZ11WF+uI9J3LeDks5jjFTfmvetyiaXY5CLBf0YuobeLbRCBmmtJ+oCtH1YVAP+k52hu9cf98aIPv/3+HsYhwzEdzOf9CY/PrY003A8x7pFxIaviLtD3KeVifgFn9y7f35/j6/XGy7H14C6ZL+TW7y8e8B8cQbpFf3FtLQCfhe+kv5gsFkBHlEI9XlBq5YNUmOnDYkL533Mk9QE59Bcoz/ktQPb2/d3ZZDxegDSW0SFym8zHkh/mgGeIt0YcQ77K+T6AJDNsYQbTPqZkQSjpHLOf6xk8Nb5HVxEyK/sOlWnB/Kef1+HMPRyNQfKh5baYzyEX1McD/jB3KPH4SxMAN4sFUKOcazOQjtlOJiipAmCLJFmQfvYE9oPTc9TnA9fW4gFqnj9ABunW7vAclQ61R6MX7R9XFQC/oReEbVSZr0bs4gfi8D1+vA8yQD00u6fZ0CEL6bxQ8XGUAn9GghQ4wNU0sNkbdbcpZKLRES/hFB2BCAdmKBpp0RdFG0moxYsPRt6GoUbSMknGcFGmZrf2WRigrWT+diB7hM0yamVEMOJp3T6AFBnT+0yjiB4lxlGAqkI5ZdHCqXD3mRZlJEWx1dOV/DcA9CpixYXZFu4Vtac6ANZFYZAFnqZrJPxnyLs5DNraQdVU1N4NRqEaeRub84m2eR57iNqlhCQcpEe9g3qrigqHL7BtbXOZsDhwlXP926oC4E9k7+sHMbznAldm21Lfu3rbN5kXGifDSRUfhNgyaO+AUJR5m2N/wjMp4voCnV/E7w+WzALPsQtertUnn9JiHOuMp3cncMUaL84BAGTJ7A1rvJDyKAGAXNBOfeD1DSEC4FEyJDpAz44CIEvGAdJBYa/i6tVuUvZIxDcHesy60v7/frLQurHytHknuH2K2me4P5ouiD51JfVl2yq7tyKZY9FQdhjSknCuK7ss/vufVe1opljorfWoONTQliwfFzXJioAg3lnM70hrz9vAaDRLNBtv6u99Dpo0BH7ahK63zHrmt0II9aWX5v5lMoZn/g1kEI0AYFdlqA1YZbWgvKVloIU+8hFqBcBhxHLqz6s4BixLRUM6Mpxib7vhj8nw/EY6ujBaa1qsT1FAB83JcIMKLw+FDbKVCvJR2wdaRVmIj9UeZD5LvUkMbMlNjdgNMAA4EFzdEIiHQbGSqQa9VsW2aC34SqxylDolcsDeno2SfW5beJP0DNK+go3hrY3k7jE4eQ5KLBJKbC7EhQfSChhK5EaED8nUVJ6iLRYoEncjYVB0SMNx2o4ASOBRc70hAUAa18gTYFpWMh/qJq9mmCnCo+ntJ6atMGU+B7oYaCs+asbL+jtBWdWMgDbo/H7ETeA2ChLa8rsss/GKw/jc7KThClk6ro00A++T5X8M99+v7sMR/yGNYgjqUE84WrVQvd4JSCfDBW/u8lCqJKTuMglvpG9BcyGC+ZzAdWatyq7FyjGyUMernhqiE4l3QsNsFS7ZRhJv+NTNeaEyfwt+3Ptg4ZQFSWkLcJLGc5kFcyw6QyNICbytlfA+3jTJbHXZjpzEixqosUqHFtZooGmI03m4R0+e/56IeRDio5rg32MCXmkjY5khz6BhHYuvWY3aFuySBJA11/5Pq3sn+C9tM2+xbML8+pZNf97R3pm6Jl+bDJclpgvV59XUGmFHjGD3a02JOjsyvn1rJbyEFCFBlLUHvu5xU1lCrP7D5DlGweyTzCQBQDBXTTVu/jvpA4SsFpYoANS1Jk8MCwkeQxTMADBM3K74/CGbeiy5MeGQL7LZefLsR+LWi302nZnlrUexG0xvW7bgtH2gAwdm5oIGguHQJ/0O4bTCT8b67q9p1I1/B3Uz1SGTXsWdzBAS32aT4YZaw0nXrWY4oRsb4BDSiaSZdTIzCwSO0iDVJzEBB/6aLcdh0eRkfzvtXoqQPo17IwAOmF0j5CbWaQuQFFnOt1Oj9xKXyS83Jlb8ynI70kAT+1o6bvAf7q6mxa0riZpAEpMvBk8SJjMkA0MYPW+qfsfbexnCrN8im0YbIYQVaHCQQC1j2RDQsnudX5A/5oWid2/VqVP39YDXT2Asdaul93Gr6tSpU3WVqIbFjUQQEju0et4y2RpnTFb1vZ9rF448IN7OcNH1vwPlDtTNkZzJvvBJqG5ef1aP8vOP52sATz71hMohhRGhAY5XEZynYjhbi7e2RZJgVERieOgWX2+WphRRkd1GmN5JWl6UVmgXWbClI/gyjzswAI1RLoAUo8MjAyjGpG1SKJQDnOM35Vy2TgowxCpMl5OzFaN5KkDg4+SNRdcvPPhVLac4INwEeMxhrjtPZtqO7zw5qndWYDyAXQAqdbIg/vwCtxDd3fXZCGQvwc2JR/av5zwf/eNPDJmPygYiQt/jtp+DoHMxnHY0K4s4jQtAgLrXdAOAd++RQagjG4QBx0kHtfigDaGiYTDGNopxrdWUlGhHWqG409JEgFN13gLeQ7wukWhQppK24XMlqLBoFNW8dDUBrq6hl1/cFpPU4L8EXKziA8u3LFsWtBzw2hkvVVwN5FKrB0GEjI1F9si6yCeAqNhT55OToLMejfjVP4LnL+mcJWRreNT1okkqVZhzrncafhG/UEcd1WQYdrQQHn+FchDDLDWenhhW4fBtNayATDtPU4V9tBN7Ap6o+ORivk7FcnRrDcDiFBuA5bpdJPSSIGA9M5j+gq2jWunSTuMGFZDA/6qEasiMEEnHtw04DcKBRz70evmIQ9qgbkiOAeTphmsnD/3cW4IxG5FC+u0qfBEhylWeDC3aUYbqUfcUcEFhB/XJMaeChhYc0lekso2bywAqEz6Skuumpjb+H0y9OWaQivZSyAA0V/f8uIK8HCrJj6C3ZSDnkaPgKKGsmBKYU/DvZMP1Y45muAHa0XkXWpNyge7aMsBQgMu5Qh2t18EogigoGgfAZbA+hSmwcXb1+7h5mHbzyax3iHnyL6SDYv76Yr7J4c4ye26Rdjxu1JZ2HZckVYK1CTZ8cGgjbXMxEoWVU0k1EPPXUYFMaEI1Ne3rJo5XgWcDI6sGL3MK2wG063Id4Ew0vyI5vskpgHacj0sgtJF/IZ8dhn3jVOb4+pYjkl+e0VJ9CJ88TgJZlebmAV0aQWNUEbufUegoblQD+yuKBwayLhLBS4y5+GbW6//JV08973RseABZVvApCJx+ter93/VFz69XUeu0qpSSLSRFzNnLs9qlZRNk0mIhXcSOEP6IdOGOUfnp+IvGtXfygoNYDmK3PNKB5WJad+qAXyr0y3UA6TI9ekyHB96fUJkfcfAvl0jivYVoaIJECw/Dhg+tAZQWjUo+nIOaFr6KD+Ya3KlBZwLgwzKT8lkH0fAHBhV/nLcB1KawxVmsRO9V2wNKresP32zkaIyCEpC0Z7jJN1maIzRw5Z6SUyFVUSNlgAZIwwBAvbs4+/oZ8sj8ihKULgTHRJKDR8t/QKCc1W4TN1Teqw6Ekm/10zukypUfcg+QIgRQWv2PIbzkwqlkZjTlXl3ql966ikt3GznwOsg7d1Q1fo0eqj8RNWr16c+/nLkB/FhOs78F8quMwQX3/KH/8E1n7y2nTNlqudwPJOKCesHyL5+1DjnculQcsB6FGR1F5dWdtkcCW5MPC5YHEB+DW79NYjHVIEUUucI2FVwRHUy3eVGeksFiOIXSzH4HHeAQEjO9p9owlQGo9tckPK0U7qZ8kwshEvN2idjlzPCG7pDyFj8khtsWpRYNvjfTnfVs6PHx5eeoqxjKHmqyBHHA5cNDwCbpaaBPGdfDKsh3U1FUHjRkPsSG8OQJKlkyPULfIUmvJllXpo2SlLy7J50RG+LBBiDx4bqEnkapfIYiOSuL6k+GXLqtZYIT5SCakv+u4dfsVbs/cuXrjQRSDdlzUpb6QQeAWgrvcMWp8KrggBoShHiL72a+/m2LgCIeM6JwF2u5/GT/4QZwKJ67a9jA8innRZL8gkUSif3GzrHqNDVfupVEVgHYoZq61cB57zVRSFHFUzKAOFhtpKMEgYSAkqs4vRAtrumj2ri4NrMc22VB1Y2GNLjX9ruQFlmBpL7Q+8k2yOXHN01lZbyoqANvLBNROmFTpLZ8hhrw3XXegSAucZyvEhSPL4AYzYPV1GqApG3z4QZwJkiQxHASadzQEfYk6EJw4ei/CB7EPRzEcAnZOCzSqKdtO+lYAEHU0zYyQvE0EdUNze8ZAo5QAj0oi+G0I1PWLLMM8HLSQIW7SPaJIj6EjMjF52azEyncrhxtb5QshzjUgW/j2kb82DFFaxE4qif3HChrZvL029kbwLMeMk2l4u/R6z8hrvqAJCA48dxCKUwHqtCahfL3+vrQ6kE1wA2J4VQeEcPVjxvfSQYQfJQr4cZ3Dbkq6r68e0wMN2gX2skwgEiCRSWL4ZQFI2QAdxS59pGmCiTn1xihJC11iCXyiBTuFPMmBk3KLDiR+mEiJEYfD0LMn6jt/kn3/IYoOa+E/DD79f/kq39ThA7FY+UZiqNhHcofb+vj13e/jo+XtaT/yx8v6QKTCj/IIITmVdNGRUDlFKpIjtQshiNQg5ppFEEpZ9kqVWTTNq+B6faqWNlJyqmTCOAwbYneH852IIaTrqlLwPv2tzhMIb2SUpX3RKJWSWK4ST+kBG3M0AqtZlXgaI6lLYOZplFItFic3BCC2E7e1zP9z/wN4NtVTH7oaMOXNeqaTEK/fZ4ev5cfvnr+/E9i2aSje+0QO+LIfZb3RH8wdIzV+JKomG6xahDw5lHZKFxmAFImJHrWEwMD2KINjL5GUh/XEHRJiTBLlo6wHYqHKYjh6ktqBXLkp3ImpanyWUvafRNW1ErhVuXr9kw8eMCOqrLvaqiRxJ0jhRInbasSt6/NwjhZP6qv528Az0BPim+EuoqLlfq5pgZQHf/L67OeHeZEDEdKn6Izcv1OiOEElU2ncKjZinS7EzEcuA738vvomJLUzuiJ844NIAggYX0bDMBmAJiJ2REe8pvRFDndTeohWuIpMXAgVT64jXtKIqiU1iwaSefWzYbEcHcs87CDOy6abgz39KGWOliXcVxvu0iffTR7A/je16VYP7g5nD5kPZEE9K+zAdTf/HJ99ibFEUkIp9yfQN5JLWmhXtp0ULgDLZe7ujShWjqGMUi3ywwG7SQbkGQD8M0utWvEcJohENLg6OSabJkmEFvQytJUAPS3w4zKhx64RMhiONS/J1K4oZz+MsZWAHmtUzZWSvnx1z9tgqQQ3vqwwMYjdRuhnNDPPwn+GxX9hTUJaB2ijurWAHoYwG/wYslth5NZ52Y+iOEifBPyVu4m4IaURrifQXwjNdYUjBSNj3QkGh+e9BTJAEgMBwPQyEkwL4aHUPiJn1IPrxG39CnEj10czCkVEgtEC0VptDW60PrifGs15SGpRcsv4q9f3GIIRiOGW5EUOjXh989mXwf4wdf2+84bZCv+O6gXw4KEeJEN4H/1p++uT39Fz6/SZkpwKhLBeckLJSeg+2CKlFhMmUwLwUe0A7tAmZSbjZ39IgCoxqLcdsJiOD6glgUyE0lDVyZiOCHipgaE4JC3ZKKGr02vN6Ru9RDDAdtpq0b5qXANd5N4SlXLIWLlgaQqlpohc7dK5QYNfWrOCMf9/dwNoI5HRGdwvYFHF7zUqxRzFF79PC57GMC7+tPRKl73BF5U0SIYC7PnzleUwZQtZh3+a9pd+f/EcEIYJZxuf+/LkDsDypI6NYsyC+oKJJKmOOUfbwawBvkpWSEbUe/hVB776TAGF2zWVD94m31lzyQ1eGrMfqDBuLcK3ffaC+MlpFIdWBwynlMzTCOGq+/ZlxngPrSl4x7WT+duAP98SkJBX257H71kHMoyGUCxgWIF5vbL81dEvwt6t8jbH3kyRMypYiSBpSlRQUvd5lHzhQvzNQuixkL+XRNiyrtLYn0igaaITuaipDqAdCxNMwPYkISiQA/olrGf+F2zaPdU/l4HXETfVc38W3vKGfmLV69eGJwSJ3furM2y9jp438A1RqDyx0o46aZiuA4pQMy7FNysb+aeBf8d12f5HqnmJiS3CRCMhCc/fqmkHBFCq+5xMdz1Wu9JFCDBclK1WIT7Z9uKvYsj3DuqokFNA35gkd51XZtC27EkXJ6mmBiZQ2K4vQ0DMCNwA6CsInO0lUYQnYhodz7sUSNNr3+9yt0Ak9FKXkx78/b1zzXVOpeLfHTNFoWwHTgndDpTN9i960US8JQaNw5CuVDE/NmL4b5Y8MAMv2qrwL+CPkmKAIkFffOcosH94yJMLifstSMxXEpu3RtudCKGS3WqAMrNigmcvmYdZ0qTKRuh9Ddv/0cGgG7hKFrdEQ8F7ifRoBPcvqaxjgfkQkqTPO+F4xxPvaur8Tdc5X149mOaIwQncw6XsVnklhxpdX+VqupPPOMrjn7W+8SPj+8Wi6QOrkttWy+Yqwfe+1ve5AhQuc/fy/PXNK4jT4azBYQ7caxKfm26RziH2yuI9o7GDuqUeMwIRhJTI7lu7KTHA6fj6nyOhmVJNgCynxxdfFSjxCbKEMO1uP1EYqRhgYmeDPuU9mKO9Y/j/WO8yj/3Nk7IfjqECmM8lGPUuD1lGlhBlyhaeJ99pY3tPtE8tLkPRRkf/6XyinfHehnkHgvOL+zLbACvwIKCEt3TdBDZDCdFFRV8dN+lmXwuBWLx8JaGgirS2yqGc7pFtZ0MZw2USzA10Sl/eAi2NAzAZpSywroRw+2TGM6bt+6SxWmai2tn2xrAnapPlLSmAqODN/DPorwFgylKFFTqn/A5dx2G9hyoZEDdxWuM+yI1+66Fa370l9oSRRrd6AHpZ04DffQZSdluG6LuL/au5sWR44qTQ8BxQrCzCUmIgwOBaJsF/we5GvpmaJ2Wpag+DQTSc5ByGJFDpy+jBiPbkqwGgQWLjkLQzNwEM7CnOQ32sMtcsruXHHZYlrUZWAaDsVNVr6q7qrqqJLW9s9C7xa6k6aqurnr1fu+rXklFyksRn4w9OQo0bJeiSdhD0nbCzX/cafn/+XdxzOhfSkqWfiqY/f1J5RsJ9fC/etDrAz1X4oObSroCzz4mV3off/658pNOxReW36xqotIJ/sT0xbr+p/K+hD4NLeFIPqCo2PQfK1uu2jljOVAMLXxcuF2sRk2EgCl8KqebwLUyBYUfc61Sk5+GrBiJPr3u/+W1yAQagQdLCzvj6/NjwD674PtCIqTSHoDnTdT0iFicHRanhQvS9zqdLz77ofhbPk0Mp4uh+PItPdFPT2rRE0OsfOr5RTvxUxBFddlrp/PZFz+UiQVqD8ojpCbySHg/MHZH8Svf5twrZ92SqdtSqSJNC+jDF0NsQU7u0McXN/qMgsVjNfIp/beMtBR3qevAIkmT8WtwKP43XLq0N8t3Tkvu9wQAit3hvPWmvLQiwg+of21PhFTHt5sNgD9z3zbejCgjQxS0LUyi4zds+vLKWI28XUNJQaK91ezvBXqHx3FGmxElUgCQaqHRN2z68koRfrg2PZvARn9zfyNSygTKRVbPeqLImRCxFhodv+HTl1ZGWv7VSy8+T29p9qlgngmUbcq8iWEbINY0wpvyMkqmxZ6vw+aCKN+7TQYAZAJRNzbaZhkQ+yclQ3vyZvBrWfx2u92nZRyTEkWjUZJkmf+T9V/qXZS3r2NCucBao8NAkAlErfhhOo07PW3BevE0ntKSplGURnmEZABg3THGeUSakebxlLDBuEOK1qHfIR2VJQcdMi4upGn5nrI3uJKmWh35n0c5BDT7UaWQIYw7vZ6D/+IopyXKudoai77JNHP2j44vNYtbn8xsPKZ0IW3yJJlMJkNSkJooUoiIcafnRIKf8jmxWadpnkZivlzJ5rmShZ4bu/N7Hbpa5Gl6xZZY7ozjNMLCxn2vyelwv6qkuA2zbJQT7u332+28sqBKmUhaAVerw/DwMORKgchFAolRpreZGgyrLUospWJUCqLIxFmWJKMojf0WnRQZxnjc7scJ0lO6U3MnI5HwTeiSjGhH6fEWA+wUFMLHGb2bkvUOGUDf99sFX7ZxEHqu5+dC7JTX++0x7YOonDhOCQYz7aQGWUb6PJYZm2dj3xcqimoogjHQUMcYewmhDe2Icr3WDzML3m7yobA/mhIcOP8Mh2tWNylPA5ggMBgcHoQjU/hU9yKyugAYu3gX56osLgaIFVwPnQCIlDluXTpVgOPhZMioOyxcpn4QBpYOAJ5RAADAJZnRkPWB3DIKTmnEgUcV1BBbWpMRDZF1hd/6WYMB8FtDcNNdJD7nATlLwyCcB8sgajlZvCdluWxfgr6cilEZ6UgFgG1CLRcN1ox/MxU1cmoXqoEXgVPITOtKCNg2i8Oat0Mc9EbjM4G2NkFAEk2L0wDYyJ4zAoDYLUF9zcHbsjgBMFSm1fpRANheA+AtADD2rCoA9FMc/CgK9esCAHZ2GhwG4j+TOtQMzMpCImP1WM+QxlKEiAi1cD4Q0VWbgHLXmp6KqgCw4HeYq2zuuVhsjQmUWUiDys9IyAXyEakaIF8DgDgMVqELnuNQoi7eWgX159urDnhOr+GnIvl3AiExY1wcdlQNHmBFrFX2ZfWMJdIh8IFX83DZF5sqDubzvbJzLD4hBE/FRR0wFpJOZM7bTgBspgGMABBjEUyaabUIAZOjsiUyAWTqAldSAmAFXnABnxJEkCkK8EBCJGCTRsaiQl4n5me0h6UGkdwA7JB5SJJx7zU/E8hAA+SgELCmmgxdIe+MqPWAp251NHCIvjOldr3Xof3Ne5+UzIFgBBjiWQqb+9oEkMEEQqwfbNYA2Ct5bNMyrZhXyACAKDycB5aJQypoGBpqMR8tctAtKiRcuT5IEmxY0SxYnx6kwzU3DvqOIwjk4kMAgK/KX40zGAA4SMalxaDwV2ID4GZlqGoApI56MlEA0PMk2YqkAasA2MYJxmsvSBoACxIUEMskAMxs0Oq5jERtqQyiAjRYEmg6WvukgAgLqGA+/eb+TB7PBIoq9mxFpiNrhA7YD1cWJCR27XzOtwqmzij31A47ZFxtpAT5qAZABjZkACia2vVMawM7PTPQBht0pgCZip/YjJ0iq2e4ssdBwYlahrJpjjZBg7xIeUU/r9FkWJZQvcZ+ORbPBEok0klWvmRTGhc3KU4DYE14sNdVEHhB4gyxcP5IJZVemDAggVAxAmFrI6/UIqgYgYkltgPABk4wNhh60mVkvT12xp+IfA+CcCX1haWvngEdgkNlHUopLY2lJL68XSDtI+iGKl6jvoSI8f/a7EygO5NNtHu1pOppAKQyBxFpwUwAYGQJMsRGeOBNhoKKrei2IUZJR5FMFEm4BgCjcgq4BL7Y68h0RsMmKCAlEEDrcqeNx3VPFnqrgTpbrBlR2RpRj21LCCCbHh5WY3WqmMPSfHQvq7E/k3SjLRhoPc/higMWq2kUSN8Hmy0HYdQyx2mQHCXcbhsCmwGAkO6jGgFgMO9KJYWqc88VEwivjR0CbQpvJFFopDM3Jw51lqwmUFoa8ZVoW3VtcIVUzIfoFADQxJVtoREPb/F0uKZ6we9KyyM5h4qQRkXEBGtKN7aqd9oyXITBPJwqp4axDpR+9ZABsos5pH/ItAM56qIqWS1JIYYrXO70ASpOMDZZi1bLXAIAlj0qCKOCg5ssDhaDylYwUhA4CmWmNZkwWNulVHyIHo0iYZOrZoGmuo/wt6Z+OdYNX2dhpIpY6x6YBgBcpXzgDQgAIvXUsBZv4B7eRJbIpSDHulFSAcCxEQCeGQCxzVTf1AlGyMQ7pV9kDxT0LczNM4XCg4NFGEhklEVRwtt4agDN4IwjZGLiKWykhWYdWjXjTAKgsQnRv3h/u0wgZOCNkcVEWQTzecB9gLbNwopkeGCLxWNfoEnBXiYlkHkVDYDdPkAlFFiYQMl2/lEhRxKXE8zxj4n9Ew4WFsse5pisnCviMFlTPRkI2UxbbJpf0uhciF+zXDiv293b39/r7u2x971ul76SN7jE3tn1vf0uf6etu7A09G7aZo9c7XZpY1rbHRC7NlgFPBtxH3pgvXVZO/YASJXrD6BH9ih4XFf8BX1CKUbCBkZrRO+ksCt7bBR7vKO5LN2SViR66JYtSasXHADHfA6ib/pK/uD7xEt2M6MHJ4zcklEM7mD02duHZ+3vz2CEL4CUJYXhX8pjQAtCq/AFm+M+ew4QnvV70AYNJCgg7qfv9HFsBF0+LiAwUJOPcQkbDUFXrC8j1j5fEU5fTn+4An0DfboDevufGrsP8Ds6vce3apWdFyzX/MRce0JW1RM7wfiuudE9pkTyi3oDuPUlAGC1Y65+pKqrU3OriwNgcQsVHkPtw5pD/J7NP7sy154yB3U5OzxYzoOHrh685VnNETwEF2L195oTaPaxeHYe5n5N0j6hssm3rNuZN1hSI4hp+ZGFAZ4wBRvXBcAj2Ale3N0IAM9eBQDOQABY5r8A+5yemwiWR5Ye2BzDxTc1R3CfeVnhi516t9P5v9/cL4j+PaXOt3VlC1vc5xa+CsNgQFwvpuWnFhZ/xLzYfl3h9hV8ndfxbXP1kRrO7L4SALARLr8z17Lpp2G4CInHdOIYQM8LP6o5glPmZQXP6wqZZifDsXTo7Lt6JtBjJt2/NYuWD4NgPiMaIHGx+BGzv++c1Fycx2BgJVcbAWDwKgDwmJmJq9sOAOQ0WBAG83OHCdPxBnUBsGBxsuBBzdufthr9W8HsR7LT9SbImUkBnzHpboHPzj26FRyE2MXiAAD/qC53wT6CzYc4UsN51wWA88vK7SuzkbY75ftgBAIrm5H/CMJI3ZomzG4OO9E1aXx32ewDMcwLbp+vpeLFvXPDRRYGssHnCTFrg2ABMt7CP+ewFVTXCTkHAKQuAOACAEs3AI5+IgDsXj671OR366mZe2/HzDwh0p8Yi4HFyH/ObMjwtCaNPhqzA2XLmlr2Im32kUg4FL/B6n797Kgi6a8WLvPmfhAMiGQLxw5H4fLQVbteL0EgPf7epiCUjAK8ey0AILh8caYB4NQMgKseS+SYzUJiBB1c2G2QVuQ9qhuGgijofy/r+zCN/o0YdiJmE+lytX9f1+N377nNm1V4cBhAMsRTi2I5YLXPamr3S9iMji0QPO+K3QW2bR199bWJDy8G/noAbGWl7TwoEcABsGuePmzjzWYLAoC9C0ekKPfq2vAnEAUd1Iy0HZG7/9Dkb8f9+S9pkGKXLNDuLfIK7/BZvNNPO7u7D4LTk5KBaM3Ol4x17hf3Ke8nAY1uzEK2lbqstGCvV/+bilr+PHi5BS+8ZfFEjX9ufcNPvJ7t7pa3iafc2v3wLi//ZAAYectnp4/uPzw6Obv4rpgbGYPPZbxxHlwD/J+76wlxGzvjyx7asux2S1taaMoW2sNgcs1VV8HAgCQUdHgqBdODTto97ICYnIbJIUkPOuyEDOQgED4ZY3aw8cWLB3zSYZjYxsaEZpxMnJbUs8Y204lDSg79/rwnaSZOe/ez/j297/t93/ve+570np7kVh755jVpV2PezeGz5ugtS+gQd8f70D6w9OT7wHahGEX33mZYedojfhDdyhknb4ObVw2UQ8954IHdfv+Bnjm861xZfLSx5v8T+Rv8LMSu8OLY03WdV8+jCB3iNo7xVDx8WW3FHiYSAWwHOJdlc8ZkxOYxP/B4PXCAYliyD+jLZ7FEZiLcI9P7J/goeHMvlgiUxvLVj4A9j3cY91TQPYcHWTeHTEvneA8IqLVOSLFGDjDt9y9fPNl+0wzD9kn/zGQsPXUAFq+zDHXoKQfwlHXSjLA2LEJlmgzl6b3mn885D3QHv9FXuJwJwtbBRDwKahciuAJM38e6MmOGrAt6WP6o+tzTY5VLL7NILMGkOqn2sbQGK/AX+yROzzKnsrak53JO4aWesYcPgj9f4/r/yZf4F2GbF1geuGB7CRsqH7IXFwqe1/WLZzv/ig2KceOaUPsdomV1ycOUmLio8bNgGqu/3+B0ouB0jJlTehT82NSZiygQzCDBJN+TSpGGepzj1jWejrTZjeP8eYklz8AROcC3AyjSb74RmtbQNNMU8uqgl1/xnMxTL9VBcgpzXl50lAPErFGs52TkOGJP5pBiycYDg87Ts96NQUw2Yn10I5Z2eM7vqpSioh2VjhnNIyxGxWo5v0Md5WhITB7Yn5mVJnHMkvN6qQLC5Hf00QG7k9M8Tm1poCzPUGUj7WswHaHg9ftP6+wA3At+Hgu0RmxAiFXVUAcCFzgfv91+doF7ThEi5nHQvYzWMNRqxOVXNk0H4rH6CyOPaahYhwaSNsuEp7CFSLdCx71EFXlOTDbfsAO0ICJ0oVKlFnjMW+1NofDwwUjnmEIxOLksrwB95hNSTW3Yn023d+x92QcgfcgSV3Ih8lxsFUzpbRwKkjUl9m6cBYOsQ3QteoxXDG10gI5I7SpzT2HB0wWfXZAdRGZDKUlkcqVtrtjBrPBk6POyapqwZguWYEg6IfViq2bcYBwovDtfrHP9/5ReCegIMgjm3xBUFQ0Dt2Y5H3pvou7iAsMCdrAMqXY8dJEa6RHA4IprCG0aRUW4BhRprG8YEwVZnXdENyIHuNMzTOIiDSiZdTAFtNUmNtdCMLZBiaSeMLRtdoDTWLC+BguQNMSAoQG94N2DkUjZRSpDiLevuI3vSz52xPng+PjFk1dhKKdDn5avBtNQ4CIvW8w5ebyxmfQwVPkSBcSsT6o7xun+/KhZsCv1it3BM1InmVM8GvJs2tpCugYZkJsLNLhhyiB1MESad9Lv7df0zjXcZY1ap/3Bab/fgpAsVDm9L5fntJTnKmv5eLL+/xBDkyHONWEKQVWNV4jgmfL0/PzdOQXYFeFiXYui6FlUgx0ecfvdE8RCnMgoGGxm29WoYHMvuEWJkoLhcdvid04Tjkn5ik6IZHZyMpudzC6UAMY31eYJzzYeCYWccqaUGDR0gMJI8vO5VJRygJHSjFdT05xyeTGUg6SP9/f29rO1OcmZi+Uy32ifKCDP9Kn0+/zZijNJqPIvtRzx7YldqNWLdl/qnxUB0hjPeaRop8x8aemoLLTIQiejeaa7JKPYBTY/D6AgoqjKr2mE25fd3kLSiS4U7DtZyHC0d7CjShujB3iJ//Va1/9Pfv4THCUomyvDfIrTtGo1fKgL9zMVfLQFO7y1gS5uGPFktGQ186hUCothhSdDjHIJIjtMeDZPazWC2S2wpE4r6V0synNHu5IsnvL7JjPN/N8BHOCw8MMV6aqqmfOX8gpgXkehSnK68vvhR+OVcoR5spJ8iIkfKjmj25MS2KlUq3dXq97id4pfzleZzzSddpEstDPoDnuLRfmahczhbRoFtcOnnUEy7I0XS79hZk5idnCkAt/IxCFr6K/hY7kily/saZDtj+vtAPR10N0LaPCohGCrYR+Rolqjgw6AKxqkYttRk6p/s1kqRVGzxE9i+0xsMlfDnQzPkkXDbAFfsWnbNKP+JCOg1SQZmnyWO1JnpFwJqJ2BtCiqFDuDfn/Qb3WTs/80JAbRf08OcPtESzmU+hKf43gF+K7wvUxICaiuaDkHYM1UIlellQ6wcTROsyAxpcnaq6i/HaaZxgPHHQ+TZKmRtzzGh2B2tVZPpHRNVWGO80wI+9hJbZwZAKLY0wIb2/f6gxHe3iRnY8s0pQVh1+K5oPYkcNggrISpMvqUKj+sYb0Gl6L7G49s2bzhHgc5Nj9fbwegb2NtJtrqMAihaJr1WomNUqLGoQS7eq1eL8ovf86QcvnjoD/qzKDjWKxU66VS56wLBi1hy4LjGM3GSvwxO8DsI+KHBWig7Ho9Ve8ayohfV2lr/ydMxhAWq9OUA3RWJ3/EASarqc1w5Z8NgbtozlkXDAQWam9XKvVScac/xh7yA5oKDY3L6iLgS8qDAjjAyrCoVepF6EKMlG2uW4i60M3pRwwT2HYITQx+xzWKoER3N74uFiN8nduu1Gx6Ye/2r9bcAX6KT3P7DacBiyO3MjScpL3dprB9bxuOYKUXiNoyvKFrZOgQT3kxTpIudLEGl5eXLwtVKNcIrhMVmu5wNFeQ2RbCkh9lnWcyKbUhd5MfXr+G5XWi5dNSDO2Sv3oTOloOc0VoOArywzCXjXZnNePHHCAHnEM1/7qK+vEYSTSXDIQW6l92jsNKHedJHVbqTWpYhrk85oKaCfGB6Tgs0EIQEk5sOP7V9BOeC9rJOBs5HH/JpTltY8G22+EuXJGKIQ7eFWtwYcEL7M9+t+YO8Evshk4dJ/CdAEzCWxcNCceO6/pbdwPYBkHgB67v+r5PRy6uQ+rgHi19CoELGD4CQbVK2k28XECnoYg9qcMFogEkbWFFKY6/FdJIajPAE4EsPSLCCOw0dko446JmlEQrbXk26UZVojk+sxGnzAFGiduXMlmCzKmfdwAmwZ/DTHiG3ifZ+P1vZfhKfuXiFqvpK7m+RCWPvHMDKG/c+IP83srBd0uph+QJME/Dtl3guaB0z1EdE0igtIMFs+s2aSqDPXCc1Ci8lfo1zKDRgNsqzqfSJ7XSv/md6VamJOscyLJ2t+5aruvK8hxHu/thd7KcTJZbsC4H2Af+cs0d4AuaDAH1G+zgWj7aAheKYmV3LcuCbRBYAXoBpwVkNH/M80EXrg8klo9bYsff5B/QcQ6xbduj+TqIR3yu4yKOhUQWD2QebLE81+IdaYAOBYsFuC7CW4TtWC6y+qRHiz8de+Ra6JqEyKqhq7IuPpUvcktgcF+SHzCyu/VEOoDvUpoKSAGg7AC/yF8v0QH+vrTAGoDts7KcsyA4yv219Gfyffpi5RbaNVD5J/l+MHld4LmgeAvUbI7BLCg9cBhTGkTOhPgxwLKhasoZtFQu3FtSBd+yXNbHx/aKMCyyfcHu8imfbASrhaWFZRDI0pUYScEeumld8PEG6qtP19wB6POID5dQh6iawR4Nma5Y/+kYbJadlylLuuW9P8ylu67kcK1LuwrVP6o+kjQcVGpANfMFjRHtTzJMiaGW6/pI+RZtuuwAh1usO2NYUo4r84Kkd3PYliVpmD51AIZknCzXH3GAanT8zyXmgfOhbML19bMrDnBYaP5NqSwtwNrcPYY77Op/ybua18aRLD47LCzszmH2A2ZhdqB3Dmt011/gkwy6GDUIwYBWXjA+5eAOLN05OEQmnfjgQ7qZhhx88c0mdJOADwnE7KkTwnaH2WQdKwztfLhD42yDmXQTctr3VVI5cTJMH5NnSypVvXrv917Vk2ypVKoZq8vopjxm/VMYs8pb7yb4kfiXYl82doyGUrzEjaf8QKUfn9IPKKc36j3xNfHQwSEruR/3t5XlKAH/pNy75f2fJ8jNRFnbRtNhbWc5bXOayKYC3LeTfWhCutF5f5uZFbeSsU1Xjur1OvTSuUFWKydBJGGNruNMH7LO+IultuLjenqZ2nnJAbAY6qB0yKIyNBlRIi2rMrKmBMB7mysJElV3fADMnETvTGUnbEP2jx3Sb8LfMu+fJACCSXacnVUmsejw9FFqLqhXV1ZqtaBaERECQhAczvPs5r3ELOVC5Q5prazWWFml7ZDPH9XDUdfY2REgSctkWx+1PBuvMXxz2wPgs3s0WgWa0wxN08YPkGniJgxtW21tSofCQEtoy3hQ6qwmltmh8ANrD07t+AMXrxXNbUN5aNKHqpvcw3f4qeAesIdY1UQBZsgYYgQhKyYIIaMhTT3+D/DUNUk7VxYZWFfg2xVT6pAG0yRVAiEJAJONVPYyy4+jAXBP5snq2YzHFDtMgbuoBcBf1JyLk6aZyBT86OpXD+DnyfKKg3NDKx75AkRC/1+eE6IZQduIfewH0hjaZqgpD3FJ2gDEvORHzo7ehdwmttIibWByipqLU6FyGyTw/PHoj7c+AOiRgPcmdc6biMJDsdics01zm/17lEtRRLdYVg18T9jcjsnVR7VU5KHIQVI1pCUML6kOk7IkUwIgc2FqDKMgiNwbzKpIAJyOrRmOD4CZ3jXCtAD4/EuZdho791WyzYvJp1DYpEmBmnsjDgyVyT2aecOoWuMNM8e2GYvA9X9kLGje/LmmveJsWKLbPxAC6Vd4FK9VzE+hHjX4wuFYB7+r4o0wOAfAH93p5+MFDOhHTGb7k7Sb7Tq/pi+6mS1/YwC81wPgCp38ogBwyR9/Gw2A4OBivH+OplNPwD81nBdoa7zAbXkk3v0k/4TvebDF1qe5F5X/+db3/8/+inOkv7hw3UolDwQbN08EObhDuZz3caeHefAxmbPHcxvub72OXKlN3FTr4wHeYTRW8XLy/B7LQpl5jXo8P+aPiY7LpHBVYnwuaGc50RKfAaIK12a9riuyTEHjuSbn8UdJZomujF44rcAeGIbFvEYhlUsB8IX6CZRPEMsadV080KbSlABYDJwPW2foX1MAkF4zf1hdTK3DORLvldROzFGzBfsOj4SYzFe0ohi9ahvxbYU9QD5gj1QpfJwzhOgSKzcvLG5Su8IyNJ+wyPe65beY6DJQ5DLlXStOQVdSe7x5vdiGfMUAmd46j3aMojZl512dtnDgRNNZWUmlnkxaIJlFYlMoGdE+3QnbqsQaWYRl5RMUVoJA9liMe9jkPtaz3Jg9qRHDTCvRFi55d1SyCgBiTYwTtrWxAfAiIkZL8w0hvsho3N+qt+O8iqKoSJAt3UHR8mLq73iOhMNEcKbUWmIlxriVf80S3lQ0iwRk3rKISxOZdynHUvYVl/jdANsaz4hrYpeJXjIqr2A8hKa9dwcCABvqu210p0Ur2lrkDdj4vssZltteXPC5hEoh6fFgyUi4hFF4rBMeU9JcyaRmgiKVc7VYInUCoMdK92UZpMf14xoKnO9dlC5KbT4DpLZdi/VfwYGU9nShIxZijSQAEKKvylijO/4M8KIzqkLJjnTu36gAOHOVZX6cAqTR/kTKoDGGzpLTAiQ6SkG3xSMh1tgyBU7ZodrB1X3DtOvBJ5qgwRYrPfGf646gZTvFx6JBK7yAM3fmD3cgAPiRAMtXVLSKRfCGbxVpj9ZW0fKLp6ktTHqw8pjV3eMOCDUsi/MwhXVgu2nA8R9HWk2nnhlDzgc1FnGzgIsjus73jyJoTUqKFkuxRG6RZFMdQdPZh06zFMho/W2FvBjLBrhkAwDv+Dq5tFbWgnQVAKLVQymJK64LAFRg6R6z0Ckdnfueegv2GcMmT3qWssTvBhMPArxfDhFgtMDbHntI5OKedcR3Es78S2R5yt/stZEy2B8YGFUv+DZyQL4HwKidrSM/YSuCFE6TSkbmsrwIjk2/+/UdCAB6S8Bjz/fgy13Xgw9ui5gsQjaUeV53LrPjU5oDAIqK1D8yr6EC7HvFmCjdpxPAkhNMpBaMXpF5fJKlqERPBadmPFTukTpgQwAk3otleaxZyjEAjKqM102lWr7iIymiA0Fidsfz/NgSKEZBtEc6VAA8phzByDXQCxwA314JAK/oaZYyr1/spbQ3CgnvA2NHDCkq+wmGNzBePDWCJXyRTrDaR7jkeWL1xf4lvpDf4jZgB/ieIFf2FtlbXErI/RZdXZqRsaC7zOux5b60FUuUtNSPewEkB/dv+YwQiugtATNpr+SVSh4t2DNhm4bNbhup04k60YdUZrM7kA+ugPga4ilWoG+aUiKju1Sr0/DpmVQQ9NNYKiXIw1W2eO7EDdZWUnJkKe0KxcKJLe3tdoj4KlDqOM1lJU8QkDRW6A3LJU4ocCSCdGFGWgLgoUgoiZBSidA8T428JCsJgMTOEhuD8rop7c3qcQC0BBPr85SdfWNmMahX8UdiEAw85YERhNKFt3Y138Q+LKXFOypHyqB+m9xzxhNvTabZNXoLo0O4ba+jzjEOgvr8DgQAvSVg7hw6ERK4lTZp3nSr1aPq/vz89OJTOCBk7hNl7mdoDQu18X4DK0AVT1VFKaWh4dQCHD698MgwNtMaYSkpKp3wWwYm1naloJSWL656Bwc/rT9bf7ZGJSUlPAZY4z52osklyaXEgMZQt6g0wkh44wCIbU9gltLjA2Cio8kSa3F3QKVfaDdYcGLbjfQ48lrG9xP0NAA+lDJMxJUSpOUJOYa/GSbuSQxoG+vrzx4e7InzLrVdOn1CE28Fe5etFwBdaFr8Eh2phJAzMXebX483MhiC3hLQHdtK6Q6OV59J3UxP2mPr5hx8JAzfFz9tOM877d3dcqNxieeM5/ifNz4ct/rD9u5oOYQQXVisjpXfaDzmAHwzHvt5f2NjozVM30gNLQDG0HVngPHcfZoq7HIA9MczQwDMVHEkXFBzmv12e7dcvuydc547Dp/WWtsZXHHP/+Z4POlWY5xz0ukD+gviHF9j+iYortXrNadaC+o1SFWdGhyvnKqz6tT4SY3f34UA4FbdLBcahXK5jAsmGo1CodEo55ZXms7EzwTAYqeA1cpUAySIpMIkPUMJITBvOK/WNlsbG2/fdn8YlpGLuAvlFj9W+YQOg/86fnteIN1Q2gBBHXmR3E8N3GNUWLUsCtY4NE9FIuYWSCytut9/ByetDdZVYFCIDZKUIrwFCYAqoy4wh/AWys/1HzVJAJyzAOUlBlUub6S0Z6i+igOA9ZLkRoEwYnrTWViArmbUsAuSd/rgnR9yDcaAlYY01qrehN9IhlPdO+6eM3yxpJ+hv8jBmpKvfIcpwLVET5MZO5pWtFhql48lAFah09eWl+v1plNbgnQTYrLu0GQGX92JAKCW2sM+MgtLLjeFK16mcnuOo971eC3NdYE3x4vUpO2egQNCg6axbjhr0gjQMszFfF0+0tSO+93h7BR11FxudpYLZ2eDgALgGYEpcD3EN0XYCmccPjUWibipGjMWuvTzqtUZInXOz4FBgIEGwDFLSiQAlhk1wpqVJKYvBcDXcnd3aoqdxThyBeHnAPhae9ICX24xyCn3sBlCa4FhBMESTp7knBTINdh1c4XyrPLggB+Jd0423naHqAuVnqOmKZSwyUMt/t/e+bu2kaZxfL1JLo6DNyTey+Z2byG5zZ4w6B9xbZfGrOUZcDEIDaQ5iwHjQlGaFI6JkYtFkHIJMllQIwhcJ2GRQpVDCmEiK8WdisUEUt77/HhHM/KMomSvSKLvx5Y0M++v533e9zvzzu/llvXNpnhB2690yNvWZ/+R8qT8YfuUjpYFOlD3RO6EfGgXPOUHwvzlm6kQAL8lYK1kXGK6XDFXLJKbaIpoLOsDbsew1CxtVirG99R1Fd9M9+tKq17vcxhF2izxh6ZzuZfy3KAGFVjiDEq5SquUk3n3rV7v6Rc3OT19uBSff1sigFe+hJANNGmCjPElEcD+w/v/JY6O3jTqAxaKjb1Jka0ActTtilKwLSVXSRGAz+Zbi7hapszNelQA8hZmY91L9uimb2JouZyu3yLEQcY7OdFtSUvmfJsigBfveJ7sNgtPBxVTGuXBxh3sPmqyzeL7otpv2vIdtdvh8quXfhhKtm7a+jVq3Vqt1j2qHR3V3hyZGTNV65plb2gJ3Usz9/VUCIDfEpB/5/tF3ze+Mr9F+lQq5rdSX//99y3t6Ff/cfnu3bvXr1//8acfvrvBzPN9T42SX6poiqKkN/lUKn5O5lwbUqI5iWf6kFv029KFj1yKWZE8/FqHYlG6e3LT40G16Odcm1tFcqu4ubrsQSy6ZnnO5/Ac50LJK3/wtdb5ZuA6ruvwx/GLbIEvBZjS/CPtpm6x6Jp5Y3OOMxFbRgSg4/q8W/GpFKmL5lQp+T0OXYgLYL3jUgyXPGI9I2lMjXz1mG9q41fIi+J5aYOWvBzguES1Ns5j/9WbpQrb6fNZmK1H+332aFGsp/QUwS/+IffjrC8/vNetmV2sl22HazysnWkYI07yGyU38iwaC8wcKawxJRdC2L3g8sB1Xd/8m49886fSNwLQbXnm1jdfGxL2oI8d36b1Xcd3OI8KLfOp4/mco8PfFGjLMJOBrOJPKJmZdzhxre5SnzWfY7ntfasjxjmcTtLTpy/HkPYDLtehPEwkDfU7fCLojBaacrlMDXHVKJp9owLwJEaFo7s2vgjgdmy0aARQoNqJLVoqT3Ns+zz9C1cl8pOOozWuWN/6rEV2jal10fElD2uaeNOWvrdYo4gVtdfptdg6E2NDDrMudsTzjju0isJ5+7G/vnxken+zP2gHQdhGvtjs+KHtQ8t8qZTZg166PB0CkOcj1h3HM5iWceibpzzH7bxd/sUOdZLeGM5pzziFo0k813yZyYKZ9EyDFjhPzt6lWJ4u4ehPtPtRdA43gY1/F1wO9Lry5J9Mh6NTHy8UXM3LTMsgJ/MooLxIH2K/Ftc+DG0rODbE87RgttiENKwAtO6ux35gPTmFWvTAphnX69WgBVsPj7YrNqXEts9RmJ/VV6y2JQbXzdgvaVjNjqe2mABX7CFczbHQlSFQQ2pr/iiw27ItxM5ZWnwYsEc99g6nYwd4PbkboFul3ClD3/OqHF5wJIXnqp+5vTwtm9shMKue1R+mRAC8Ya8VDJ5nnKO/5mP+26/1hewpbwzn4yL5rMeJTFLNgL4cmjHLaJKmKY6TpUwpnsdlFN7qOlznKSTb2s9yZC/bUAH0PTGNkjpZyoqie7oFyLcLIWyEQxl5gdyzz7NZSs52OFoxzsFgBZCleKwstY3pJgsgK3lIDUlgnHmWBXD1gp5gDAWgXmXvkBYj1mY9McjRUJZqQWwteHzL6cpujz2lkQrHLXaBSXugb2rOij8Lmpca43XlBeAN8beJ73iddtZTux32iSOtwrZok1HMgtfOm5rMT4kA+C0BG1mLl41yrA+ITbk/lC+kWGqPpCoUshPyQrtwdFl9r6PpW1p2MzlxRw6D7rX6neB8mSKAfFMZsIVBNVpDMxEKYASJkyyAw+z52BSfB+Wz83EB/NbOJuXtJfh6JE71TB6NW48F3GvoRFv2zX45TrQlm30tZ1hakaBG+3yB4jcv1vZels4x3LozJQLgtwTkUxqisRieBki6P5SfKpHpZD8WuZxuO5bBadl2+LoKoJ4igEO9Sf24cVo9Hxw/gVeT6oxqSQVwllzCqACWUgQQUbN9pZAVwFnwsb4JZIyz248tXO/Z2utDimopqZ/LLvRpdFF70rLrq8lD3i+Sa3T7ajmlE9cXt20XSro29mc+DPSi1qC/RmNSB7frHL/WkMM85UE0sF+2a63mg2jnPZ+LCKDcSg4+jAlAVpTdk5FIMsrPrI3bQIUC0CM7Oym1eh0VAD9vg4YoHy2Atqx6Hsec01m0a4Omjsda41LvLQ5im9ZxeuuPKH9KDgLZPdnTZLf0F8PTADfTriTiFRV3xdMJ27bzONY5V2LpBmXb4U+3xwtgJ0E+aQJ4wctODj9cAMPnY95IFkC7J538VZIAPn4L0JHa78R67SBcpbf0QpSUzeOA2628FkndLffHFNeLjqUeTs2FEF/ZtwT0UjqZnKpKOy8ox0FDWpOu3OICiI9x+uWubUQ9CX2Skk1eT8Qlhz6PFSF5bCwNEgWwO+ym1WqqAHQL8Hy066iAWQBzup64823K3sXEDMoJAqgv9uOW51NWOk22deXX4ZLqRuZVdcyA63V85TElF0KEh7elgwSRD/eF4NdV7UHJ5wX/FjsnXLOZBLE/+ZIgmYx3zrj6GqvH8XUgd6JgmDFPUz/dCfeRaTEtCSL/WsaWDNyleXdHNXpeAKfdzgcK4ETGV7LTaq+hv6YCeDY0O+KRapV8G3VRVRlW8VS3N9XYmmN9EJYqAuiHug2iTcinpTOr92P7FCt1DpS4ti3k57QckWqb3g1zc2oEwG8JWAuCYSdjp0hj3LOdNHlIeD3WkV8Pu3p05SINFAx6g6ou+C0zsocaSImmcU7LpAc2wwrgrDrs3KGOzP9zu92pZofKC7uCnEXL/CSnpF6xQA7NkIRKCbQ0K4DHOm+Wd3YPmmpNugAkPRHQrsh21ZgQ8GNa7NM0rQBOhtofQ7XeakeicS10kK+lsX2DtUw34PlqVZ/E+6Bt24oPclWtl2rhyM9qrP2A9peC0bZR2XRND7BtkO1Pz4UQPI6ZE0eOOU6T+qqE72Id+enYbXo/s/dM2/lfmRHhhA3SNWPXQXw3MLOf0nnWRgQQb1ntIQuXZkMBBHuZ1VrSFiBaQi+zp4P6ibYAQXeFjoOZzHdiAvjn+OHb6N7G6oPayOisN7p7EvTy4b5aNdBRZD6l3e5LcHe4Vj+hbXk57UDFfmZ7WH4r5bTPlwrdGL+ytpGIPQ2wmvyqhDtLsQtDN8YhLxXbPe7WWiNDoO0wDh/6e6wzZ7r/UT5LzlA3EI/Ghi7IFuCAFsn1cdFIO+dLoHR5med9kJVRAcRr+cBaLNaGAtBHSR9sTMLayjnLrOfL/yff2It684nRn8ZCDqflbhjldub9rCY/IeDObObTZmnBXpb2sQwFYK/vGcff7dHzv2Y+b36cIgHcWHq/P+wp/lFufeLtuPWnBbB1NzxnPoHawweKf+YCWFmYIgHMT7BmS3lXiH0E4CfL1Qt/VgDDfYBJBBAOnT9zAXzx74aJjWO+nX0vaSfGL89+2szNL8zdujVnMNNJEa6+j9nwZenzc2YuMcpwMhTA7dnPBqmB+Z3VqpivqbkQQi5cmZ+5eHGGP1dmvv9+5sp5fk4TT5iSPvPzFw1p3xyD/4ZpeOm8zCWXfB4Tb0bLm5FcZ8jw5MjXrt28c+em4cqVmwnBFy+8j0vhAfFrl8xcYpTh5JXwKhFbw/E+0W/1xOgyyWNiz8xYz1y89CFIDcyvrZ/5mvkKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDn/AzOod22DmYCNAAAAAElFTkSuQmCC"; + private static final Identifier pfmLogo = new Identifier("pfm", "banner"); + private final PFMResourceProgress resourceProgress; + private float progress; + private final MinecraftClient client; + private final Overlay parent; + private int textureWidth, textureHeight; + private static final int PFM_ORANGE = BackgroundHelper.ColorMixer.getArgb(255, 231, 95, 9); - PFMGeneratingOverlay(Overlay parent, PFMResourceProgress resourceProgress, MinecraftClient client, boolean reloading) { + public PFMGeneratingOverlay(Overlay parent, PFMResourceProgress resourceProgress, MinecraftClient client, boolean reloading) { this.reloading = reloading; + this.resourceProgress = resourceProgress; + this.client = client; + this.parent = parent; + client.getTextureManager().registerTexture(pfmLogo, new PFMGeneratingOverlay.LogoTexture()); + } + + public static BufferedImage decodeBase64ToImage(String base64Image) throws Exception { + byte[] imageBytes = Base64.getDecoder().decode(base64Image); + try (ByteArrayInputStream bais = new ByteArrayInputStream(imageBytes)) { + return ImageIO.read(bais); + } + } + + public NativeImage convertToNativeImage(BufferedImage bufferedImage) { + NativeImage nativeImage = new NativeImage(bufferedImage.getWidth(), bufferedImage.getHeight(), true); + + for (int x = 0; x < bufferedImage.getWidth(); x++) { + for (int y = 0; y < bufferedImage.getHeight(); y++) { + int argb = bufferedImage.getRGB(x, y); + + // Convert ARGB to ABGR format + int alpha = (argb >> 24) & 0xFF; + int red = (argb >> 16) & 0xFF; + int green = (argb >> 8) & 0xFF; + int blue = argb & 0xFF; + int abgr = (alpha << 24) | (blue << 16) | (green << 8) | red; + + nativeImage.setColor(x, y, abgr); + } + } + + return nativeImage; } @Override @@ -22,5 +85,91 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { if (this.reloading && this.reloadStartTime == -1L) { this.reloadStartTime = l; } + float r = (float)(PFM_ORANGE >> 16 & 0xFF) / 255.0f; + float g = (float)(PFM_ORANGE >> 8 & 0xFF) / 255.0f; + float b = (float)(PFM_ORANGE & 0xFF) / 255.0f; + GlStateManager._clearColor(r, g, b, 1.0f); + GlStateManager._clear(16384, MinecraftClient.IS_SYSTEM_MAC); + + float timeProgress = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0f : -1.0f; + + int width = this.client.getWindow().getScaledWidth(); + int height = this.client.getWindow().getScaledHeight(); + int halfWidth = (int)((double)this.client.getWindow().getScaledWidth() * 0.5); + int halfHeight = (int)((double)this.client.getWindow().getScaledHeight() * 0.5); + + float progress = this.resourceProgress.getProgress(); + double minRes = Math.min((double)this.client.getWindow().getScaledWidth() * 0.75, (double)this.client.getWindow().getScaledHeight()) * 0.25; + + int barHeight = (int)((double)this.client.getWindow().getScaledHeight() * 0.8325); + + if (progress > 0.99f) { + this.progress = progress; + } else { + this.progress = MathHelper.clamp(this.progress * 0.95f + progress * 0.050000012f, 0.0f, 1.0f); + } + double e = minRes * 4.0; + int barWidth = (int)(e * 0.5); + float scaleFactor = (Math.min((float) width / textureWidth, (float) height / textureHeight) * 0.6f); + + int logoWidth = (int) (textureWidth * scaleFactor); + int logoHeight = (int) (textureHeight * scaleFactor); + + int x = (width - logoWidth) / 2; + int y = (height - logoHeight) / 2; + RenderSystem.setShaderTexture(0, pfmLogo); + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + drawTexture(matrices, x, y, 0, 0, logoWidth, logoHeight, logoWidth, logoHeight); + + if (timeProgress < 1.0f) { + this.renderProgressBar(matrices, width / 2 - barWidth, barHeight - 5, width / 2 + barWidth, barHeight + 5, 1.0f - MathHelper.clamp(timeProgress, 0.0f, 1.0f)); + } + if (timeProgress >= 2.0f || (!PFMGenerator.areAssetsRunning() && !PFMGenerator.isDataRunning())) { + this.client.setOverlay(parent); + } } + + + private void renderProgressBar(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity) { + int i = MathHelper.ceil((float)(maxX - minX - 2) * this.progress); + int j = Math.round(opacity * 255.0f); + int k = BackgroundHelper.ColorMixer.getArgb(j, 255, 255, 255); + PFMGeneratingOverlay.fill(matrices, minX + 2, minY + 2, minX + i, maxY - 2, k); + PFMGeneratingOverlay.fill(matrices, minX + 1, minY, maxX - 1, minY + 1, k); + PFMGeneratingOverlay.fill(matrices, minX + 1, maxY, maxX - 1, maxY - 1, k); + PFMGeneratingOverlay.fill(matrices, minX, minY, minX + 1, maxY, k); + PFMGeneratingOverlay.fill(matrices, maxX, minY, maxX - 1, maxY, k); + } + + @Environment(value= EnvType.CLIENT) + class LogoTexture + extends ResourceTexture { + public LogoTexture() { + super(pfmLogo); + } + + @Override + protected ResourceTexture.TextureData loadTextureData(ResourceManager resourceManager) { + ResourceTexture.TextureData textureData; + + BufferedImage bufferedImage; + NativeImage nativeImage = null; + try { + bufferedImage = decodeBase64ToImage(logo); + nativeImage = convertToNativeImage(bufferedImage); + textureWidth = nativeImage.getWidth(); + textureHeight = nativeImage.getHeight(); + textureData = new TextureData(new TextureResourceMetadata(true, true), nativeImage); + } catch (Throwable throwable) { + if (nativeImage != null) + nativeImage.close(); + + return new TextureData(new IOException(throwable.getMessage())); + } + + return textureData; + } + } + + } diff --git a/common/src/main/java/com/unlikepaladin/pfm/client/screens/widget/PFMOptionListWidget.java b/common/src/main/java/com/unlikepaladin/pfm/client/screens/widget/PFMOptionListWidget.java index 58ba09649..a9086d84d 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/client/screens/widget/PFMOptionListWidget.java +++ b/common/src/main/java/com/unlikepaladin/pfm/client/screens/widget/PFMOptionListWidget.java @@ -3,6 +3,7 @@ import com.google.common.collect.ImmutableList; import com.unlikepaladin.pfm.PaladinFurnitureMod; import com.unlikepaladin.pfm.client.screens.PFMConfigScreen; +import com.unlikepaladin.pfm.client.screens.PFMGeneratingOverlay; import com.unlikepaladin.pfm.config.option.AbstractConfigOption; import com.unlikepaladin.pfm.config.option.BooleanConfigOption; import com.unlikepaladin.pfm.config.option.Side; diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java index 896a499e5..b146087f7 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMAssetGenerator.java @@ -3,10 +3,12 @@ import com.google.common.base.Stopwatch; import com.mojang.bridge.game.PackType; import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.client.screens.PFMGeneratingOverlay; import com.unlikepaladin.pfm.runtime.assets.PFMBlockstateModelProvider; import com.unlikepaladin.pfm.runtime.assets.PFMLangProvider; import com.unlikepaladin.pfm.runtime.data.PFMMCMetaProvider; import com.unlikepaladin.pfm.utilities.PFMFileUtil; +import net.minecraft.client.MinecraftClient; import net.minecraft.data.DataCache; import net.minecraft.resource.ResourcePack; import net.minecraft.resource.ResourceType; @@ -26,11 +28,12 @@ public class PFMAssetGenerator extends PFMGenerator { public PFMAssetGenerator(Path output, boolean logOrDebug) { super(output, logOrDebug, LogManager.getLogger("PFM-Asset-Generation")); - count = 0; + count = 3; } public void run() throws IOException { if (!FROZEN) { + count = 0; setAssetsRunning(true); log("Packs:"); for (ResourcePack pack : PFMRuntimeResources.RESOURCE_PACK_LIST) { @@ -55,6 +58,7 @@ public void run() throws IOException { List oldHash = Files.readAllLines(hashPath); List modList = Files.readAllLines(modListPath); if (!hashToCompare.toString().equals(oldHash.toString()) || !modList.toString().replace("[", "").replace("]", "").equals(PaladinFurnitureMod.getVersionMap().toString())) { + //MinecraftClient.getInstance().setOverlay(new PFMGeneratingOverlay(MinecraftClient.getInstance().getOverlay(), this, MinecraftClient.getInstance(), true)); getLogger().info("Starting PFM Asset Generation"); PFMFileUtil.deleteDir(output.toFile()); PFMRuntimeResources.createDirIfNeeded(output); @@ -105,8 +109,8 @@ public void run() throws IOException { } @Override - public int getProgress() { - return count / 3; + public float getProgress() { + return (float) count / 3; } @Override diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java index 7f19c718d..668039d58 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMDataGenerator.java @@ -4,6 +4,7 @@ import com.google.common.hash.HashCode; import com.mojang.bridge.game.PackType; import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.client.screens.PFMGeneratingOverlay; import com.unlikepaladin.pfm.runtime.assets.PFMBlockstateModelProvider; import com.unlikepaladin.pfm.runtime.assets.PFMLangProvider; import com.unlikepaladin.pfm.runtime.data.PFMLootTableProvider; @@ -11,6 +12,7 @@ import com.unlikepaladin.pfm.runtime.data.PFMRecipeProvider; import com.unlikepaladin.pfm.runtime.data.PFMTagProvider; import com.unlikepaladin.pfm.utilities.PFMFileUtil; +import net.minecraft.client.MinecraftClient; import net.minecraft.data.DataCache; import net.minecraft.resource.ResourcePack; import net.minecraft.resource.ResourceType; @@ -29,9 +31,11 @@ public class PFMDataGenerator extends PFMGenerator { public PFMDataGenerator(Path output, boolean logOrDebug) { super(output, logOrDebug, LogManager.getLogger("PFM-DataGen")); + count = 4; } public void run() throws IOException { if (!FROZEN) { + count = 0; setDataRunning(true); log("Packs:"); for (ResourcePack pack : PFMRuntimeResources.RESOURCE_PACK_LIST) { @@ -56,6 +60,7 @@ public void run() throws IOException { List modList = Files.readAllLines(modListPath); if (!hashToCompare.toString().equals(oldHash.toString()) || !modList.toString().replace("[", "").replace("]", "").equals(PaladinFurnitureMod.getVersionMap().toString())) { getLogger().info("Starting PFM Data Generation"); + //MinecraftClient.getInstance().setOverlay(new PFMGeneratingOverlay(MinecraftClient.getInstance().getOverlay(), this, MinecraftClient.getInstance(), true)); PFMFileUtil.deleteDir(output.toFile()); DataCache dataCache = new DataCache(output, "cache"); dataCache.ignore(output.resolve("version.json")); @@ -113,8 +118,8 @@ public void run() throws IOException { } @Override - public int getProgress() { - return count / 4; + public float getProgress() { + return (float) count / 4; } @Override diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java index 4d5f33bbf..3628b7f61 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMResourceProgress.java @@ -1,7 +1,7 @@ package com.unlikepaladin.pfm.runtime; public interface PFMResourceProgress { - int getProgress(); + float getProgress(); String getProgressString(); } diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java index c5713dd10..e667f6780 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/PFMRuntimeResources.java @@ -1,9 +1,9 @@ package com.unlikepaladin.pfm.runtime; import com.unlikepaladin.pfm.PaladinFurnitureMod; +import com.unlikepaladin.pfm.client.screens.PFMGeneratingOverlay; import com.unlikepaladin.pfm.utilities.PFMFileUtil; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.MinecraftClient; import net.minecraft.resource.DirectoryResourcePack; import net.minecraft.resource.ResourcePack; import net.minecraft.util.Identifier; @@ -15,12 +15,13 @@ import java.util.Base64; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicReference; public class PFMRuntimeResources { public static final String base64Icon = "/9j/4AAQSkZJRgABAQAASABIAAD/2wBDABwcHBwcHDAcHDBEMDAwRFxEREREXHRcXFxcXHSMdHR0dHR0jIyMjIyMjIyoqKioqKjExMTExNzc3Nzc3Nzc3Nz/2wBDASIkJDg0OGA0NGDmnICc5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ubm5ub/wAARCAEAAQADASIAAhEBAxEB/8QAGQABAAMBAQAAAAAAAAAAAAAAAAEDBAUC/8QAKBABAQABAwQBBAIDAQAAAAAAAAECAxExBCEycVESIjNBYYETkaGx/8QAGAEBAAMBAAAAAAAAAAAAAAAAAAEDBAL/xAAcEQEBAAMBAQEBAAAAAAAAAAAAAQIDETEhUUH/2gAMAwEAAhEDEQA/ANADG2gAAAAAAAAAAAAAAt/w6n0/V9NVFliJZfAASAAAAAAAAAAAAAAAAAAAAAAAADRp9Nnn3y+2Nuno4afE7/LvHXary2SMWn02effL7Y26ejhp8Tv8rkWxdjhIpyztSo1NLTz5ndbvUOrHMci9rshN5qGRrABIAAAAAAAAAAAAAAAAAANGn02efe/bG3DRw0+J3+XeOu1XlskYsOmzz737Y26ejhp8Tv8AK5FsXY4SKcs7UotkRah05TbUAkAEJci81CbzUMjUACQAAAAAAAAAAAAAAABM5iEzmEQ6szs/l7mUsUveLWy2PdqASgAAAAAQlyLzUJvNQyNQAJAAAAAAAAAAAAAAAAEzmITOYRDpPeLw94tbNXoBLkAAAAAQlyLzUJvNQyNQAJAAAAAAAAAAAAAAAAEzmITOYRDpPeLw94tbNXoBLkAAAAAQlyLzUJvNQyNQAJAAAAAAAAAAAAAAAAEzmITOYRDpPeLw94tbNXoBLkAAAAAQlyLzULM8MsLfqn9q2SzjVKACQAAAAAAAAAAAAAAABM5iEzmEQ6T3i8PeLWzV6AS5AAASCEiQRtLNqzanTY3vh2v/ABqEWS+pmVnjkZ6eeF+6f28O1tLNqy6nS45d8O3/AIpy1/i3Hb+uePeennp37p/bwqs4tl6ACQAAAAAAAAAAABM5iEzmEQ6T3i8PeLWzV6BKXKEiQQkABIAAAACLJZtWXU6XHLvh2/j9NYi4y+pmVnjj56eendsps8O1ZLNqwdRo4YT6se3dRlr59i7HZ35WQBWtAAAAAAAAAAEzmIBDpnDLhr2ds/8AbTLvN40zKVRZxZMvl7m14Upls4dOeLh4mfy9zvwlykAAAAAQAi0SlFrzvuIDfdm6n8f9tFsnesfUauOWP049+7nO/HeE+sgDM0gAAAAAAAAAAADo4+M9Oc6OPjPS3Ur2Pcm6LNk48rFynqpMtnCvU1MdPKS8WPUsym8u6OxPFsz+VnLOmWzhLmxePEz+XrdKOJRa827iA33EW7cvE1ccrZj32Op4sFdtr3OA48av48vTlupq/jy9OWp2rtYAqWgAAAAAAAAAAADo4+M9Oc6OPjPS3Ur2PePKxXjysXKKw9V5z0zTK43eXZp6rznplZsvWjDxqw1/1n/tollm87ua0dP5X07wzvjnLD+taxWsnC5VUs2fUY49se9/4vy8b6clXsys8d4Yy+rM9TPPyv8AS3p/2zNPT/tXhe5fVmU5GpZOFaycNCivGr+PL05bqav48vTlqdq3WAKloAAAAAAAAAAAA6OPjPTnNenrY2THLss12Sq851px5WK8eU56mOE3yq/qmxk6rznplW6up/ky3k22VM2V7WjGcg0dP530ztHT+d9GHpl41rJwrWThpZ6jLxvpyXWy8b6clTtWahp6f9szR09ktlvLjD1Zl41rJwrWThpZ68av48vTlunrWTTu95jmKNvq3X4AK1oAAAAAAAAAAAAAD3jnnj43Z5ttu97oDqOAAkaOn876Z2jp/O+nWHrnLxrWThWsnDSz1GXjfTkutl4305Knas1ACpctw1sse17xbl1N22wm381lHUzrm4yptuV3t3qAcpABIAAAAAAAAAAAAAAAAAAu0LJld7tvFImXl6izs46aycOZjqZYcXt8Lr1N22xm1XTZFNwrVqZTHG73bs5ablcrvld0Ks8urMMeADl2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//2Q=="; + public static final DirectoryResourcePack ASSETS_PACK = new DirectoryResourcePack(getAssetPackDirectory().toFile()); public static final DirectoryResourcePack DATA_PACK = new DirectoryResourcePack(getDataPackDirectory().toFile()); @@ -56,8 +57,8 @@ public static Path createDirIfNeeded(Path path) { private static CompletableFuture future; public static CompletableFuture prepareAsyncDataGen(boolean logOrDebug) { + PFMDataGenerator dataGen = new PFMDataGenerator(PFMRuntimeResources.getDataPackDirectory(), logOrDebug); return future = CompletableFuture.runAsync(() -> { - PFMDataGenerator dataGen = new PFMDataGenerator(PFMRuntimeResources.getDataPackDirectory(), logOrDebug); try { dataGen.run(); } catch (IOException e) { @@ -68,8 +69,8 @@ public static CompletableFuture prepareAsyncDataGen(boolean logOrDebug) { } public static CompletableFuture prepareAsyncAssetGen(boolean logOrDebug) { + PFMAssetGenerator dataGen = new PFMAssetGenerator(PFMRuntimeResources.getAssetPackDirectory(), logOrDebug); return future = CompletableFuture.runAsync(() -> { - PFMAssetGenerator dataGen = new PFMAssetGenerator(PFMRuntimeResources.getAssetPackDirectory(), logOrDebug); try { dataGen.run(); } catch (IOException e) { From b8f2c21d711137a98bac366c9edfddd36feac561 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:05:18 -0600 Subject: [PATCH 08/17] Overhauled Toaster Model and Collision --- .../pfm/blocks/PFMToasterBlock.java | 2 +- .../block/iron_toaster/iron_toaster_off.json | 257 +++++------- .../block/iron_toaster/iron_toaster_on.json | 379 ++++-------------- .../pfm/textures/block/iron_toaster.png | Bin 0 -> 743 bytes 4 files changed, 175 insertions(+), 463 deletions(-) create mode 100644 common/src/main/resources/assets/pfm/textures/block/iron_toaster.png diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/PFMToasterBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/PFMToasterBlock.java index ae920a1c1..9e493800e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/PFMToasterBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/PFMToasterBlock.java @@ -45,7 +45,7 @@ protected void appendProperties(StateManager.Builder stateMan stateManager.add(FACING, ON); } - public static final VoxelShape IRON_TOASTER = VoxelShapes.union(createCuboidShape(4.8, 0, 3.8,11.2, 1, 12.2),createCuboidShape(5, 1, 4,11, 6, 12)); + public static final VoxelShape IRON_TOASTER = VoxelShapes.union(createCuboidShape(5, 0, 3,11, 7, 13)); public static final VoxelShape IRON_TOASTER_WEST_EAST = rotateShape(Direction.NORTH, Direction.WEST, IRON_TOASTER); @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) { diff --git a/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_off.json b/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_off.json index 7c3cf15e4..066450be0 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_off.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_off.json @@ -1,178 +1,131 @@ { "credit": "By UnlikePaladin", + "texture_size": [32, 32], "textures": { - "particle": "block/iron_block", - "base": "block/iron_block", - "accents": "block/gray_concrete" + "0": "pfm:block/iron_toaster", + "particle": "block/iron_block" }, "elements": [ { - "from": [4.8, 0, 3.8], - "to": [11.2, 1, 12.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [5, 1, 3], + "to": [6, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 4]}, "faces": { - "north": {"uv": [0, 0, 6.4, 1], "texture": "#accents"}, - "east": {"uv": [0, 0, 8.4, 1], "texture": "#accents"}, - "south": {"uv": [0, 0, 6.4, 1], "texture": "#accents"}, - "west": {"uv": [0, 0, 8.4, 1], "texture": "#accents"}, - "up": {"uv": [0, 0, 8.4, 6.4], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 8.4, 6.4], "rotation": 270, "texture": "#accents"} + "north": {"uv": [2.5, 8.5, 3, 11.5], "texture": "#0"}, + "east": {"uv": [7.5, 5, 12.5, 8], "texture": "#0"}, + "south": {"uv": [8, 0.5, 8.5, 3.5], "texture": "#0"}, + "west": {"uv": [0, 4.5, 5, 7.5], "texture": "#0"}, + "up": {"uv": [8, 5, 7.5, 0], "texture": "#0"} } }, { - "from": [7.6, 0.9, 11.9], - "to": [8.4, 1.7, 12.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [5, 0, 3], + "to": [11, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, -1, 4]}, "faces": { - "north": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "east": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "south": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "west": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "up": {"uv": [0, 0, 0.8, 0.8], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 0.8, 0.8], "rotation": 270, "texture": "#accents"} + "north": {"uv": [0, 11.5, 3, 12], "texture": "#0"}, + "east": {"uv": [0, 3.5, 5, 4], "texture": "#0"}, + "south": {"uv": [8, 3.5, 11, 4], "texture": "#0"}, + "west": {"uv": [0, 7.5, 5, 8], "texture": "#0"}, + "up": {"uv": [8, 5, 5, 0], "texture": "#0"}, + "down": {"uv": [8, 5, 5, 10], "texture": "#0", "cullface": "down"} } }, { - "from": [7.39, 5.08, 12], - "to": [8.6, 5.4, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [7, 1, 3], + "to": [9, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 4]}, "faces": { - "north": {"uv": [0, 0, 1.21, 0.32], "texture": "#accents"}, - "east": {"uv": [0, 0, 0.6, 0.32], "texture": "#accents"}, - "south": {"uv": [0, 0, 1.21, 0.32], "texture": "#accents"}, - "west": {"uv": [0, 0, 0.6, 0.32], "texture": "#accents"}, - "up": {"uv": [0, 0, 0.6, 1.20625], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 0.6, 1.20625], "rotation": 270, "texture": "#accents"} + "north": {"uv": [1, 8.5, 2, 11.5], "texture": "#0"}, + "east": {"uv": [7.5, 5, 12.5, 8], "texture": "#0"}, + "south": {"uv": [9, 0.5, 10, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 5, 12.5, 8], "texture": "#0"}, + "up": {"uv": [7, 5, 6, 0], "texture": "#0"} } }, { - "from": [7.79, 5.08, 11.1], - "to": [8.2, 5.4, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [10, 1, 3], + "to": [11, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 4]}, "faces": { - "north": {"uv": [0, 0, 0.41, 0.32], "texture": "#accents"}, - "east": {"uv": [0, 0, 0.9, 0.32], "texture": "#accents"}, - "south": {"uv": [0, 0, 0.41, 0.32], "texture": "#accents"}, - "west": {"uv": [0, 0, 0.9, 0.32], "texture": "#accents"}, - "up": {"uv": [0, 0, 0.9, 0.40625], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 0.9, 0.40625], "rotation": 270, "texture": "#accents"} + "north": {"uv": [0, 8.5, 0.5, 11.5], "texture": "#0"}, + "east": {"uv": [0, 0.5, 5, 3.5], "texture": "#0"}, + "south": {"uv": [10.5, 0.5, 11, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 5, 12.5, 8], "texture": "#0"}, + "up": {"uv": [8, 5, 7.5, 0], "texture": "#0"} } }, { - "from": [5.7, 1, 5], - "to": [10.4, 1.3, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [9, 1, 3], + "to": [10, 7, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 4]}, "faces": { - "north": {"uv": [0, 7, 5, 8], "texture": "#base"}, - "east": {"uv": [0, 6, 6, 7], "texture": "#base"}, - "south": {"uv": [5, 7, 10, 8], "texture": "#base"}, - "west": {"uv": [6, 6, 12, 7], "texture": "#base"}, - "up": {"uv": [5, 6, 0, 0], "texture": "#base"}, - "down": {"uv": [10, 0, 5, 6], "texture": "#base"} + "north": {"uv": [0.5, 8.5, 1, 11.5], "texture": "#0"}, + "south": {"uv": [11.5, 5, 12, 8], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [5, 1, 4], - "to": [5.7, 6, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [6, 1, 3], + "to": [7, 7, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 4]}, "faces": { - "north": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "east": {"uv": [3, 3, 7, 8], "texture": "#base"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "west": {"uv": [0, 1, 4, 6], "texture": "#base"}, - "up": {"uv": [3, 0, 11, 0.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [2, 8.5, 2.5, 11.5], "texture": "#0"}, + "south": {"uv": [11.5, 5, 12, 8], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [5, 1, 8], - "to": [5.7, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [6, 1, 12], + "to": [7, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 13]}, "faces": { - "north": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "east": {"uv": [0, 3, 4, 8], "texture": "#base"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "west": {"uv": [12, 4, 16, 9], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 0.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [8, 5, 8.5, 8], "texture": "#0"}, + "south": {"uv": [9, 0.5, 9.5, 3.5], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [10.3, 1, 4], - "to": [11, 6, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [9, 1, 12], + "to": [10, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 13]}, "faces": { - "north": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "east": {"uv": [12, 1, 16, 6], "texture": "#base"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "west": {"uv": [0, 1, 4, 6], "texture": "#base"}, - "up": {"uv": [15, 0.7, 7, 0], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 0, 9, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [8, 5, 8.5, 8], "texture": "#0"}, + "south": {"uv": [10, 0.5, 10.5, 3.5], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [10.3, 1, 8], - "to": [11, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [6, 5, 2], + "to": [8, 6, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 1]}, "faces": { - "north": {"uv": [15, 1, 15.7, 6], "texture": "#base"}, - "east": {"uv": [0, 1, 4, 6], "texture": "#base"}, - "south": {"uv": [15, 1, 15.7, 6], "texture": "#base"}, - "west": {"uv": [12, 4, 16, 9], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 0.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 1, 0.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 0.5], "texture": "#0"}, + "west": {"uv": [0.5, 0, 1, 0.5], "texture": "#0"}, + "up": {"uv": [1, 0, 0, 0.5], "texture": "#0"}, + "down": {"uv": [1, 0, 0, 0.5], "texture": "#0"} } }, { - "from": [6.8, 1, 5], - "to": [9.2, 6, 11.00438], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [9, 2, 2], + "to": [10, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3, 2.5]}, "faces": { - "north": {"uv": [0, 0, 2.7, 5], "texture": "#base"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#base"}, - "south": {"uv": [0, 0, 2.7, 5], "texture": "#base"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#base"}, - "up": {"uv": [3, 6, 9.00438, 8.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 6, 2.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0.5, 0, 0, 0.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.5, 0, 0, 0.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0.5, 0, 1, 0.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#0"} } }, { - "from": [5.7, 1, 11], - "to": [7.9, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [7, 2, 2.999], + "to": [8, 6, 2.999], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 0.9]}, "faces": { - "north": {"uv": [0, 0, 2.1, 5], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [0.9, 1, 3, 6], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 2.1], "rotation": 270, "texture": "#base"} - } - }, - { - "from": [8.1, 1, 11], - "to": [10.3, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 2.1, 5], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [13, 1, 15.1, 6], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "up": {"uv": [2, 0, 4, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 2.1], "rotation": 270, "texture": "#base"} - } - }, - { - "from": [5.7, 1, 4], - "to": [10.3, 6, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [1, 3, 7, 8], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [13, 1, 15.1, 6], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "up": {"uv": [7, 0, 15, 1], "texture": "#base"}, - "down": {"uv": [0, 0, 1, 2.1], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 2, 0.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 0.5], "rotation": 90, "texture": "#0"} } } ], @@ -188,21 +141,21 @@ "scale": [0.81, 0.86, 0.74] }, "firstperson_righthand": { - "rotation": [-1, -146, 0], - "translation": [1, 4.75, 0], - "scale": [0.85, 0.85, 0.85] + "rotation": [-1, 26, 0], + "translation": [1, 4.25, 0], + "scale": [0.68, 0.68, 0.68] }, "firstperson_lefthand": { - "rotation": [-1, -146, 0], - "translation": [1, 4.75, 0], - "scale": [0.85, 0.85, 0.85] + "rotation": [-1, -140, 0], + "translation": [1, 4.25, 0], + "scale": [0.68, 0.68, 0.68] }, "ground": { - "translation": [0, 1.25, 0], + "translation": [0, 1.5, 0], "scale": [0.7, 0.66, 0.65] }, "gui": { - "rotation": [30, 45, 0], + "rotation": [30, -135, 0], "translation": [0.5, 3.25, 0] }, "head": { @@ -210,35 +163,9 @@ "translation": [0, 12, 0] }, "fixed": { - "rotation": [0, -90, 0], - "translation": [-0.5, 4, -0.75], + "rotation": [0, -180, 0], + "translation": [0, 2.75, -0.75], "scale": [1.46, 1.46, 1.46] } - }, - "groups": [ - { - "name": "toaster", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - 1, - { - "name": "lever", - "origin": [8.4, 2.37, 8], - "color": 0, - "children": [2, 3] - }, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12 - ] - } - ] + } } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json b/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json index 0e4a91eab..4b201bb5a 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json @@ -1,301 +1,131 @@ { "credit": "By UnlikePaladin", + "texture_size": [32, 32], "textures": { - "2": "pfm:block/toaster_on", - "particle": "block/iron_block", - "base": "block/iron_block", - "accents": "block/gray_concrete" + "0": "pfm:block/iron_toaster", + "particle": "block/iron_block" }, "elements": [ { - "from": [4.8, 0, 3.8], - "to": [11.2, 1, 12.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [5, 1, 3], + "to": [6, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 4]}, "faces": { - "north": {"uv": [0, 0, 6.4, 1], "texture": "#accents"}, - "east": {"uv": [0, 0, 8.4, 1], "texture": "#accents"}, - "south": {"uv": [0, 0, 6.4, 1], "texture": "#accents"}, - "west": {"uv": [0, 0, 8.4, 1], "texture": "#accents"}, - "up": {"uv": [0, 0, 8.4, 6.4], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 8.4, 6.4], "rotation": 270, "texture": "#accents"} + "north": {"uv": [2.5, 8.5, 3, 11.5], "texture": "#0"}, + "east": {"uv": [7.5, 8, 12.5, 11], "texture": "#0"}, + "south": {"uv": [8, 0.5, 8.5, 3.5], "texture": "#0"}, + "west": {"uv": [0, 4.5, 5, 7.5], "texture": "#0"}, + "up": {"uv": [8, 5, 7.5, 0], "texture": "#0"} } }, { - "from": [7.6, 0.9, 11.9], - "to": [8.4, 1.7, 12.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [5, 0, 3], + "to": [11, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, -1, 4]}, "faces": { - "north": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "east": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "south": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "west": {"uv": [0, 0, 0.8, 0.8], "texture": "#accents"}, - "up": {"uv": [0, 0, 0.8, 0.8], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 0.8, 0.8], "rotation": 270, "texture": "#accents"} + "north": {"uv": [0, 11.5, 3, 12], "texture": "#0"}, + "east": {"uv": [0, 3.5, 5, 4], "texture": "#0"}, + "south": {"uv": [8, 3.5, 11, 4], "texture": "#0"}, + "west": {"uv": [0, 7.5, 5, 8], "texture": "#0"}, + "up": {"uv": [14, 5, 11, 0], "texture": "#0"}, + "down": {"uv": [8, 5, 5, 10], "texture": "#0", "cullface": "down"} } }, { - "from": [7.39, 2.08, 12], - "to": [8.6, 2.4, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [7, 1, 3], + "to": [9, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 4]}, "faces": { - "north": {"uv": [0, 0, 1.21, 0.32], "texture": "#accents"}, - "east": {"uv": [0, 0, 0.6, 0.32], "texture": "#accents"}, - "south": {"uv": [0, 0, 1.21, 0.32], "texture": "#accents"}, - "west": {"uv": [0, 0, 0.6, 0.32], "texture": "#accents"}, - "up": {"uv": [0, 0, 0.6, 1.20625], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 0.6, 1.20625], "rotation": 270, "texture": "#accents"} + "north": {"uv": [1, 8.5, 2, 11.5], "texture": "#0"}, + "east": {"uv": [7.5, 8, 12.5, 11], "texture": "#0"}, + "south": {"uv": [9, 0.5, 10, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 8, 12.5, 11], "texture": "#0"}, + "up": {"uv": [7, 5, 6, 0], "texture": "#0"} } }, { - "from": [7.79, 2.08, 11.1], - "to": [8.2, 2.4, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [10, 1, 3], + "to": [11, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 4]}, "faces": { - "north": {"uv": [0, 0, 0.41, 0.32], "texture": "#accents"}, - "east": {"uv": [0, 0, 0.9, 0.32], "texture": "#accents"}, - "south": {"uv": [0, 0, 0.41, 0.32], "texture": "#accents"}, - "west": {"uv": [0, 0, 0.9, 0.32], "texture": "#accents"}, - "up": {"uv": [0, 0, 0.9, 0.40625], "rotation": 90, "texture": "#accents"}, - "down": {"uv": [0, 0, 0.9, 0.40625], "rotation": 270, "texture": "#accents"} + "north": {"uv": [0, 8.5, 0.5, 11.5], "texture": "#0"}, + "east": {"uv": [0, 0.5, 5, 3.5], "texture": "#0"}, + "south": {"uv": [10.5, 0.5, 11, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 8, 12.5, 11], "texture": "#0"}, + "up": {"uv": [8, 5, 7.5, 0], "texture": "#0"} } }, { - "from": [5.7, 1, 5], - "to": [10.4, 1.3, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [9, 1, 3], + "to": [10, 7, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 4]}, "faces": { - "north": {"uv": [0, 7, 5, 8], "texture": "#base"}, - "east": {"uv": [0, 6, 6, 7], "texture": "#base"}, - "south": {"uv": [5, 7, 10, 8], "texture": "#base"}, - "west": {"uv": [6, 6, 12, 7], "texture": "#base"}, - "up": {"uv": [5, 6, 0, 0], "texture": "#base"}, - "down": {"uv": [10, 0, 5, 6], "texture": "#base"} + "north": {"uv": [0.5, 8.5, 1, 11.5], "texture": "#0"}, + "south": {"uv": [11.5, 8, 12, 11], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [5, 1, 4], - "to": [5.7, 6, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [6, 1, 3], + "to": [7, 7, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 4]}, "faces": { - "north": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "east": {"uv": [3, 3, 7, 8], "texture": "#base"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "west": {"uv": [0, 1, 4, 6], "texture": "#base"}, - "up": {"uv": [3, 0, 11, 0.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [2, 8.5, 2.5, 11.5], "texture": "#0"}, + "south": {"uv": [11.5, 8, 12, 11], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [5, 1, 8], - "to": [5.7, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [6, 1, 12], + "to": [7, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 13]}, "faces": { - "north": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "east": {"uv": [0, 3, 4, 8], "texture": "#base"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "west": {"uv": [12, 4, 16, 9], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 0.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [8, 8, 8.5, 11], "texture": "#0"}, + "south": {"uv": [9, 0.5, 9.5, 3.5], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [10.3, 1, 4], - "to": [11, 6, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [9, 1, 12], + "to": [10, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 13]}, "faces": { - "north": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "east": {"uv": [12, 1, 16, 6], "texture": "#base"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#base"}, - "west": {"uv": [0, 1, 4, 6], "texture": "#base"}, - "up": {"uv": [15, 0.7, 7, 0], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 0, 9, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [8, 8, 8.5, 11], "texture": "#0"}, + "south": {"uv": [10, 0.5, 10.5, 3.5], "texture": "#0"}, + "up": {"uv": [8, 1, 7.5, 0.5], "texture": "#0"} } }, { - "from": [10.3, 1, 8], - "to": [11, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [6, 5, 2], + "to": [8, 6, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 1]}, "faces": { - "north": {"uv": [15, 1, 15.7, 6], "texture": "#base"}, - "east": {"uv": [0, 1, 4, 6], "texture": "#base"}, - "south": {"uv": [15, 1, 15.7, 6], "texture": "#base"}, - "west": {"uv": [12, 4, 16, 9], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 0.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 1, 0.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 0.5], "texture": "#0"}, + "west": {"uv": [0.5, 0, 1, 0.5], "texture": "#0"}, + "up": {"uv": [1, 0, 0, 0.5], "texture": "#0"}, + "down": {"uv": [1, 0, 0, 0.5], "texture": "#0"} } }, { - "from": [6.8, 1, 5], - "to": [9.2, 6, 11.00438], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [9, 2, 2], + "to": [10, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3, 2.5]}, "faces": { - "north": {"uv": [0, 0, 2.7, 5], "texture": "#base"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#base"}, - "south": {"uv": [0, 0, 2.7, 5], "texture": "#base"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#base"}, - "up": {"uv": [3, 6, 9.00438, 8.7], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 6, 2.7], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0.5, 0, 0, 0.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.5, 0, 0, 0.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0.5, 0, 1, 0.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#0"} } }, { - "from": [5.7, 1, 11], - "to": [7.9, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, + "from": [7, 2, 2.999], + "to": [8, 6, 2.999], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 0.9]}, "faces": { - "north": {"uv": [0, 0, 2.1, 5], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [0.9, 1, 3, 6], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 2.1], "rotation": 270, "texture": "#base"} - } - }, - { - "from": [8.1, 1, 11], - "to": [10.3, 6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 2.1, 5], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [13, 1, 15.1, 6], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "up": {"uv": [2, 0, 4, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 2.1], "rotation": 270, "texture": "#base"} - } - }, - { - "from": [5.7, 1, 4], - "to": [10.3, 6, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [1, 3, 7, 8], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [13, 1, 15.1, 6], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "up": {"uv": [7, 0, 15, 1], "texture": "#base"}, - "down": {"uv": [0, 0, 1, 2.1], "rotation": 270, "texture": "#base"} - } - }, - { - "from": [5.7, 1, 5.01], - "to": [6.8, 6, 5.01], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [1, 0, 2, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [0, 0, 1.1, 6], "texture": "#2"} - } - }, - { - "from": [5.7, 1, 10.99], - "to": [6.8, 6, 10.99], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [1, 0, 2, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [0, 0, 1.1, 6], "texture": "#2"} - } - }, - { - "from": [6.79, 1, 5], - "to": [6.79, 6, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [7, 0, 8.1, 6], "texture": "#2"} - } - }, - { - "from": [5.72, 1, 5], - "to": [5.72, 6, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [0, 0, 1.1, 6], "texture": "#2"} - } - }, - { - "from": [5.7, 1.31, 5], - "to": [6.8, 1.31, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "up": {"uv": [6, 0, 7, 6], "texture": "#2"}, - "down": {"uv": [6, 0, 7, 6], "texture": "#2"} - } - }, - { - "from": [9.2, 1, 5.01], - "to": [10.3, 6, 5.01], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [0, 0, 1.1, 6], "texture": "#2"} - } - }, - { - "from": [9.2, 1, 10.99], - "to": [10.3, 6, 10.99], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [1, 0, 1.9, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [0, 0, 1.1, 6], "texture": "#2"} - } - }, - { - "from": [10.29, 1, 5], - "to": [10.29, 6, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [0, 0, 1.1, 6], "texture": "#2"} - } - }, - { - "from": [9.22, 1, 5], - "to": [9.22, 6, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "down": {"uv": [0, 0, 1.1, 6], "texture": "#2"} - } - }, - { - "from": [9.2, 1.31, 5], - "to": [10.3, 1.31, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8.4, 2, 8]}, - "faces": { - "north": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 1.1, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "up": {"uv": [6, 0, 7, 6], "texture": "#2"}, - "down": {"uv": [6, 0, 7, 6], "texture": "#2"} + "north": {"uv": [0, 0, 2, 0.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 0.5], "rotation": 90, "texture": "#0"} } } ], @@ -338,50 +168,5 @@ "translation": [0, 2.75, -0.75], "scale": [1.46, 1.46, 1.46] } - }, - "groups": [ - { - "name": "toaster", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - 1, - { - "name": "lever", - "origin": [8.4, 2.37, 8], - "color": 0, - "children": [2, 3] - }, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - { - "name": "on", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [13, 14, 15, 16, 17] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [18, 19, 20, 21, 22] - } - ] - } - ] - } - ] + } } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/textures/block/iron_toaster.png b/common/src/main/resources/assets/pfm/textures/block/iron_toaster.png new file mode 100644 index 0000000000000000000000000000000000000000..6d6ca2151e9333c343480b93cb6fea2a152cb80d GIT binary patch literal 743 zcmV?P)Pxtzrd${L5a;GOJA(3ThstN!&Jv+-mfc|Aa zBr=KYd9H`!566#+&kcveuv99Ez5zlABuT<_It2hUn@w~&9oV*wMx%jtyA1%~^9doC z&*uOD?cyU!7ZcdF4gbeGEWdS8tJNX|B+vC=+cw)cIyyq3Pyhhe zKF#xepT$?+23YOlD@uTCL6H)X2@JzXtR6swASK1(xO|#J#{xiUN=pawApOfy4UOOln}&E0DRiTPXN3Z5cqk1 zF7$C6b<+$Nj&rBLZk?20H_h;7ork=8zgg#n-_1M+M2+<%gQ$Pm54GnS5OV>K+dsG9 ze<~_709=j7DC&B|A=vfE!f`Md3{n-&>;k?|=#!Fo3?xw(i(J4rDP2DW9y|#>*M+94 zdn6XN&3*>nuJ;lU-31U#LRvYIWwuXAEF1?#U60NQ&M~P3#^Wn2S1VSXsL_Zl3oEC2 z4>>T7OfvugTCG+X?*q%S@cs4g)Vvp8`{^#==K$~f_`OY4(NvYGL1dYY+kCl-U^Zfx z4nKxd3Ggo9Z?iafx%oc8HM|1w0|^Nk>#L70$F Date: Sun, 29 Sep 2024 23:06:25 -0600 Subject: [PATCH 09/17] Overhauled White and Gray Stove Model and Collision --- .../unlikepaladin/pfm/blocks/StoveBlock.java | 12 +- .../assets/pfm/blockstates/gray_stove.json | 12 +- .../assets/pfm/blockstates/white_stove.json | 12 +- .../assets/pfm/models/block/gray_stove.json | 5 +- .../pfm/models/block/gray_stove_open.json | 5 +- .../assets/pfm/models/block/white_stove.json | 1309 ++-------------- .../pfm/models/block/white_stove_open.json | 1345 ++--------------- .../assets/pfm/textures/block/gray_stove.png | Bin 0 -> 1847 bytes .../assets/pfm/textures/block/white_stove.png | Bin 0 -> 1835 bytes 9 files changed, 281 insertions(+), 2419 deletions(-) create mode 100644 common/src/main/resources/assets/pfm/textures/block/gray_stove.png create mode 100644 common/src/main/resources/assets/pfm/textures/block/white_stove.png diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/StoveBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/StoveBlock.java index f10e1442e..6ed1fea1f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/StoveBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/StoveBlock.java @@ -128,8 +128,8 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); } - protected static final VoxelShape STOVE = VoxelShapes.union(createCuboidShape(0, 0, 0, 16, 16, 14),createCuboidShape(0, 1, 14, 16, 16, 15),createCuboidShape(1.8, 12.2, 15.5375, 14.3, 12.799, 16.1375),createCuboidShape(2.5, 12.2, 14.07, 3.1, 12.79, 15.56),createCuboidShape(12.6, 12.2, 14.07, 13.2, 12.79, 15.57),createCuboidShape(1.8, 2.89, 15.437, 14.3, 3.49, 16.037),createCuboidShape(2.5, 2.89, 13.47, 3.1, 3.49, 15.47),createCuboidShape(12.6, 2.89, 13.47, 13.2, 3.49, 15.47),createCuboidShape(0, 16, 0, 16, 19, 1)); - protected static final VoxelShape STOVE_NORTH = rotateShape(Direction.NORTH, Direction.SOUTH, STOVE); + protected static final VoxelShape STOVE = VoxelShapes.union(createCuboidShape(0, 0, 1, 16, 1, 16),createCuboidShape(0, 1, 0, 16, 16, 16),createCuboidShape(0, 16, 15, 16, 19, 16)); + protected static final VoxelShape STOVE_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, STOVE); protected static final VoxelShape STOVE_WEST = rotateShape(Direction.NORTH, Direction.WEST, STOVE); protected static final VoxelShape STOVE_EAST = rotateShape(Direction.NORTH, Direction.EAST, STOVE); @@ -137,10 +137,10 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { Direction dir = state.get(FACING); return switch (dir) { - case WEST -> STOVE_EAST; - case NORTH -> STOVE_NORTH; - case SOUTH -> STOVE; - default -> STOVE_WEST; + case WEST -> STOVE_WEST; + case NORTH -> STOVE; + case SOUTH -> STOVE_SOUTH; + default -> STOVE_EAST; }; } @Override diff --git a/common/src/main/resources/assets/pfm/blockstates/gray_stove.json b/common/src/main/resources/assets/pfm/blockstates/gray_stove.json index b2f1c2c11..e89dda5f1 100644 --- a/common/src/main/resources/assets/pfm/blockstates/gray_stove.json +++ b/common/src/main/resources/assets/pfm/blockstates/gray_stove.json @@ -1,14 +1,10 @@ {"variants": { - "open=false,facing=north":{"model":"pfm:block/gray_stove","y":180}, - "open=false,facing=east":{"model":"pfm:block/gray_stove","y":270}, - "open=false,facing=south":{"model":"pfm:block/gray_stove","y":0}, - "open=false,facing=west":{"model":"pfm:block/gray_stove","y":90}, + "facing=north":{"model":"pfm:block/gray_stove","y":0}, + "facing=east":{"model":"pfm:block/gray_stove","y":90}, + "facing=south":{"model":"pfm:block/gray_stove","y":180}, + "facing=west":{"model":"pfm:block/gray_stove","y":270} - "open=true,facing=north":{"model":"pfm:block/gray_stove_open","y":180}, - "open=true,facing=east":{"model":"pfm:block/gray_stove_open","y":270}, - "open=true,facing=south":{"model":"pfm:block/gray_stove_open","y":0}, - "open=true,facing=west":{"model":"pfm:block/gray_stove_open","y":90} } } diff --git a/common/src/main/resources/assets/pfm/blockstates/white_stove.json b/common/src/main/resources/assets/pfm/blockstates/white_stove.json index eadc6b253..a8d0f7779 100644 --- a/common/src/main/resources/assets/pfm/blockstates/white_stove.json +++ b/common/src/main/resources/assets/pfm/blockstates/white_stove.json @@ -1,14 +1,10 @@ {"variants": { - "open=true,facing=north":{"model":"pfm:block/white_stove_open","y":180}, - "open=true,facing=east":{"model":"pfm:block/white_stove_open","y":270}, - "open=true,facing=south":{"model":"pfm:block/white_stove_open","y":0}, - "open=true,facing=west":{"model":"pfm:block/white_stove_open","y":90}, + "facing=north":{"model":"pfm:block/white_stove", "y":0}, + "facing=east":{"model":"pfm:block/white_stove","y":90}, + "facing=south":{"model":"pfm:block/white_stove","y":180}, + "facing=west":{"model":"pfm:block/white_stove","y":270} - "open=false,facing=north":{"model":"pfm:block/white_stove","y":180}, - "open=false,facing=east":{"model":"pfm:block/white_stove","y":270}, - "open=false,facing=south":{"model":"pfm:block/white_stove","y":0}, - "open=false,facing=west":{"model":"pfm:block/white_stove","y":90} } } diff --git a/common/src/main/resources/assets/pfm/models/block/gray_stove.json b/common/src/main/resources/assets/pfm/models/block/gray_stove.json index bae786fb3..468b8ce6e 100644 --- a/common/src/main/resources/assets/pfm/models/block/gray_stove.json +++ b/common/src/main/resources/assets/pfm/models/block/gray_stove.json @@ -2,8 +2,7 @@ "credit": "By UnlikePaladin", "parent": "pfm:block/white_stove", "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" + "particle": "pfm:block/gray_stove", + "0": "pfm:block/gray_stove" } } diff --git a/common/src/main/resources/assets/pfm/models/block/gray_stove_open.json b/common/src/main/resources/assets/pfm/models/block/gray_stove_open.json index 7dc3d12aa..db5c14cf4 100644 --- a/common/src/main/resources/assets/pfm/models/block/gray_stove_open.json +++ b/common/src/main/resources/assets/pfm/models/block/gray_stove_open.json @@ -2,8 +2,7 @@ "credit": "By UnlikePaladin", "parent": "pfm:block/white_stove_open", "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" + "particle": "pfm:block/gray_stove", + "0": "pfm:block/gray_stove" } } diff --git a/common/src/main/resources/assets/pfm/models/block/white_stove.json b/common/src/main/resources/assets/pfm/models/block/white_stove.json index 1625808ae..11c69b10a 100644 --- a/common/src/main/resources/assets/pfm/models/block/white_stove.json +++ b/common/src/main/resources/assets/pfm/models/block/white_stove.json @@ -1,1296 +1,217 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete", - "legs": "block/gray_concrete" + "0": "pfm:block/white_stove", + "particle": "pfm:block/white_stove" }, "elements": [ { - "from": [0, 0, 0], - "to": [16, 1, 14], + "name": "grill", + "from": [1, 16.01, 1], + "to": [15, 16.01, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 14], "texture": "#base"} + "up": {"uv": [16, 3.5, 12.5, 0], "rotation": 180, "texture": "#0"} } }, { - "from": [2, 4, 1], - "to": [14, 5, 14], + "name": "base", + "from": [0, 0, 1], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8.5]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 13], "texture": "#base"} - } - }, - { - "from": [2, 5, 2], - "to": [14, 14, 2.2], - "faces": { - "north": {"uv": [0, 0, 9, 12], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 9, 0.2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 9, 12], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 9, 0.2], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 0.2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 14, 12, 14.2], "texture": "#legs"} - } - }, - { - "from": [1.9, 5, 1.9], - "to": [2.1, 14, 13.9], - "faces": { - "north": {"uv": [0, 0, 9, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 9, 12], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 9, 0.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 9, 12], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 0.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 12, 14.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "from": [13.9, 5, 1.9], - "to": [14.1, 14, 13.9], - "faces": { - "north": {"uv": [0, 0, 9, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 9, 12], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 9, 0.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 9, 12], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 0.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 12, 14.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "from": [2, 15, 2], - "to": [14, 15.8, 14], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 13.2, 2], - "to": [14, 14, 14], - "faces": { - "north": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "up": {"uv": [4, 2, 16, 14], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} - } - }, - { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 13.9], - "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "up": {"uv": [4, 2, 16, 14], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} - } - }, - { - "from": [2, 5.9, 2.9], - "to": [14, 6.1, 3.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 8], - "to": [14, 6.1, 8.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 12.9], - "to": [14, 6.1, 13.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 2.9], - "to": [2.2, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 5.9, 2.9], - "to": [13.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 5.9, 2.9], - "to": [12.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 5.9, 2.9], - "to": [10.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 5.9, 2.9], - "to": [9.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 5.9, 2.9], - "to": [7.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 5.9, 2.9], - "to": [6.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 5.9, 2.9], - "to": [4.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 5.9, 2.9], - "to": [3.6, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [14, 8.6, 3.1], - "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 16, 2.2], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 2.2], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 8], - "to": [14, 8.6, 8.2], - "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 16, 2.2], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 2.2], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 12.9], - "to": [14, 8.6, 13.1], - "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 16, 2.2], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 2.2], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [2.2, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [13.7, 8.4, 2.9], - "to": [13.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [12.2, 8.4, 2.9], - "to": [12.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [10.7, 8.4, 2.9], - "to": [10.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [9.2, 8.4, 2.9], - "to": [9.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [7.7, 8.4, 2.9], - "to": [7.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [6.2, 8.4, 2.9], - "to": [6.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [4.7, 8.4, 2.9], - "to": [4.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [3.4, 8.4, 2.9], - "to": [3.6, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [2.8, 15.6, 2.7], - "to": [6.3, 15.9, 6.2], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [9.8, 15.6, 3.2], - "to": [12.8, 15.9, 6.2], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [9.8, 15.6, 9.8], - "to": [13.3, 15.9, 13.3], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [3.05, 15.65, 9.55], - "to": [6.55, 15.95, 13.05], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [3.05, 15.65, 2.95], - "to": [6.05, 15.95, 5.95], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [10.05, 15.65, 3.45], - "to": [12.55, 15.95, 5.95], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [10.05, 15.65, 10.05], - "to": [13.05, 15.95, 13.05], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [2.8, 15.6, 9.3], - "to": [6.8, 15.9, 13.3], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} + "north": {"uv": [0, 11.75, 4, 12], "texture": "#0"}, + "east": {"uv": [3.75, 7.75, 0, 8], "texture": "#0"}, + "south": {"uv": [4, 11.75, 8, 12], "texture": "#0"}, + "west": {"uv": [0, 4, 3.75, 3.75], "texture": "#0"}, + "up": {"uv": [3.75, 16, 0, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.5, 4, 4.75, 8], "rotation": 90, "texture": "#0"} } }, { + "name": "main", "from": [0, 1, 0], - "to": [2, 16, 14], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 1]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#base"} + "north": {"uv": [0, 8, 4, 11.75], "texture": "#0"}, + "east": {"uv": [4, 4, 0, 7.75], "texture": "#0"}, + "south": {"uv": [4, 8, 8, 11.75], "texture": "#0"}, + "west": {"uv": [0, 0, 4, 3.75], "texture": "#0"}, + "up": {"uv": [8.5, 4, 4.25, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.25, 4, 4.25, 8], "rotation": 90, "texture": "#0"} } }, { - "name": "door", - "from": [5, 16.9, 0.06875], - "to": [11.5, 18.4, 1.06875], + "name": "control_top", + "from": [0, 16, 15], + "to": [16, 19, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 15]}, "faces": { - "north": {"uv": [0, 0, 1.5, 6.5], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.5, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.5, 6.5], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.5, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 6.5], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 6.5], "rotation": 270, "texture": "#legs"} + "north": {"uv": [8.5, 0, 12.5, 0.75], "texture": "#0"}, + "east": {"uv": [8.5, 1.75, 8.75, 2.5], "texture": "#0"}, + "south": {"uv": [8.5, 1, 12.5, 1.75], "texture": "#0"}, + "west": {"uv": [8.75, 1.75, 9, 2.5], "texture": "#0"}, + "up": {"uv": [8.5, 1, 12.5, 1.25], "texture": "#0"} } }, { - "name": "door", - "from": [10, 17.05, 0.16875], - "to": [10.5, 17.55, 1.16875], + "from": [4, 2, -1.01562], + "to": [12, 3, -0.01562], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, -1.01562]}, "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "name": "door", - "from": [10, 17.75, 0.16875], - "to": [10.5, 18.25, 1.16875], + "from": [12, 3, -0.01562], + "to": [4, 2, -1.01562], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3, -0.01562]}, "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "name": "door", - "from": [10.8, 17.05, 0.16875], - "to": [11.3, 17.55, 1.16875], + "from": [14, 12, -0.01562], + "to": [2, 11, -1.01562], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 12, -0.01562]}, "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "name": "door", - "from": [10.8, 17.75, 0.16875], - "to": [11.3, 18.25, 1.16875], + "from": [2, 11, -1.01562], + "to": [14, 12, -0.01562], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 1.98438]}, "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "name": "door", - "from": [6.1, 17.05, 0.16875], - "to": [6.6, 17.55, 1.16875], + "from": [15, 14, 15], + "to": [1, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 15, 27]}, "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [11.25, 15.75, 7.75, 12.5], "texture": "#0"}, + "east": {"uv": [4, 16, 7.5, 12.25], "texture": "#0"}, + "south": {"uv": [7.75, 12.5, 11.25, 15.75], "texture": "#0"}, + "west": {"uv": [4, 16, 7.5, 12.25], "texture": "#0"}, + "down": {"uv": [7.5, 15.75, 4, 12.25], "rotation": 270, "texture": "#0"} } }, { - "name": "door", - "from": [6.1, 17.75, 0.16875], - "to": [6.6, 18.25, 1.16875], + "from": [1, 1, 5], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 1]}, "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } }, { - "name": "door", - "from": [5.3, 17.05, 0.16875], - "to": [5.8, 17.55, 1.16875], + "from": [1, 5, 5], + "to": [15, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 1]}, "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [5.3, 17.75, 0.16875], - "to": [5.8, 18.25, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [7.3, 17.7, 0.16875], - "to": [9.3, 18.2, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 2], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [14, 1, 0], - "to": [16, 16, 14], - "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [14, 1, 16, 15], "texture": "#base"} - } - }, - { - "name": "door", - "from": [2, 14, 13.26875], - "to": [3.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [4, 14, 13.26875], - "to": [5.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [7.3, 13.9, 13.26875], - "to": [8.8, 15.4, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [11, 14, 13.26875], - "to": [12.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13, 14, 13.26875], - "to": [14.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "from": [0, 1, 14], - "to": [16, 4, 15], - "faces": { - "north": {"uv": [0, 11, 16, 14], "texture": "#base"}, - "east": {"uv": [1, 11, 2, 14], "texture": "#base"}, - "south": {"uv": [0, 11, 16, 14], "texture": "#base"}, - "west": {"uv": [14, 11, 15, 14], "texture": "#base"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#base"}, - "down": {"uv": [0, 1, 16, 2], "texture": "#base"} - } - }, - { - "from": [0, 13.5, 14], - "to": [16, 16, 15], - "faces": { - "north": {"uv": [0, 1, 16, 3.5], "texture": "#base"}, - "east": {"uv": [14, 0, 15, 2.5], "texture": "#base"}, - "south": {"uv": [0, 8, 16, 10.5], "texture": "#base"}, - "west": {"uv": [5, 5, 6, 7.5], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#base"} - } - }, - { - "from": [0, 4.5, 14], - "to": [3, 13, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 3, 6, 11.5], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#base"}, - "south": {"uv": [0, 3, 3, 11.5], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#base"}, - "up": {"uv": [2, 0, 5, 1], "texture": "#base"}, - "down": {"uv": [2, 14, 5, 15], "texture": "#base"} - } - }, - { - "from": [3, 5.5, 14.5], - "to": [13, 11.8, 14.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 4.2, 13, 10.5], "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "texture": "#2"}, - "south": {"uv": [3, 4.2, 13, 10.5], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 10.5], "texture": "#2"}, - "up": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "down": {"uv": [3, 1.4, 13, 1.5], "texture": "#2"} - } - }, - { - "from": [13, 4.5, 14], - "to": [16, 13, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [7, 6, 10, 14.5], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#base"}, - "south": {"uv": [7, 3, 10, 11.5], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#base"}, - "up": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "down": {"uv": [0, 14, 3, 15], "texture": "#base"} - } - }, - { - "from": [3, 11.7, 14], - "to": [13, 13, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [1, 7, 11, 8.3], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 4.3], "texture": "#base"}, - "south": {"uv": [0, 3, 10, 4.3], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 4.3], "texture": "#base"}, - "up": {"uv": [0, 0, 10, 1], "texture": "#base"}, - "down": {"uv": [0, 14, 10, 15], "texture": "#base"} - } - }, - { - "from": [3, 4.5, 14], - "to": [13, 5.8, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 9, 13, 10.5], "texture": "#base"}, - "east": {"uv": [1, 9, 2, 10.5], "texture": "#base"}, - "south": {"uv": [3, 9, 13, 10.5], "texture": "#base"}, - "west": {"uv": [14, 9, 15, 10.5], "texture": "#base"}, - "up": {"uv": [3, 14, 13, 15], "texture": "#base"}, - "down": {"uv": [3, 1, 13, 2], "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.8, 12.2, 15.5375], - "to": [14.3, 12.8, 16.1375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 12.2, 14.06875], - "to": [3.1, 12.8, 15.56875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 12.2, 14.06875], - "to": [13.2, 12.8, 15.56875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [0.025, 3.975, 13.7], - "to": [15.985, 5.075, 14.2], - "faces": { - "north": {"uv": [-0.96, 7, 15, 8.1], "texture": "#legs"}, - "east": {"uv": [3.04, 3, 3.54, 4.1], "texture": "#legs"}, - "south": {"uv": [-1.96, 3, 14, 4.1], "texture": "#legs"}, - "west": {"uv": [0.04, 3, 0.54, 4.1], "texture": "#legs"}, - "up": {"uv": [0.04, 0, 16, 0.5], "texture": "#legs"}, - "down": {"uv": [0.04, 14, 16, 14.5], "texture": "#legs"} - } - }, - { - "from": [0.025, 5.075, 13.7], - "to": [2.005, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 2.98, 15.1], "texture": "#legs"}, - "east": {"uv": [5, 3, 5.5, 11.1], "texture": "#legs"}, - "south": {"uv": [0, 3, 1.98, 11.1], "texture": "#legs"}, - "west": {"uv": [2, 3, 2.5, 11.1], "texture": "#legs"}, - "up": {"uv": [2, 0, 3.98, 0.5], "texture": "#legs"}, - "down": {"uv": [2, 14, 3.98, 14.5], "texture": "#legs"} - } - }, - { - "from": [13.975, 5.075, 13.7], - "to": [15.975, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 3, 15.1], "texture": "#legs"}, - "east": {"uv": [5, 3, 5.5, 11.1], "texture": "#legs"}, - "south": {"uv": [0, 3, 2, 11.1], "texture": "#legs"}, - "west": {"uv": [2, 3, 2.5, 11.1], "texture": "#legs"}, - "up": {"uv": [2, 0, 4, 0.5], "texture": "#legs"}, - "down": {"uv": [2, 14, 4, 14.5], "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.8, 2.9, 15.4375], - "to": [14.3, 3.5, 16.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 2.9, 13.46875], - "to": [3.1, 3.5, 15.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 2.9, 13.46875], - "to": [13.2, 3.5, 15.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [0.025, 13, 13.7], - "to": [15.985, 13.5, 14.2], - "faces": { - "north": {"uv": [0, 7, 15.96, 7.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 5.5, 3.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 15.96, 3.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 2.5, 3.5], "texture": "#legs"}, - "up": {"uv": [0, 0, 15.96, 0.5], "texture": "#legs"}, - "down": {"uv": [0, 14, 15.96, 14.5], "texture": "#legs"} - } - }, - { - "from": [2, 1, 0], - "to": [14, 16, 2], - "faces": { - "north": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#base"}, - "down": {"uv": [2, 14, 14, 16], "texture": "#base"} - } - }, - { - "from": [0, 16, 0], - "to": [16, 19, 1], - "faces": { - "north": {"uv": [0, 2, 16, 5], "texture": "#base"}, - "east": {"uv": [2, 2, 3, 5], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 5], "texture": "#base"}, - "west": {"uv": [0, 2, 1, 5], "texture": "#base"}, - "up": {"uv": [0, 4, 16, 5], "texture": "#base"}, - "down": {"uv": [0, 6, 16, 7], "texture": "#base"} - } - }, - { - "name": "door", - "from": [7.8, 15.9, 2.33125], - "to": [8, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [9.8, 15.9, 2.23125], - "to": [10, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [5.8, 15.9, 2.23125], - "to": [6, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [3.8, 15.9, 2.23125], - "to": [4, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2, 15.9, 2.23125], - "to": [2.2, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [11.8, 15.9, 2.33125], - "to": [12, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.8, 15.9, 2.33125], - "to": [14, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 8.2], - "to": [13.93125, 16.1, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 6.1], - "to": [13.93125, 16.1, 6.3], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 4], - "to": [13.83125, 16.1, 4.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 10.3], - "to": [13.93125, 16.1, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 12.2], - "to": [14.00937, 16.1, 12.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 13.8], - "to": [14.00937, 16.1, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.00469, 15.9, 2.2], - "to": [13.99375, 16.1, 2.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } } ], "display": { "thirdperson_righthand": { - "rotation": [59, -140, 0], + "rotation": [59, 45, 0], "translation": [-0.5, 0.25, -1.5], "scale": [0.39, 0.39, 0.39] }, "thirdperson_lefthand": { - "rotation": [59, -140, 0], + "rotation": [59, 45, 0], "translation": [-0.5, 0.25, -1.5], "scale": [0.39, 0.39, 0.39] }, "firstperson_righthand": { - "rotation": [-1, -146, 0], + "rotation": [-1, 145, 0], "translation": [1, 0.75, 0], "scale": [0.32, 0.32, 0.32] }, "firstperson_lefthand": { - "rotation": [-1, -146, 0], - "translation": [0.75, 0.75, 0], + "rotation": [-1, 145, 0], + "translation": [1, 0.75, 0], "scale": [0.32, 0.32, 0.32] }, "ground": { - "translation": [0, -0.75, 0], + "translation": [0, 1.5, 0], "scale": [0.39, 0.39, 0.39] }, "gui": { - "rotation": [30, 45, 0], + "rotation": [30, -135, 0], "translation": [0.5, -0.5, 0], "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [-1, -180, 0], - "translation": [0, 0, -1.75], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [-0.25, -0.5, -3.5], - "scale": [0.9, 0.9, 0.9] } }, "groups": [ { - "name": "stove", - "origin": [0, 0, 0], + "name": "oven", + "origin": [8, 3.5, 8.5], "color": 0, "children": [ { - "name": "Base", - "origin": [0, 0, 0], + "name": "outside", + "origin": [0, 0, 15], "color": 0, "children": [ 0, 1, 2, 3, - 4, - 5, - 6, - 7, - { - "name": "griddle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] - }, { - "name": "griddle_top", - "origin": [0, 0, 0], + "name": "handlebottom", + "origin": [5, 11, 0], "color": 0, - "children": [20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31] + "children": [4, 5] }, { - "name": "burners", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], "color": 0, - "children": [ - 32, - 33, - 34, - { - "name": "burnertips", - "origin": [0, 0, 0], - "color": 0, - "children": [35, 36, 37, 38] - }, - 39 - ] + "children": [6, 7] }, - 40, { - "name": "oven_controls", - "origin": [0, 0, 0], + "name": "grill", + "origin": [8, 7, 8.5], "color": 0, - "children": [41, 42, 43, 44, 45, 46, 47, 48, 49, 50] - }, - 51, - { - "name": "cooktop_controls", - "origin": [0, 0, 0], - "color": 0, - "children": [52, 53, 54, 55, 56] - }, - 57, - 58, - { - "name": "stove_door", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 59, - 60, - 61, - 62, - 63, - { - "name": "stove_handle", - "origin": [0, 0, 0], - "color": 0, - "children": [64, 65, 66] - } - ] - }, - 67, - 68, - 69, + "children": [] + } + ] + }, + { + "name": "inside", + "origin": [1, 8.5, 8], + "color": 0, + "children": [ + 8, { - "name": "bottom_stove_handle", - "origin": [0, 0, 0], + "name": "oven_grate", + "origin": [8, 3.5, 8.5], "color": 0, - "children": [70, 71, 72] - }, - 73, - 74, - 75 + "children": [9, 10] + } ] } ] - }, - { - "name": "griddle", - "origin": [0, 0, 0], - "color": 0, - "children": [76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_stove_open.json b/common/src/main/resources/assets/pfm/models/block/white_stove_open.json index 3eda56f47..b0f123c3f 100644 --- a/common/src/main/resources/assets/pfm/models/block/white_stove_open.json +++ b/common/src/main/resources/assets/pfm/models/block/white_stove_open.json @@ -1,1296 +1,247 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete", - "legs": "block/gray_concrete" + "0": "pfm:block/white_stove", + "particle": "pfm:block/white_stove" }, "elements": [ { - "from": [0, 0, 0], - "to": [16, 1, 14], + "name": "grill", + "from": [1, 16, 1], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 14], "texture": "#base"} + "up": {"uv": [16, 3.5, 12.5, 0], "rotation": 180, "texture": "#0"} } }, { - "from": [2, 4, 1], - "to": [14, 5, 14], + "name": "base", + "from": [0, 0, 1], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8.5]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 13], "texture": "#base"} + "north": {"uv": [0, 11.75, 4, 12], "texture": "#0"}, + "east": {"uv": [3.75, 7.75, 0, 8], "texture": "#0"}, + "south": {"uv": [4, 11.75, 8, 12], "texture": "#0"}, + "west": {"uv": [0, 4, 3.75, 3.75], "texture": "#0"}, + "up": {"uv": [3.75, 16, 0, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.5, 4, 4.75, 8], "rotation": 90, "texture": "#0"} } }, { - "from": [2, 5, 2], - "to": [14, 14, 2.2], + "from": [4, 1.7, -1.01562], + "to": [12, 2.7, -0.01562], + "rotation": {"angle": -45, "axis": "x", "origin": [7, 1.7, 0]}, "faces": { - "north": {"uv": [0, 0, 9, 12], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 9, 0.2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 9, 12], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 9, 0.2], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 0.2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 14, 12, 14.2], "texture": "#legs"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [1.9, 5, 1.9], - "to": [2.1, 14, 13.9], + "from": [12, 2.7, -0.01562], + "to": [4, 1.7, -1.01562], + "rotation": {"angle": -45, "axis": "x", "origin": [7, 1.7, 0]}, "faces": { - "north": {"uv": [0, 0, 9, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 9, 12], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 9, 0.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 9, 12], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 0.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 12, 14.2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [13.9, 5, 1.9], - "to": [14.1, 14, 13.9], + "name": "main", + "from": [0, 0.5, 0.2], + "to": [16, 11.5, 1.2], + "rotation": {"angle": -45, "axis": "x", "origin": [7, 1.7, 0]}, "faces": { - "north": {"uv": [0, 0, 9, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 9, 12], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 9, 0.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 9, 12], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 0.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 12, 14.2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 9, 4, 11.75], "texture": "#0"}, + "east": {"uv": [0.25, 5, 0, 7.75], "texture": "#0"}, + "south": {"uv": [0, 9, 4, 11.75], "texture": "#0"}, + "west": {"uv": [0, 1, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [4.5, 4, 4.25, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [4.5, 4, 4.25, 8], "rotation": 90, "texture": "#0"} } }, { - "from": [2, 15, 2], - "to": [14, 15.8, 14], + "from": [14, 11.7, -0.01562], + "to": [2, 10.7, -1.01562], + "rotation": {"angle": -45, "axis": "x", "origin": [7, 1.7, 0]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [2, 13.2, 2], - "to": [14, 14, 14], + "from": [2, 10.7, -1.01562], + "to": [14, 11.7, -0.01562], + "rotation": {"angle": -45, "axis": "x", "origin": [7, 1.7, 0]}, "faces": { - "north": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.8], "texture": "#legs"}, - "up": {"uv": [4, 2, 16, 14], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 13.9], + "name": "main", + "from": [0, 1, 1], + "to": [16, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.2], "texture": "#legs"}, - "up": {"uv": [4, 2, 16, 14], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} + "east": {"uv": [4, 5, 0.25, 7.75], "texture": "#0"}, + "south": {"uv": [4, 9, 8, 11.75], "texture": "#0"}, + "west": {"uv": [0.25, 1, 4, 3.75], "texture": "#0"}, + "up": {"uv": [8.5, 4, 4.25, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.25, 4, 4.5, 8], "rotation": 90, "texture": "#0"} } }, { - "from": [2, 5.9, 2.9], - "to": [14, 6.1, 3.1], + "name": "main", + "from": [0, 12, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 4, 0, 5], "texture": "#0"}, + "south": {"uv": [4, 8, 8, 9], "texture": "#0"}, + "west": {"uv": [0, 0, 4, 1], "texture": "#0"}, + "up": {"uv": [8.5, 4, 4.25, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.25, 4, 4.25, 8], "rotation": 90, "texture": "#0"} } }, { - "from": [2, 5.9, 8], - "to": [14, 6.1, 8.2], + "name": "control_top", + "from": [0, 16, 15], + "to": [16, 19, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 15]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 0, 12.5, 0.75], "texture": "#0"}, + "east": {"uv": [8.5, 1.75, 8.75, 2.5], "texture": "#0"}, + "south": {"uv": [8.5, 1, 12.5, 1.75], "texture": "#0"}, + "west": {"uv": [8.75, 1.75, 9, 2.5], "texture": "#0"}, + "up": {"uv": [8.5, 1, 12.5, 1.25], "texture": "#0"} } }, { - "from": [2, 5.9, 12.9], - "to": [14, 6.1, 13.1], + "from": [1, 1, 15], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [7.75, 12, 11.25, 15.75], "texture": "#0"} } }, { - "from": [2, 5.9, 2.9], - "to": [2.2, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 5.9, 2.9], - "to": [13.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 5.9, 2.9], - "to": [12.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 5.9, 2.9], - "to": [10.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 5.9, 2.9], - "to": [9.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 5.9, 2.9], - "to": [7.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 5.9, 2.9], - "to": [6.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 5.9, 2.9], - "to": [4.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 5.9, 2.9], - "to": [3.6, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [14, 8.6, 3.1], - "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 16, 2.2], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 2.2], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 8], - "to": [14, 8.6, 8.2], - "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 16, 2.2], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 2.2], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 12.9], - "to": [14, 8.6, 13.1], - "faces": { - "north": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 16, 2.2], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 2.2], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [2.2, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [13.7, 8.4, 2.9], - "to": [13.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [12.2, 8.4, 2.9], - "to": [12.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [10.7, 8.4, 2.9], - "to": [10.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [9.2, 8.4, 2.9], - "to": [9.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [7.7, 8.4, 2.9], - "to": [7.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [6.2, 8.4, 2.9], - "to": [6.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [4.7, 8.4, 2.9], - "to": [4.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [3.4, 8.4, 2.9], - "to": [3.6, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "east": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "south": {"uv": [2, 0, 2.2, 0.2], "texture": "#3"}, - "west": {"uv": [2, 0, 12, 0.2], "texture": "#3"}, - "up": {"uv": [4, 2, 4.2, 12], "texture": "#3"}, - "down": {"uv": [2, 2, 2.2, 12], "texture": "#3"} - } - }, - { - "from": [2.8, 15.6, 2.7], - "to": [6.3, 15.9, 6.2], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [9.8, 15.6, 3.2], - "to": [12.8, 15.9, 6.2], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [9.8, 15.6, 9.8], - "to": [13.3, 15.9, 13.3], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [3.05, 15.65, 9.55], - "to": [6.55, 15.95, 13.05], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [3.05, 15.65, 2.95], - "to": [6.05, 15.95, 5.95], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [10.05, 15.65, 3.45], - "to": [12.55, 15.95, 5.95], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [10.05, 15.65, 10.05], - "to": [13.05, 15.95, 13.05], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [2.8, 15.6, 9.3], - "to": [6.8, 15.9, 13.3], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [0, 1, 0], - "to": [2, 16, 14], - "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#base"} - } - }, - { - "name": "door", - "from": [5, 16.9, 0.06875], - "to": [11.5, 18.4, 1.06875], - "faces": { - "north": {"uv": [0, 0, 1.5, 6.5], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.5, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.5, 6.5], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.5, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 6.5], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 6.5], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [10, 17.05, 0.16875], - "to": [10.5, 17.55, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [10, 17.75, 0.16875], - "to": [10.5, 18.25, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [10.8, 17.05, 0.16875], - "to": [11.3, 17.55, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [10.8, 17.75, 0.16875], - "to": [11.3, 18.25, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [6.1, 17.05, 0.16875], - "to": [6.6, 17.55, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [6.1, 17.75, 0.16875], - "to": [6.6, 18.25, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [5.3, 17.05, 0.16875], - "to": [5.8, 17.55, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [5.3, 17.75, 0.16875], - "to": [5.8, 18.25, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 0.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [7.3, 17.7, 0.16875], - "to": [9.3, 18.2, 1.16875], - "faces": { - "north": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.5, 2], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [14, 1, 0], - "to": [16, 16, 14], - "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [14, 1, 16, 15], "texture": "#base"} - } - }, - { - "name": "door", - "from": [2, 14, 13.26875], - "to": [3.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [4, 14, 13.26875], - "to": [5.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [7.3, 13.9, 13.26875], - "to": [8.8, 15.4, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [11, 14, 13.26875], - "to": [12.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13, 14, 13.26875], - "to": [14.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "from": [0, 1, 14], - "to": [16, 4, 15], - "faces": { - "north": {"uv": [0, 11, 16, 14], "texture": "#base"}, - "east": {"uv": [1, 11, 2, 14], "texture": "#base"}, - "south": {"uv": [0, 11, 16, 14], "texture": "#base"}, - "west": {"uv": [14, 11, 15, 14], "texture": "#base"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#base"}, - "down": {"uv": [0, 1, 16, 2], "texture": "#base"} - } - }, - { - "from": [0, 13.5, 14], + "from": [15, 1, 1], "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 8.5, 8]}, "faces": { - "north": {"uv": [0, 1, 16, 3.5], "texture": "#base"}, - "east": {"uv": [14, 0, 15, 2.5], "texture": "#base"}, - "south": {"uv": [0, 8, 16, 10.5], "texture": "#base"}, - "west": {"uv": [5, 5, 6, 7.5], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#base"} - } - }, - { - "from": [0, 4.5, 14], - "to": [3, 13, 15], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 3, 6, 11.5], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#base"}, - "south": {"uv": [0, 3, 3, 11.5], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#base"}, - "up": {"uv": [2, 0, 5, 1], "texture": "#base"}, - "down": {"uv": [2, 14, 5, 15], "texture": "#base"} - } - }, - { - "from": [3, 5.5, 14.5], - "to": [13, 11.8, 14.6], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 4.2, 13, 10.5], "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "texture": "#2"}, - "south": {"uv": [3, 4.2, 13, 10.5], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 10.5], "texture": "#2"}, - "up": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "down": {"uv": [3, 1.4, 13, 1.5], "texture": "#2"} - } - }, - { - "from": [13, 4.5, 14], - "to": [16, 13, 15], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [7, 6, 10, 14.5], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#base"}, - "south": {"uv": [7, 3, 10, 11.5], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#base"}, - "up": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "down": {"uv": [0, 14, 3, 15], "texture": "#base"} - } - }, - { - "from": [3, 11.7, 14], - "to": [13, 13, 15], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [1, 7, 11, 8.3], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 4.3], "texture": "#base"}, - "south": {"uv": [0, 3, 10, 4.3], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 4.3], "texture": "#base"}, - "up": {"uv": [0, 0, 10, 1], "texture": "#base"}, - "down": {"uv": [0, 14, 10, 15], "texture": "#base"} - } - }, - { - "from": [3, 4.5, 14], - "to": [13, 5.8, 15], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 9, 13, 10.5], "texture": "#base"}, - "east": {"uv": [1, 9, 2, 10.5], "texture": "#base"}, - "south": {"uv": [3, 9, 13, 10.5], "texture": "#base"}, - "west": {"uv": [14, 9, 15, 10.5], "texture": "#base"}, - "up": {"uv": [3, 14, 13, 15], "texture": "#base"}, - "down": {"uv": [3, 1, 13, 2], "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.8, 12.2, 15.5375], - "to": [14.3, 12.8, 16.1375], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 12.2, 14.06875], - "to": [3.1, 12.8, 15.56875], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 12.2, 14.06875], - "to": [13.2, 12.8, 15.56875], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [0.025, 3.975, 13.7], - "to": [15.985, 5.075, 14.2], - "faces": { - "north": {"uv": [-0.96, 7, 15, 8.1], "texture": "#legs"}, - "east": {"uv": [3.04, 3, 3.54, 4.1], "texture": "#legs"}, - "south": {"uv": [-1.96, 3, 14, 4.1], "texture": "#legs"}, - "west": {"uv": [0.04, 3, 0.54, 4.1], "texture": "#legs"}, - "up": {"uv": [0.04, 0, 16, 0.5], "texture": "#legs"}, - "down": {"uv": [0.04, 14, 16, 14.5], "texture": "#legs"} - } - }, - { - "from": [0.025, 5.075, 13.7], - "to": [2.005, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 2.98, 15.1], "texture": "#legs"}, - "east": {"uv": [5, 3, 5.5, 11.1], "texture": "#legs"}, - "south": {"uv": [0, 3, 1.98, 11.1], "texture": "#legs"}, - "west": {"uv": [2, 3, 2.5, 11.1], "texture": "#legs"}, - "up": {"uv": [2, 0, 3.98, 0.5], "texture": "#legs"}, - "down": {"uv": [2, 14, 3.98, 14.5], "texture": "#legs"} - } - }, - { - "from": [13.975, 5.075, 13.7], - "to": [15.975, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 3, 15.1], "texture": "#legs"}, - "east": {"uv": [5, 3, 5.5, 11.1], "texture": "#legs"}, - "south": {"uv": [0, 3, 2, 11.1], "texture": "#legs"}, - "west": {"uv": [2, 3, 2.5, 11.1], "texture": "#legs"}, - "up": {"uv": [2, 0, 4, 0.5], "texture": "#legs"}, - "down": {"uv": [2, 14, 4, 14.5], "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.8, 2.9, 15.4375], - "to": [14.3, 3.5, 16.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} + "north": {"uv": [0, 8.25, 0.25, 12], "texture": "#0"}, + "west": {"uv": [4, 12.25, 7.5, 16], "texture": "#0"} } }, { - "name": "door", - "from": [2.5, 2.9, 13.46875], - "to": [3.1, 3.5, 15.46875], + "from": [0, 1, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8.5, 8]}, "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} + "north": {"uv": [3.75, 8, 4, 11.75], "texture": "#0"}, + "east": {"uv": [4, 12.25, 7.5, 16], "texture": "#0"} } }, { - "name": "door", - "from": [12.6, 2.9, 13.46875], - "to": [13.2, 3.5, 15.46875], + "from": [1, 11.9, 1], + "to": [15, 11.9, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.4, 10.5]}, "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} + "down": {"uv": [6.75, 16, 4.25, 12.5], "rotation": 270, "texture": "#0"} } }, { - "from": [0.025, 13, 13.7], - "to": [15.985, 13.5, 14.2], + "from": [1, 1, 6], + "to": [15, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 11.5]}, "faces": { - "north": {"uv": [0, 7, 15.96, 7.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 5.5, 3.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 15.96, 3.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 2.5, 3.5], "texture": "#legs"}, - "up": {"uv": [0, 0, 15.96, 0.5], "texture": "#legs"}, - "down": {"uv": [0, 14, 15.96, 14.5], "texture": "#legs"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } }, { - "from": [2, 1, 0], - "to": [14, 16, 2], + "from": [1, 5, 6], + "to": [15, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 11.5]}, "faces": { - "north": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#base"}, - "down": {"uv": [2, 14, 14, 16], "texture": "#base"} - } - }, - { - "from": [0, 16, 0], - "to": [16, 19, 1], - "faces": { - "north": {"uv": [0, 2, 16, 5], "texture": "#base"}, - "east": {"uv": [2, 2, 3, 5], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 5], "texture": "#base"}, - "west": {"uv": [0, 2, 1, 5], "texture": "#base"}, - "up": {"uv": [0, 4, 16, 5], "texture": "#base"}, - "down": {"uv": [0, 6, 16, 7], "texture": "#base"} - } - }, - { - "name": "door", - "from": [7.8, 15.9, 2.33125], - "to": [8, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [9.8, 15.9, 2.23125], - "to": [10, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [5.8, 15.9, 2.23125], - "to": [6, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [3.8, 15.9, 2.23125], - "to": [4, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2, 15.9, 2.23125], - "to": [2.2, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [11.8, 15.9, 2.33125], - "to": [12, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.8, 15.9, 2.33125], - "to": [14, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 8.2], - "to": [13.93125, 16.1, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 6.1], - "to": [13.93125, 16.1, 6.3], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 4], - "to": [13.83125, 16.1, 4.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 10.3], - "to": [13.93125, 16.1, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 12.2], - "to": [14.00937, 16.1, 12.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 13.8], - "to": [14.00937, 16.1, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.00469, 15.9, 2.2], - "to": [13.99375, 16.1, 2.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, -140, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.39, 0.39, 0.39] - }, - "thirdperson_lefthand": { - "rotation": [59, -140, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.39, 0.39, 0.39] - }, - "firstperson_righthand": { - "rotation": [-1, -146, 0], - "translation": [1, 0.75, 0], - "scale": [0.32, 0.32, 0.32] - }, - "firstperson_lefthand": { - "rotation": [-1, -146, 0], - "translation": [0.75, 0.75, 0], - "scale": [0.32, 0.32, 0.32] - }, - "ground": { - "translation": [0, -0.75, 0], - "scale": [0.39, 0.39, 0.39] - }, - "gui": { - "rotation": [30, 45, 0], - "translation": [0.5, -0.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [-1, -180, 0], - "translation": [0, 0, -1.75], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [-0.25, -0.5, -3.5], - "scale": [0.9, 0.9, 0.9] - } - }, "groups": [ { - "name": "stove", - "origin": [0, 0, 0], + "name": "oven_open", + "origin": [8, 3.5, 8.5], "color": 0, "children": [ { - "name": "Base", - "origin": [0, 0, 0], + "name": "outside", + "origin": [0, 0, 15], "color": 0, "children": [ 0, 1, - 2, - 3, - 4, - 5, - 6, - 7, - { - "name": "griddle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] - }, { - "name": "griddle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31] - }, - { - "name": "burners", - "origin": [0, 0, 0], + "name": "door", + "origin": [-8, 8.5, 8], "color": 0, "children": [ - 32, - 33, - 34, { - "name": "burnertips", - "origin": [0, 0, 0], + "name": "handlebottom", + "origin": [5, 11, 0], "color": 0, - "children": [35, 36, 37, 38] + "children": [2, 3] }, - 39 - ] - }, - 40, - { - "name": "oven_controls", - "origin": [0, 0, 0], - "color": 0, - "children": [41, 42, 43, 44, 45, 46, 47, 48, 49, 50] - }, - 51, - { - "name": "cooktop_controls", - "origin": [0, 0, 0], - "color": 0, - "children": [52, 53, 54, 55, 56] - }, - 57, - 58, - { - "name": "stove_door", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 59, - 60, - 61, - 62, - 63, + 4, { - "name": "stove_handle", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], "color": 0, - "children": [64, 65, 66] + "children": [5, 6] } ] }, - 67, - 68, - 69, + 7, + 8, + 9, { - "name": "bottom_stove_handle", - "origin": [0, 0, 0], + "name": "grill", + "origin": [8, 7, 8.5], "color": 0, - "children": [70, 71, 72] - }, - 73, - 74, - 75 + "children": [] + } + ] + }, + { + "name": "inside", + "origin": [1, 8.5, 8], + "color": 0, + "children": [ + 10, + 11, + 12, + 13, + { + "name": "oven_grate", + "origin": [8, 3.5, 8.5], + "color": 0, + "children": [14, 15] + } ] } ] - }, - { - "name": "griddle", - "origin": [0, 0, 0], - "color": 0, - "children": [76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/textures/block/gray_stove.png b/common/src/main/resources/assets/pfm/textures/block/gray_stove.png new file mode 100644 index 0000000000000000000000000000000000000000..5d4b1c2f1548b53a85ced53591e83f83778f16ae GIT binary patch literal 1847 zcmV-72gvw|P)Ya_S!=g!xVv+HHn<(1_pkYyQnez`Nk`dwIDXj;oobqk9NO^y}3D$m+7BUrg~;X=zGQtOvoUtjkn z2LP%cpirDep*Rbw9{@ntvLKCl{%$9@N~w%`?I6&@dR;$Kx3ac|@pv3_b90W*xXE+* zJk~Rpjz{0RQ@a7QnkH;AaG&Jq=WK-z@98j%u|EUDwTWtzNg)yUEAK#v<_n zw?4bsWOa(7*vd|IilTt)>?|zBnHi+hY2R`wF5yji2LdlZ5P1LqB}UKpQG?>W>{NIk z5CzX)z61d5Rw{wy0x#h7=?peDH^K8f48uS+n?*8_0HGA3AlPKH=g(tz*SRmRL}q~E z%#8WB(=XghuGe*pay;(dyJ!2=Ha0d~-)WT<78jbX4Z9GT0jx?fFYktvJWL!BhR6)i zZJqZb4~vt7J9Z}+CJuP8bl*1g{Swp(j)r-u6Dw6`DVAY7Av1Qa|QsAN~Q4Kx8H{{Tx9uxDCiZHILZws=^btXyivkWnpv{mJm%wrf2daYQf0jUW6*XlPilSip>{;_P z2LN7eZ9$f0Q?|QX!B|qZWrGLe12U6YWHYT1@Z$Lf_7w#meS94N@Yf%YkdkE-inEUL za^>All28i6FrX+345M|XCkldT1gnftYM%dfGHp3QQWV8jW}M<$uB&!%fcY=ykEFkS z8G!v^G#Vg;;O*g|=?vc<9)b{JmaTH@ia`wus6b*o2>{?@g6+(%(P$u>&4LmGd`y6* z*4l@f_Dob5MS>D4CC2grVV-AxWKe|82h?i^=CQUP*s=DYiDWY*@B$LaafpHdwVlC9 zCK8TqRZT-I76a5M-W(pA0iOQ7+;ceVbsZmExqPHPn@pmts))s6rswZO)imTY8Pp5| znpz9{?U7(JfE1T7b$a4qw+D81aigMNz2V&aCTxqrGyl8yyV8Fp$sZU6;Y*#?b(ZqEJ6Zpu|8dMzOuUZM(jrY8rT+ zhb+q=gg_KUD2f765KIFN8rSWx-w_}Rf~hRe^X8C8JATl0-8|WW#|u!$f#-aHEXzID zIcv0M{e?wQgd|C>M_z-(776Ng-ONOuwDV5E*!MXyl zWe{z{tgNo$(#4BdSzSe;P=F{1Co>LU_(^=|b=}+yX==@O%af8;z>}6IplTX&xg0dL zW^RT?BR*RU0vBf3-@Wtm$X8!421-l)^y3c$-2^eXXPcV(e>UipPqcFg z?0LUj{_vA#uM3rKJo^2&$c)DUK()GuYIV=7JXb8*8ugM7GiDr+PET}Ite1RP;jH)e z7}nwMCTCM%*fCcDN(m?>t_^$1hZPP01fdn8TAdPedZ}aruXjpE4|=PmLoO;Sl9YqaX?fEf{5JIB=%L! zHr-$`PCt!e#sSuUk2?<7S2bJz3}zgwQKIHV!~v;f0_pU`kx@n|!Rwt;Uss=j#{o=9 z_6|yk>2%q!4;nIiA#@x-bltayx2_VMbGx6)I^h}zSm`DAV}x#Tf*X2(XS~8)xq3B{ lj;xAx8pBQLek$gb{{TkGs1hzwv=smV002ovPDHLkV1oD?Tf_hW literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/pfm/textures/block/white_stove.png b/common/src/main/resources/assets/pfm/textures/block/white_stove.png new file mode 100644 index 0000000000000000000000000000000000000000..ca5a6cc0fcf6f6a27548246a31ba544be9208902 GIT binary patch literal 1835 zcmV+`2h{k9P)Px*xr~Yzv}=DosVC^r2AtQ1HP* z5d%dV5wsPQdn)*cq9U;%1f*aU@lpC9BBCu-5R->iD71-Ca!pe2Zr$D7%*~b1^C7pJ z-Mzirzn9B_9|*bG-|X!CemnD<-~48~W-fhI6;nwB<;3x0U18hUKClzFZ{0@FHWXFE zjoIr^6venEilU|LbWIdR#74$O5RblyHUht~CURO7QT^X~Iy3$_d08l2Yc=gN~<2Qh&<%H1Vx!+F2?*4r@)X=k&%jLjv zoT02&xuR-N{+tcek1)jghX){V93F|qJXGJ{;o6#|TqqPEiXsYy0@CR;7-Pm?sZ?qz z*9r3?6h*_ylP^_`Yqqk}HAT_jPiqfkG8uGtcl(x$sU&{5as>&Fhajx`Btj~#&nq*E zBS(*h_W@BbKR*uuNT<_*Ndlo10?%7yd-v?Y;^K0s zK1XJNOeSOec6!5Zaz)j!@0q7DdFo_Wov;C4*ZzNg@iSzz=c+E%9f`~UW~J;)ogKTJ zF&23Khb1xtG+XDr$iuQFoM4zZ;KcD`o`=2@L7m_uVIJy4E|+r*aJM?6q7g59hpmd?10Jred5#5I5d&Z=IKfsa=9P9h!ASD~ok%44 zfaS#{+`GR5Mcomo6H)Ie{1EDFUr{xPsU&{=>1PZN_hWux0eyXa$mjFOjE@_qIRNTp zi;K%R^x_MaY;apPLnC7&NQxo=;Npb~V2t6dY!(3U@%i)MI1aC$J?kh>DGJo$zW@M2 zDJZ4L=kuVH0ssV_H;iDG5lW5oKRctNk8K!O(JbW+#W!Bq)YR#^^tUeq=szmuGBj0% zwz`V02M>T+rZ?HsW9LM{T2itD+)_%_~hW>;YhLxY1Lq=NW19&%Ad znbEq=gngSq2t5T5@>tu?Szs$L@&SC@c}O;bRw_s&yHVCk#<8{^^keOI6Uk;M!SRrK zQxJF_vMd7tBuR3tE6XzC90$1=#goHhF~E(#Zn+L;Mb)tP$;a!i52n+&S12IPafau& zBg-&`P3`V*{=yg97@gGlbV;WFlHGAgi=V7 z1clZ+zjop{1q4Ch2qC`1KJ&U?sRdK|7acm3QjCv}H(Ulc8%F~WLYN;T5K=*$qgYs2 zuzbEE%QASLM_*qb2q6#z0r`9$0?!);YBvqH!+uAA!1IQ(d~GV|Q-BbH)zwuHLQL(u ze*m=^c+Lk1g5a9^HAj2qH!KJOdU|>w2ttUiwgzJg&`Jf0syRA2Gm5Gqy}kZ)SC-}V zxy|zsc^>x)h4pr8M$vy8Ve(e=0h!%nt~WR-58JwL_VoH^Ze|FjTW1O^FD`*FX8CJ` zy`G*+Kusz0?+RmvADEq+0|3m<%~@88t$_0?;L}6vn<2TVTE6lmqyo99VtZddWLd_p z(NV}nwc%!{9d!M8^=ja>(&34TQ1|A7fPumK=MPB28aQGEEgf0b|+)Ic3CR9$vYV%4v?hYri!`AJC&HeE>n{i zHxGX|d8cEn0*sZxSmV!L+~l1~3;;N8J-=smO1je%Q%Ni>uhhvKL7QxMgF3xd67$k2 zKONV1gJIg(Oj`1NfFEULxoC_))TWvw^|qp0j?`s@bll>AsNlE+2Ksjzhb;PZgUL9p zG>Q=inE!8f9H6M0rF|XUIA)_n&6bD*#8eWJ)LS>o7%O9Gd8MVRPut@FT}k~JjFk-^ zq7VC4I?&K@K#-W;Y)t#y-t5()VH{w_P434C&EkY8@9|3Plj%<*X~^73yD=Im&`QO; Z@*h>Wg@VrHuDSpK002ovPDHLkV1j81XGQ=3 literal 0 HcmV?d00001 From 4dd14844bdf26df2f38cf95652267e6333776450 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:47:55 -0600 Subject: [PATCH 10/17] Overhauled White and Gray Stove Model and Collision --- .../pfm/blocks/MicrowaveBlock.java | 27 +- .../render/MicrowaveBlockEntityRenderer.java | 24 +- .../block/iron_microwave/iron_microwave.json | 396 ++++------------- .../iron_microwave/iron_microwave_open.json | 417 ++++++------------ .../pfm/textures/block/iron_microwave.png | Bin 0 -> 1058 bytes 5 files changed, 244 insertions(+), 620 deletions(-) create mode 100644 common/src/main/resources/assets/pfm/textures/block/iron_microwave.png diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/MicrowaveBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/MicrowaveBlock.java index c50f8037b..f4bd3a126 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/MicrowaveBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/MicrowaveBlock.java @@ -101,7 +101,7 @@ public static BlockEntity getBlockEntity(BlockPos pos, BlockState state) { @Nullable @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(FACING, ctx.getPlayerFacing()); + return this.getDefaultState().with(FACING, ctx.getPlayerFacing().getOpposite()); } @Override @@ -147,45 +147,28 @@ public boolean isShapeFullCube(BlockState state, BlockView world, BlockPos pos) return false; } - private final VoxelShape MICROWAVE = VoxelShapes.union(createCuboidShape(1.8, 0, 3.8,14.2, 1, 13.2),createCuboidShape(2, 1, 4,14, 7, 13)); - private final VoxelShape MICROWAVE_OPEN = VoxelShapes.union(createCuboidShape(1.8, 0, 3.8,14.2, 1, 13.2),createCuboidShape(2, 1, 4,14, 7, 13),createCuboidShape(2, 1, 13,3.1, 7, 20.9)); + private final VoxelShape MICROWAVE = VoxelShapes.union(createCuboidShape(1, 0, 4,15, 8, 14)); private final VoxelShape MICROWAVE_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, MICROWAVE); - private final VoxelShape MICROWAVE_SOUTH_OPEN = rotateShape(Direction.NORTH, Direction.SOUTH, MICROWAVE_OPEN); private final VoxelShape MICROWAVE_EAST = rotateShape(Direction.NORTH, Direction.EAST, MICROWAVE); - private final VoxelShape MICROWAVE_EAST_OPEN = rotateShape(Direction.NORTH, Direction.EAST, MICROWAVE_OPEN); private final VoxelShape MICROWAVE_WEST = rotateShape(Direction.NORTH, Direction.WEST, MICROWAVE); - private final VoxelShape MICROWAVE_WEST_OPEN = rotateShape(Direction.NORTH, Direction.WEST, MICROWAVE_OPEN); @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { Direction direction = state.get(FACING); switch (direction) { - case NORTH ->{ - if (state.get(OPEN)) { - return MICROWAVE_OPEN; - } - return MICROWAVE; - } case SOUTH -> { - if (state.get(OPEN)) { - return MICROWAVE_SOUTH_OPEN; - } return MICROWAVE_SOUTH; } case EAST ->{ - if (state.get(OPEN)) { - return MICROWAVE_EAST_OPEN; - } return MICROWAVE_EAST; } case WEST -> { - if (state.get(OPEN)) { - return MICROWAVE_WEST_OPEN; - } return MICROWAVE_WEST; } + default -> { + return MICROWAVE; + } } - return MICROWAVE; } @Override diff --git a/common/src/main/java/com/unlikepaladin/pfm/entity/render/MicrowaveBlockEntityRenderer.java b/common/src/main/java/com/unlikepaladin/pfm/entity/render/MicrowaveBlockEntityRenderer.java index 00ea243cb..019a2780a 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/entity/render/MicrowaveBlockEntityRenderer.java +++ b/common/src/main/java/com/unlikepaladin/pfm/entity/render/MicrowaveBlockEntityRenderer.java @@ -29,24 +29,24 @@ public void render(T blockEntity, float tickDelta, MatrixStack matrices, VertexC float x,y,z; switch (facing) { case NORTH -> { - x = 0.4f; - y = 0.2f; - z = 0.5f; + x = 0.625f; + y = 0.25f; + z = 0.57f; } case SOUTH -> { - x = 0.6f; - y = 0.2f; - z = 0.5f; + x = 0.375f; + y = 0.25f; + z = 0.43f; } case WEST -> { - x = 0.5f; - y = 0.2f; - z = 0.6f; + x = 0.57f; + y = 0.25f; + z = 0.375f; } case EAST -> { - x = 0.5f; - y = 0.2f; - z = 0.4f; + x = 0.43f; + y = 0.25f; + z = 0.625f; } default -> throw new IllegalStateException("Unexpected value: " + facing); } diff --git a/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave.json b/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave.json index e0b179961..3194b603a 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave.json @@ -1,385 +1,181 @@ { "credit": "By UnlikePaladin", + "texture_size": [32, 32], "textures": { - "2": "block/iron_block", - "3": "block/gray_concrete", - "4": "block/white_stained_glass", - "10": "block/light_gray_concrete", - "particle": "pfm:block/plate", - "1_2": "pfm:block/plate" + "main": "pfm:block/iron_microwave", + "particle": "block/iron_block" }, "elements": [ { - "from": [1.8, 0, 3.8], - "to": [14.2, 1, 13.2], + "name": "main", + "from": [14, 0, 4], + "to": [15, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 0, 12.4, 1], "texture": "#3"}, - "east": {"uv": [0, 0, 9.4, 1], "texture": "#3"}, - "south": {"uv": [0, 0, 12.4, 1], "texture": "#3"}, - "west": {"uv": [0, 0, 9.4, 1], "texture": "#3"}, - "up": {"uv": [0, 0, 12.4, 9.4], "texture": "#3"}, - "down": {"uv": [0, 0, 12.4, 9.4], "texture": "#3", "cullface": "down"} + "north": {"uv": [7, 4.5, 7.5, 8.5], "texture": "#main"}, + "east": {"uv": [0, 10, 5, 14], "texture": "#main"}, + "south": {"uv": [14, 0, 14.5, 4], "texture": "#main"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#main"}, + "up": {"uv": [0, 5, 0.5, 0], "rotation": 180, "texture": "#main"}, + "down": {"uv": [7, 5, 6.5, 10], "rotation": 180, "texture": "#main"} } }, { - "from": [10.4, 1, 12], - "to": [11.2, 6.9, 12.9], + "name": "main", + "from": [1, 0, 4], + "to": [6, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "south": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "up": {"uv": [0, 0, 0.8, 0.9], "texture": "#3"} + "north": {"uv": [11.5, 4.5, 14, 8.5], "texture": "#main"}, + "east": {"uv": [0, 10, 5, 14], "texture": "#main"}, + "south": {"uv": [7.5, 0, 10, 4], "texture": "#main"}, + "west": {"uv": [0, 10, 5, 14], "texture": "#main"}, + "up": {"uv": [7, 0, 4.5, 5], "texture": "#main"}, + "down": {"uv": [2, 5, 0, 10], "rotation": 180, "texture": "#main"} } }, { - "from": [3, 1, 4.6], - "to": [13, 1.3, 12.8], + "from": [2, 2, 3.99], + "to": [5, 7, 3.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.49]}, "faces": { - "up": {"uv": [0, 0, 10, 8.2], "texture": "#2"} + "north": {"uv": [14.5, 5, 16, 7.5], "texture": "#main"} } }, { - "from": [11.15313, 1, 11.9], - "to": [13, 6.999, 13], + "name": "main", + "from": [6, 7, 4], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "south": {"uv": [9, 1, 15, 8], "texture": "#2"}, - "west": {"uv": [0, 1, 0.7, 6], "texture": "#2"}, - "up": {"uv": [4, 0, 7, 1], "texture": "#2"} + "north": {"uv": [7.5, 4.5, 12.5, 5], "texture": "#main"}, + "south": {"uv": [10, 0, 14, 0.5], "texture": "#main"}, + "up": {"uv": [0.5, 5, 4.5, 0], "rotation": 180, "texture": "#main"}, + "down": {"uv": [4.5, 0, 0.5, 5], "rotation": 180, "texture": "#main"} } }, { - "from": [11.15313, 1, 5], - "to": [13, 6.98438, 12], + "name": "main", + "from": [6, 0, 4], + "to": [14, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 9.5]}, "faces": { - "west": {"uv": [0, 1, 0.7, 6], "texture": "#2"} + "north": {"uv": [7.5, 7.5, 11.5, 8.5], "texture": "#main"}, + "south": {"uv": [10, 3, 14, 4], "texture": "#main"}, + "up": {"uv": [5, 5, 1, 0], "rotation": 180, "texture": "#main"}, + "down": {"uv": [6, 5, 1.5, 10], "rotation": 180, "texture": "#main"} } }, { - "from": [11.64062, 5.8, 13.04375], - "to": [13.53125, 6.4, 13.04375], + "name": "main", + "from": [6, 2, 14], + "to": [14, 7, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 9.5]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#3"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#3"} + "north": {"uv": [1, 0.5, 6, 3], "texture": "#main"}, + "south": {"uv": [10, 0.5, 14, 3], "texture": "#main"} } }, { - "from": [13.12187, 4.9, 13.14375], - "to": [13.66875, 5.5, 13.14375], + "name": "glass", + "from": [6, 2, 4], + "to": [14, 7, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 4.5, 4]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "north": {"uv": [8, 13, 12, 15.5], "texture": "#main"}, + "south": {"uv": [8, 13, 12, 15.5], "texture": "#main"} } }, { - "from": [13.12187, 2.9, 13.14375], - "to": [13.66875, 3.5, 13.14375], + "name": "plate", + "from": [7, 2, 5.99], + "to": [13, 3, 11.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "north": {"uv": [5, 15.5, 8, 16], "texture": "#main"}, + "east": {"uv": [5, 15.5, 8, 16], "texture": "#main"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#main"}, + "west": {"uv": [5, 15.5, 8, 16], "texture": "#main"}, + "up": {"uv": [5, 13, 8, 16], "rotation": 180, "texture": "#main"} } }, { - "from": [11.49062, 3.9, 13.14375], - "to": [12.0375, 4.5, 13.14375], + "name": "handle", + "from": [6, 7, 3.5], + "to": [7, 7, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "up": {"uv": [15.5, 0, 16, 0], "rotation": 180, "texture": "#main"}, + "down": {"uv": [15.5, 0, 16, 0], "rotation": 180, "texture": "#main"} } }, { - "from": [11.49062, 2.9, 13.14375], - "to": [12.0375, 3.5, 13.14375], + "name": "handle", + "from": [6, 2, 3.5], + "to": [7, 7, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "north": {"uv": [15.5, 0, 16, 2.5], "texture": "#main"}, + "south": {"uv": [15.5, 0, 16, 2.5], "texture": "#main"} } }, { - "from": [11.49062, 4.9, 13.14375], - "to": [12.0375, 5.5, 13.14375], + "name": "handle", + "from": [7, 2, 3.5], + "to": [6, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [12.3125, 4.9, 13.14375], - "to": [12.85937, 5.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [12.3125, 3.9, 13.14375], - "to": [12.85937, 4.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [12.3125, 2.9, 13.14375], - "to": [12.85937, 3.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [13.12187, 3.9, 13.14375], - "to": [13.66875, 4.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [11.8125, 1.9, 13.14375], - "to": [13.35937, 2.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [3, 1, 4], - "to": [9, 7, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, -2]}, - "faces": { - "north": {"uv": [8, 8, 14, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [0, 1, 4, 6], "texture": "#2"}, - "up": {"uv": [1, 2, 9, 2.7], "texture": "#2"} - } - }, - { - "from": [9, 1, 4], - "to": [13, 7, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 0]}, - "faces": { - "north": {"uv": [2, 8, 6, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 16, 9], "texture": "#2"}, - "up": {"uv": [2, 2, 10, 2.7], "texture": "#2"} - } - }, - { - "from": [2, 1, 8.6], - "to": [3, 7, 12], - "faces": { - "east": {"uv": [0, 0, 5, 7], "texture": "#2"}, - "west": {"uv": [10, 1, 15, 8], "texture": "#2"}, - "up": {"uv": [1, 2, 2, 4], "texture": "#2"} - } - }, - { - "from": [13, 1, 4], - "to": [14, 7, 8.6], - "faces": { - "north": {"uv": [14, 4, 15, 11], "texture": "#2"}, - "east": {"uv": [10, 1, 15, 8], "texture": "#2"}, - "up": {"uv": [2, 1, 4, 2], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [13, 1, 8.6], - "to": [14, 7, 13], - "faces": { - "east": {"uv": [2, 1, 7, 8], "texture": "#2"}, - "south": {"uv": [13, 1, 15, 8], "texture": "#2"}, - "west": {"uv": [9, 1, 14, 8], "texture": "#2"}, - "up": {"uv": [1, 2, 2, 4], "texture": "#2"} - } - }, - { - "from": [4.3, 1.6, 6.2], - "to": [8.8, 2.1, 10.7], - "faces": { - "north": {"uv": [0, 0, 10, 1], "texture": "#1_2"}, - "east": {"uv": [0, 0, 10, 1], "texture": "#1_2"}, - "south": {"uv": [0, 0, 10, 1], "texture": "#1_2"}, - "west": {"uv": [0, 0, 10, 1], "texture": "#1_2"}, - "up": {"uv": [9, 9, 16, 16], "texture": "#1_2"}, - "down": {"uv": [10, 0, 16, 6], "texture": "#1_2"} - } - }, - { - "from": [11.14688, 6.7, 11.97813], - "to": [13.00938, 7, 12.00625], - "faces": { - "south": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 2.7, 5], "texture": "#2"}, - "up": {"uv": [3, 7, 9, 8], "texture": "#2"}, - "down": {"uv": [0, 0, 6, 2.7], "texture": "#2"} - } - }, - { - "from": [11.15313, 6.7, 12.3], - "to": [13.01563, 7, 12.3], - "faces": { - "north": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 5], "texture": "#2"} - } - }, - { - "from": [3, 6.7, 5], - "to": [13.01563, 7, 11.97813], - "faces": { - "south": {"uv": [0, 0, 10.01563, 0.3], "texture": "#2"}, - "up": {"uv": [3, 6, 12, 12], "texture": "#2"}, - "down": {"uv": [0, 0, 10.01563, 7.6], "texture": "#2"} - } - }, - { - "from": [2, 1, 4], - "to": [3, 7, 8.6], - "faces": { - "north": {"uv": [1, 1, 2, 8], "texture": "#2"}, - "east": {"uv": [11, 0, 16, 7], "texture": "#2"}, - "west": {"uv": [1, 1, 6, 8], "texture": "#2"}, - "up": {"uv": [2, 1, 4, 2], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [2, 1, 12], - "to": [3.1, 7, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "north": {"uv": [15, 1, 16, 8], "texture": "#2"}, - "east": {"uv": [0, 1, 0.7, 6], "texture": "#2"}, - "south": {"uv": [5, 1, 6, 8], "texture": "#2"}, - "west": {"uv": [14, 1, 15, 8], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"} - } - }, - { - "from": [2.99375, 2, 12.40001], - "to": [9.80001, 6, 12.40001], - "rotation": {"angle": 0, "axis": "y", "origin": [7.39688, 0, 34.40001]}, - "faces": { - "north": {"uv": [1, 6, 12, 14], "texture": "#4"}, - "south": {"uv": [2, 5, 10, 11], "texture": "#4"} - } - }, - { - "from": [3.09375, 1, 12], - "to": [9.8, 2, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "north": {"uv": [3, 5, 9, 6.167], "texture": "#2"}, - "south": {"uv": [3, 5, 9, 6.167], "texture": "#2"}, - "up": {"uv": [0, 0, 8, 0.7], "texture": "#2"} - } - }, - { - "from": [9.8, 1, 11.9], - "to": [10.9, 6.999, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "north": {"uv": [13, 1, 14, 8], "texture": "#2"}, - "east": {"uv": [6, 1, 7.1, 7.999], "texture": "#2"}, - "south": {"uv": [8, 1, 9, 8], "texture": "#2"}, - "west": {"uv": [0, 1, 0.7, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"} - } - }, - { - "from": [3.09375, 6, 12], - "to": [9.8, 7, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "north": {"uv": [4, 1, 13, 2.167], "texture": "#2"}, - "east": {"uv": [0, 1, 0.7, 6], "texture": "#2"}, - "south": {"uv": [4, 1, 13, 2.167], "texture": "#2"}, - "up": {"uv": [1, 0, 6, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 8, 0.7], "texture": "#2"} + "up": {"uv": [15.5, 0, 16, 0], "rotation": 180, "texture": "#main"}, + "down": {"uv": [15.5, 0, 16, 0], "rotation": 180, "texture": "#main"} } } ], "display": { "thirdperson_righthand": { - "rotation": [59, -140, 0], - "translation": [-0.5, 4, 3], + "rotation": [59, 58, 0], + "translation": [0.5, 4.25, 0.75], "scale": [0.6, 0.6, 0.6] }, "thirdperson_lefthand": { "rotation": [59, 58, 0], - "translation": [0.5, 4.25, 3.5], + "translation": [0.5, 4.25, 0.75], "scale": [0.6, 0.6, 0.6] }, "firstperson_righthand": { - "rotation": [-1, -45, 0], + "rotation": [-1, 135, 0], "translation": [0, 5, 1.5], "scale": [0.44, 0.44, 0.44] }, "firstperson_lefthand": { - "rotation": [-1, -45, 0], + "rotation": [-1, 135, 0], "translation": [0, 5, 1.5], "scale": [0.44, 0.44, 0.44] }, "ground": { - "translation": [0, 2.25, 0], - "scale": [0.75, 0.75, 0.75] + "translation": [0, 2.75, 0], + "scale": [0.66, 0.66, 0.66] }, "gui": { - "rotation": [30, 45, 0], + "rotation": [30, -135, 0], "translation": [0.5, 2.25, 0], - "scale": [0.69, 0.69, 0.69] + "scale": [0.7, 0.7, 0.7] }, "head": { - "rotation": [-1, 180, 0], + "rotation": [-1, 0, 0], "translation": [0, 13.75, 0], "scale": [0.93, 0.95, 0.92] }, "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 4.75, -0.25] + "translation": [0, 2.75, 0.25], + "scale": [1.11, 1.11, 1.11] } }, "groups": [ { - "name": "microwave", + "name": "closed", "origin": [0, 0, 0], "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - { - "name": "buttons", - "origin": [0, 0, 0], - "color": 0, - "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - }, - 16, - 17, - 18, - 19, - 20, - { - "name": "basic_plate", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [21] - } - ] - }, - 22, - 23, - 24, - 25, - { - "name": "door", - "origin": [1, 0, -2], - "color": 0, - "children": [26, 27, 28, 29, 30] - } - ] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave_open.json b/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave_open.json index 99efa553a..384352d5a 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_microwave/iron_microwave_open.json @@ -1,326 +1,199 @@ { "credit": "By UnlikePaladin", + "texture_size": [32, 32], "textures": { - "2": "block/iron_block", - "3": "block/gray_concrete", - "4": "block/white_stained_glass", - "5": "pfm:block/plate", - "10": "block/light_gray_concrete", + "main": "pfm:block/iron_microwave", "particle": "block/iron_block" }, "elements": [ { - "from": [1.8, 0, 3.8], - "to": [14.2, 1, 13.2], + "name": "main", + "from": [14, 0, 5], + "to": [15, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 0, 12.4, 1], "texture": "#3"}, - "east": {"uv": [0, 0, 9.4, 1], "texture": "#3"}, - "south": {"uv": [0, 0, 12.4, 1], "texture": "#3"}, - "west": {"uv": [0, 0, 9.4, 1], "texture": "#3"}, - "up": {"uv": [0, 0, 12.4, 9.4], "texture": "#3"}, - "down": {"uv": [0, 0, 12.4, 9.4], "texture": "#3", "cullface": "down"} + "north": {"uv": [7, 4.5, 7.5, 8.5], "texture": "#main"}, + "east": {"uv": [0, 10, 4.5, 14], "texture": "#main"}, + "south": {"uv": [14, 0, 14.5, 4], "texture": "#main"}, + "west": {"uv": [0, 0, 4.5, 4], "texture": "#main"}, + "up": {"uv": [0, 5, 0.5, 0.5], "rotation": 180, "texture": "#main"}, + "down": {"uv": [7, 5.5, 6.5, 10], "rotation": 180, "texture": "#main"} } }, { - "from": [10.4, 1, 12], - "to": [11.2, 6.9, 12.9], + "name": "main", + "from": [1, 0, 4], + "to": [6, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "south": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "west": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "up": {"uv": [0, 0, 0.8, 0.9], "texture": "#3"} + "north": {"uv": [11.5, 4.5, 14, 8.5], "texture": "#main"}, + "east": {"uv": [0, 10, 5, 14], "texture": "#main"}, + "south": {"uv": [7.5, 0, 10, 4], "texture": "#main"}, + "west": {"uv": [0, 10, 5, 14], "texture": "#main"}, + "up": {"uv": [7, 0, 5, 5], "texture": "#main"}, + "down": {"uv": [2, 5, 0, 10], "rotation": 180, "texture": "#main"} } }, { - "from": [2.5, 1, 12], - "to": [3.3, 6.9, 12.9], + "from": [2, 2, 3.99], + "to": [5, 7, 3.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.49]}, "faces": { - "north": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "east": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "south": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "up": {"uv": [0, 0, 0.8, 0.9], "texture": "#3"} + "north": {"uv": [14.5, 5, 16, 7.5], "texture": "#main"} } }, { - "from": [3.3, 1, 12], - "to": [10.4, 1.4, 12.9], + "name": "main", + "from": [6, 7, 5], + "to": [14, 8, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "north": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "south": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "up": {"uv": [0, 0, 0.8, 0.9], "texture": "#3"} + "north": {"uv": [7.5, 4.5, 11.5, 5], "texture": "#main"}, + "south": {"uv": [10, 0, 14, 0.5], "texture": "#main"}, + "up": {"uv": [1, 5, 5, 0.5], "rotation": 180, "texture": "#main"}, + "down": {"uv": [5.5, 0, 1.5, 4.5], "rotation": 180, "texture": "#main"} } }, { - "from": [3.3, 6.5, 12], - "to": [10.4, 6.9, 12.9], + "name": "main", + "from": [6, 0, 5], + "to": [14, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 9.5]}, "faces": { - "north": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "south": {"uv": [0, 0, 0.8, 5.9], "texture": "#3"}, - "up": {"uv": [0, 0, 0.8, 0.9], "texture": "#3"} + "north": {"uv": [7.5, 7.5, 12, 8.5], "texture": "#main"}, + "south": {"uv": [10, 3, 14, 4], "texture": "#main"}, + "up": {"uv": [5.5, 5, 1.5, 0.5], "rotation": 180, "texture": "#main"}, + "down": {"uv": [5.5, 5.5, 1.5, 10], "rotation": 180, "texture": "#main"} } }, { - "from": [3, 1, 4.6], - "to": [13, 1.3, 12.8], + "name": "main", + "from": [6, 0, 4], + "to": [15, 1, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "up": {"uv": [0, 0, 10, 8.2], "texture": "#2"} + "north": {"uv": [7, 8, 11.5, 8.5], "texture": "#main"}, + "east": {"uv": [4.5, 13.5, 5, 14], "texture": "#main"}, + "up": {"uv": [7, 8.5, 11.5, 8], "rotation": 180, "texture": "#main"}, + "down": {"uv": [6, 5, 1.5, 5.5], "rotation": 180, "texture": "#main"} } }, { - "from": [11.15313, 1, 11.9], - "to": [13, 6.999, 13], + "name": "main", + "from": [6, 2, 14], + "to": [14, 7, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 9.5]}, "faces": { - "south": {"uv": [9, 1, 15, 8], "texture": "#2"}, - "west": {"uv": [0, 1, 0.7, 6], "texture": "#2"}, - "up": {"uv": [4, 0, 7, 1], "texture": "#2"} + "north": {"uv": [0.5, 10.5, 4.5, 13], "texture": "#main"}, + "south": {"uv": [10, 0.5, 14, 3], "texture": "#main"} } }, { - "from": [11.15313, 1, 5], - "to": [13, 6.98438, 12], + "name": "plate", + "from": [7, 2, 5.99], + "to": [13, 3, 11.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 4.25, 8.5]}, "faces": { - "west": {"uv": [0, 1, 0.7, 6], "texture": "#2"} + "north": {"uv": [5, 15.5, 8, 16], "texture": "#main"}, + "east": {"uv": [5, 15.5, 8, 16], "texture": "#main"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#main"}, + "west": {"uv": [5, 15.5, 8, 16], "texture": "#main"}, + "up": {"uv": [5, 13, 8, 16], "rotation": 180, "texture": "#main"} } }, { - "from": [11.64062, 5.8, 13.04375], - "to": [13.53125, 6.4, 13.04375], + "name": "main", + "from": [14.05, 1, -4.15], + "to": [15.05, 2, 3.85], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#3"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#3"} + "east": {"uv": [7.5, 7.5, 11.5, 8], "texture": "#main"}, + "west": {"uv": [2.5, 0.5, 3, 3], "texture": "#main"}, + "up": {"uv": [0.5, 4.5, 0, 0.5], "texture": "#main"}, + "down": {"uv": [0.5, 5, 0, 9], "texture": "#main"} } }, { - "from": [13.12187, 4.9, 13.14375], - "to": [13.66875, 5.5, 13.14375], + "name": "main", + "from": [14.05, 1, -5.15], + "to": [15.05, 8, -4.15], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "north": {"uv": [13.5, 4.5, 14, 8], "texture": "#main"}, + "east": {"uv": [11.5, 4.5, 12, 8], "texture": "#main"}, + "south": {"uv": [13.5, 4.5, 14, 8], "texture": "#main"}, + "west": {"uv": [2.5, 0.5, 3, 4], "texture": "#main"}, + "up": {"uv": [2.5, 0.5, 2, 0], "texture": "#main"}, + "down": {"uv": [0.5, 5, 0, 5.5], "texture": "#main"} } }, { - "from": [13.12187, 2.9, 13.14375], - "to": [13.66875, 3.5, 13.14375], + "name": "main", + "from": [14.05, 1, 3.85], + "to": [15.05, 8, 4.85], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "north": {"uv": [13.5, 4.5, 14, 8], "texture": "#main"}, + "east": {"uv": [7, 4.5, 7.5, 8], "texture": "#main"}, + "south": {"uv": [13.5, 4.5, 14, 8], "texture": "#main"}, + "west": {"uv": [2.5, 0.5, 3, 4], "texture": "#main"}, + "up": {"uv": [2.5, 0.5, 2, 0], "texture": "#main"}, + "down": {"uv": [0.5, 5, 0, 5.5], "texture": "#main"} } }, { - "from": [11.49062, 3.9, 13.14375], - "to": [12.0375, 4.5, 13.14375], + "name": "glass", + "from": [15.05, 2, -4.15], + "to": [15.05, 7, 3.85], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "east": {"uv": [8, 13, 12, 15.5], "texture": "#main"}, + "west": {"uv": [8, 13, 12, 15.5], "texture": "#main"} } }, { - "from": [11.49062, 2.9, 13.14375], - "to": [12.0375, 3.5, 13.14375], + "name": "handle", + "from": [15.55, 2, -4.15], + "to": [15.55, 7, -3.15], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "east": {"uv": [15.5, 0, 16, 2.5], "texture": "#main"}, + "west": {"uv": [15.5, 0, 16, 2.5], "texture": "#main"}, + "up": {"uv": [15.5, 0, 16, 0], "rotation": 270, "texture": "#main"}, + "down": {"uv": [15.5, 0, 16, 0], "rotation": 90, "texture": "#main"} } }, { - "from": [11.49062, 4.9, 13.14375], - "to": [12.0375, 5.5, 13.14375], + "name": "handle", + "from": [14.55, 7, -4.15], + "to": [15.55, 7, -3.15], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "east": {"uv": [15.5, 0, 16, 2.5], "texture": "#main"}, + "up": {"uv": [15.5, 0, 16, 0], "rotation": 270, "texture": "#main"}, + "down": {"uv": [15.5, 0, 16, 0], "rotation": 90, "texture": "#main"} } }, { - "from": [12.3125, 4.9, 13.14375], - "to": [12.85937, 5.5, 13.14375], + "name": "main", + "from": [14.05, 7, -4.15], + "to": [15.05, 8, 3.85], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} + "east": {"uv": [7.5, 4.5, 11.5, 5], "texture": "#main"}, + "west": {"uv": [2.5, 0.5, 3, 3], "texture": "#main"}, + "up": {"uv": [0.5, 4.5, 0, 0.5], "texture": "#main"}, + "down": {"uv": [0.5, 5, 0, 9], "texture": "#main"} } }, { - "from": [12.3125, 3.9, 13.14375], - "to": [12.85937, 4.5, 13.14375], + "name": "handle", + "from": [15.05, 2, -3.15], + "to": [15.55, 2, -4.15], + "rotation": {"angle": -45, "axis": "y", "origin": [14.8, 4.5, 4.85]}, "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [12.3125, 2.9, 13.14375], - "to": [12.85937, 3.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [13.12187, 3.9, 13.14375], - "to": [13.66875, 4.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [11.8125, 1.9, 13.14375], - "to": [13.35937, 2.5, 13.14375], - "faces": { - "north": {"uv": [0, 3, 4, 8], "texture": "#10"}, - "south": {"uv": [9, 0, 15, 7], "texture": "#10"} - } - }, - { - "from": [3, 1, 4], - "to": [9, 7, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, -2]}, - "faces": { - "north": {"uv": [8, 8, 14, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [0, 1, 4, 6], "texture": "#2"}, - "up": {"uv": [1, 2, 9, 2.7], "texture": "#2"} - } - }, - { - "from": [2, 1, 12], - "to": [3, 7, 13.1], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "east": {"uv": [15, 1, 16, 8], "texture": "#2"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#2"}, - "west": {"uv": [5, 1, 6, 8], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [2.14687, 2, 13.04687], - "to": [2.14687, 6, 19.85313], - "rotation": {"angle": 0, "axis": "y", "origin": [6.44688, 4, 12.6]}, - "faces": { - "east": {"uv": [1, 6, 12, 14], "texture": "#4"}, - "west": {"uv": [2, 5, 10, 11], "texture": "#4"} - } - }, - { - "from": [2, 1, 13.09375], - "to": [3, 2, 19.8], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "east": {"uv": [3, 5, 9, 6.167], "texture": "#2"}, - "west": {"uv": [3, 5, 9, 6.167], "texture": "#2"}, - "up": {"uv": [0, 0, 8, 0.7], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [2, 1, 19.8], - "to": [3.1, 6.999, 20.9], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "north": {"uv": [0, 1, 0.7, 6], "texture": "#2", "cullface": "south"}, - "east": {"uv": [13, 1, 14, 8], "texture": "#2", "cullface": "south"}, - "south": {"uv": [6, 1, 7.1, 7.999], "texture": "#2", "cullface": "south"}, - "west": {"uv": [8, 1, 9, 8], "texture": "#2", "cullface": "south"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2", "cullface": "south"}, - "down": {"uv": [2, 2, 3.1, 3.1], "rotation": 270, "texture": "#2", "cullface": "south"} - } - }, - { - "from": [2, 6, 13.09375], - "to": [3, 7, 19.8], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 3.5, 12.5]}, - "faces": { - "east": {"uv": [4, 1, 13, 2.167], "texture": "#2"}, - "south": {"uv": [0, 1, 0.7, 6], "texture": "#2", "cullface": "south"}, - "west": {"uv": [4, 1, 13, 2.167], "texture": "#2"}, - "up": {"uv": [1, 0, 6, 1], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 8, 0.7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [9, 1, 4], - "to": [13, 7, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 0]}, - "faces": { - "north": {"uv": [2, 8, 6, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 16, 9], "texture": "#2"}, - "up": {"uv": [2, 2, 10, 2.7], "texture": "#2"} - } - }, - { - "from": [3, 6.7, 5], - "to": [13.01563, 7, 11.97813], - "faces": { - "south": {"uv": [0, 0, 10.01563, 0.3], "texture": "#2"}, - "up": {"uv": [3, 6, 12, 12], "texture": "#2"}, - "down": {"uv": [0, 0, 10.01563, 7.6], "texture": "#2"} - } - }, - { - "from": [11.15313, 6.7, 12.3], - "to": [13.01563, 7, 12.3], - "faces": { - "north": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 5], "texture": "#2"} - } - }, - { - "from": [11.14688, 6.7, 11.97813], - "to": [13.00938, 7, 12.00625], - "faces": { - "south": {"uv": [0, 0, 6, 5], "texture": "#2"}, - "west": {"uv": [0, 0, 2.7, 5], "texture": "#2"}, - "up": {"uv": [3, 7, 9, 8], "texture": "#2"}, - "down": {"uv": [0, 0, 6, 2.7], "texture": "#2"} - } - }, - { - "from": [13, 1, 8.6], - "to": [14, 7, 13], - "faces": { - "east": {"uv": [2, 1, 7, 8], "texture": "#2"}, - "south": {"uv": [13, 1, 15, 8], "texture": "#2"}, - "west": {"uv": [9, 1, 14, 8], "texture": "#2"}, - "up": {"uv": [1, 2, 2, 4], "texture": "#2"} - } - }, - { - "from": [13, 1, 4], - "to": [14, 7, 8.6], - "faces": { - "north": {"uv": [14, 4, 15, 11], "texture": "#2"}, - "east": {"uv": [10, 1, 15, 8], "texture": "#2"}, - "up": {"uv": [2, 1, 4, 2], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [2, 1, 8.6], - "to": [3, 7, 12], - "faces": { - "east": {"uv": [0, 0, 5, 7], "texture": "#2"}, - "west": {"uv": [10, 1, 15, 8], "texture": "#2"}, - "up": {"uv": [1, 2, 2, 4], "texture": "#2"} - } - }, - { - "from": [2, 1, 4], - "to": [3, 7, 8.6], - "faces": { - "north": {"uv": [1, 1, 2, 8], "texture": "#2"}, - "east": {"uv": [11, 0, 16, 7], "texture": "#2"}, - "west": {"uv": [1, 1, 6, 8], "texture": "#2"}, - "up": {"uv": [2, 1, 4, 2], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [4.3, 1.6, 6.2], - "to": [8.8, 2.1, 10.7], - "faces": { - "north": {"uv": [0, 0, 10, 1], "texture": "#5"}, - "east": {"uv": [0, 0, 10, 1], "texture": "#5"}, - "south": {"uv": [0, 0, 10, 1], "texture": "#5"}, - "west": {"uv": [0, 0, 10, 1], "texture": "#5"}, - "up": {"uv": [9, 9, 16, 16], "texture": "#5"}, - "down": {"uv": [10, 0, 16, 6], "texture": "#5"} + "up": {"uv": [15.5, 0, 16, 0], "rotation": 270, "texture": "#main"}, + "down": {"uv": [15.5, 0, 16, 0], "rotation": 90, "texture": "#main"} } } ], @@ -367,7 +240,7 @@ }, "groups": [ { - "name": "microwave", + "name": "open", "origin": [0, 0, 0], "color": 0, "children": [ @@ -379,39 +252,11 @@ 5, 6, 7, - { - "name": "buttons", - "origin": [0, 0, 0], - "color": 0, - "children": [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18] - }, - 19, { "name": "door", - "origin": [1, 0, -2], - "color": 0, - "children": [20, 21, 22, 23, 24] - }, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32 - ] - }, - { - "name": "basic_plate", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "group", - "origin": [0, 0, 0], + "origin": [8.5, 16.25, 8.5], "color": 0, - "children": [33] + "children": [8, 9, 10, 11, 12, 13, 14, 15] } ] } diff --git a/common/src/main/resources/assets/pfm/textures/block/iron_microwave.png b/common/src/main/resources/assets/pfm/textures/block/iron_microwave.png new file mode 100644 index 0000000000000000000000000000000000000000..cf0f01f939e20095be2f0f65c6bf33497838f2c5 GIT binary patch literal 1058 zcmV+-1l{|IP)Px&+(|@1R9JD`5fq}aeZh`&N0~FV|z#oIW({vsm`u;q?NY^X~whC?rLNDg=K%ddGp@; z?wjw<)}H(!L6!u1>1@qK^k9KCzJ8oS9@}nT6cL6p^Gw};@#W`w%*x6N!m=%d5CF7VEdWNNksegV z=5?vg)ay!;gm&AaJ!9y`wQKZM zu-Uooy4oIwav_GutI~v7@jT3G+OA7KiU^}f2Mwc$APDe0kGAU~<2d7Uc6LTx#?!2l zBq55Tg+tlQLqT1Kv%p~#A>&wAfAI7W&+~Zl;^j)8-NgIaD6n3XH)0UXE4FmQT$ zN*GGQP-dDf3?+d-;O^az2!eoK?-K%lpnWndDh4R%0oD1+E`-oa>g4!X2UZPeHX=qZ zShkIfV@{5bvk90CZPtcV3MDH5bSF`7peUnN2c;_&ddnX`Q{QL9CB z#>zNJkj6@oaSXuy`=9dgo3Bd~dhqaD*4NkJ%Jg0d*!K3eE?QW&t>2dkH9`o15Mp6@ zl}YzJl$I!;qoX6uLLDFo0^Ka?+B`6tDhPrZ6Bo3q#7xoA6$*jlI5>`@eRg+uQ*{>e zPM)cuIZ*bh3?xaiz`*|geodY0szQZkqoFG|*}xE-c?Qa$7-%+|xeV0y_V!W?imT%G z?K}Fqh>gKufNj~CXA7%fS@33~!M|b1`T2R~i5Qe!P+En~%b-@aCoGdt zh3~)m?D?`F-~IUO$3->)aMin-`Rb{4tM-C#f;S~4q$z3bPhhRkUIJm+7LMcO?uMA{ z3nDwpwHa6g{wPeMECCryhQlGl;V{F3!gxHcDmw2R9FqZZ_JpI+2q8oj2J%pe5zPQO zJ0jH!r3|FCB0X4JVxJ}e5E=Szt_Jh|)vLc!*L{ypXZmsP_XkALTQ)W}m#%`+1WZZo zcDos)`puGY%;tv=c=6&`kMVtGubP Date: Mon, 30 Sep 2024 00:03:19 -0600 Subject: [PATCH 11/17] Overhauled Iron Stove Model and Collision --- .../pfm/blocks/IronStoveBlock.java | 10 +- .../assets/pfm/blockstates/iron_stove.json | 16 +- .../assets/pfm/models/block/iron_stove.json | 1168 ++-------------- .../pfm/models/block/iron_stove_open.json | 1203 +++-------------- .../block/iron_toaster/iron_toaster_on.json | 6 +- .../assets/pfm/textures/block/iron_stove.png | Bin 0 -> 2061 bytes 6 files changed, 305 insertions(+), 2098 deletions(-) create mode 100644 common/src/main/resources/assets/pfm/textures/block/iron_stove.png diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/IronStoveBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/IronStoveBlock.java index c01a59d6e..2f28b3a9b 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/IronStoveBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/IronStoveBlock.java @@ -42,7 +42,7 @@ public static Stream streamIronStoves() { return IRON_STOVES.stream(); } - protected static final VoxelShape IRON_STOVE = VoxelShapes.union(createCuboidShape(0, 0, 0, 16, 16, 14),createCuboidShape(0, 1, 14, 16, 16, 15),createCuboidShape(1.8, 12.2, 15.5375, 14.3, 12.799, 16.1375),createCuboidShape(2.5, 12.2, 14.07, 3.1, 12.79, 15.56),createCuboidShape(12.6, 12.2, 14.07, 13.2, 12.79, 15.57),createCuboidShape(1.8, 2.89, 15.437, 14.3, 3.49, 16.037),createCuboidShape(2.5, 2.89, 13.47, 3.1, 3.49, 15.47),createCuboidShape(12.6, 2.89, 13.47, 13.2, 3.49, 15.47)); + protected static final VoxelShape IRON_STOVE = VoxelShapes.union(createCuboidShape(0, 0, 1, 16, 1, 16),createCuboidShape(0, 1, 0, 16, 16, 16)); protected static final VoxelShape IRON_STOVE_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, IRON_STOVE); protected static final VoxelShape IRON_STOVE_EAST = rotateShape(Direction.NORTH, Direction.EAST, IRON_STOVE); protected static final VoxelShape IRON_STOVE_WEST = rotateShape(Direction.NORTH, Direction.WEST, IRON_STOVE); @@ -51,10 +51,10 @@ public static Stream streamIronStoves() { public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { Direction dir = state.get(FACING); return switch (dir) { - case WEST -> IRON_STOVE_EAST; - case NORTH -> IRON_STOVE_SOUTH; - case SOUTH -> IRON_STOVE; - default -> IRON_STOVE_WEST; + case WEST -> IRON_STOVE_WEST; + case NORTH -> IRON_STOVE; + case SOUTH -> IRON_STOVE_SOUTH; + default -> IRON_STOVE_EAST; }; } } diff --git a/common/src/main/resources/assets/pfm/blockstates/iron_stove.json b/common/src/main/resources/assets/pfm/blockstates/iron_stove.json index af222ee7f..b7ec8c20d 100644 --- a/common/src/main/resources/assets/pfm/blockstates/iron_stove.json +++ b/common/src/main/resources/assets/pfm/blockstates/iron_stove.json @@ -1,14 +1,14 @@ {"variants": { - "open=true,facing=north":{"model":"pfm:block/iron_stove_open","y":180}, - "open=true,facing=east":{"model":"pfm:block/iron_stove_open","y":270}, - "open=true,facing=south":{"model":"pfm:block/iron_stove_open","y":0}, - "open=true,facing=west":{"model":"pfm:block/iron_stove_open","y":90}, + "open=true,facing=north":{"model":"pfm:block/iron_stove_open","y":0}, + "open=true,facing=east":{"model":"pfm:block/iron_stove_open","y":90}, + "open=true,facing=south":{"model":"pfm:block/iron_stove_open","y":180}, + "open=true,facing=west":{"model":"pfm:block/iron_stove_open","y":270}, - "open=false,facing=north":{"model":"pfm:block/iron_stove","y":180}, - "open=false,facing=east":{"model":"pfm:block/iron_stove","y":270}, - "open=false,facing=south":{"model":"pfm:block/iron_stove","y":0}, - "open=false,facing=west":{"model":"pfm:block/iron_stove","y":90} + "open=false,facing=north":{"model":"pfm:block/iron_stove","y":0}, + "open=false,facing=east":{"model":"pfm:block/iron_stove","y":90}, + "open=false,facing=south":{"model":"pfm:block/iron_stove","y":180}, + "open=false,facing=west":{"model":"pfm:block/iron_stove","y":270} } } diff --git a/common/src/main/resources/assets/pfm/models/block/iron_stove.json b/common/src/main/resources/assets/pfm/models/block/iron_stove.json index d64633c2e..077d7c052 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_stove.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_stove.json @@ -1,1160 +1,260 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", - "particle": "block/iron_block", - "base": "block/iron_block", - "legs": "block/gray_concrete" + "0": "pfm:block/iron_stove", + "particle": "block/iron_block" }, "elements": [ { - "from": [0, 0, 0], - "to": [16, 1, 14], + "name": "grill", + "from": [1, 16.01, 1], + "to": [15, 16.01, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, "faces": { - "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [1, 0, 15, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#base"} + "up": {"uv": [16, 3.5, 12.5, 0], "rotation": 180, "texture": "#0"} } }, { - "from": [2, 4, 1], - "to": [14, 5, 14], + "name": "base", + "from": [0, 0, 1], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8.5]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 13], "texture": "#base"} - } - }, - { - "from": [2, 5, 2], - "to": [14, 14, 2.2], - "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 14, 1, 16], "texture": "#legs"} - } - }, - { - "from": [1.9, 5, 1.9], - "to": [2.1, 14, 13.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#legs"} - } - }, - { - "from": [13.9, 5, 1.9], - "to": [14.1, 14, 13.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#legs"} - } - }, - { - "from": [2, 15, 2], - "to": [14, 15.8, 14], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 13.2, 2], - "to": [14, 14, 14], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} - } - }, - { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 13.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} - } - }, - { - "from": [2.8, 15.6, 2.7], - "to": [6.3, 15.9, 6.2], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [9.8, 15.6, 3.2], - "to": [12.8, 15.9, 6.2], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [9.3, 15.6, 9.3], - "to": [13.3, 15.9, 13.3], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [3.05, 15.75, 10.05], - "to": [6.05, 16.05, 13.05], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [3.05, 15.75, 2.95], - "to": [6.05, 16.05, 5.95], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [10.05, 15.75, 3.45], - "to": [12.55, 16.05, 5.95], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [9.55, 15.75, 9.55], - "to": [13.05, 16.05, 13.05], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [2.8, 15.6, 9.8], - "to": [6.3, 15.9, 13.3], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [2, 5.9, 2.9], - "to": [14, 6.1, 3.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 8], - "to": [14, 6.1, 8.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 12.9], - "to": [14, 6.1, 13.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 2.9], - "to": [2.2, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 5.9, 2.9], - "to": [13.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 5.9, 2.9], - "to": [12.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 5.9, 2.9], - "to": [10.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 5.9, 2.9], - "to": [9.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 5.9, 2.9], - "to": [7.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 5.9, 2.9], - "to": [6.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 5.9, 2.9], - "to": [4.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 5.9, 2.9], - "to": [3.6, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 8], - "to": [14, 8.6, 8.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [14, 8.6, 3.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 12.9], - "to": [14, 8.6, 13.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [2.2, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 8.4, 2.9], - "to": [13.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 8.4, 2.9], - "to": [12.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 8.4, 2.9], - "to": [10.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 8.4, 2.9], - "to": [9.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 8.4, 2.9], - "to": [7.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 8.4, 2.9], - "to": [6.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 8.4, 2.9], - "to": [4.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 8.4, 2.9], - "to": [3.6, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [0, 11.75, 4, 12], "texture": "#0"}, + "east": {"uv": [3.75, 7.75, 0, 8], "texture": "#0"}, + "south": {"uv": [4, 11.75, 8, 12], "texture": "#0"}, + "west": {"uv": [0, 4, 3.75, 3.75], "texture": "#0"}, + "up": {"uv": [3.75, 16, 0, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.5, 4, 4.75, 8], "rotation": 90, "texture": "#0"} } }, { + "name": "main", "from": [0, 1, 0], - "to": [2, 16, 14], - "faces": { - "north": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 15], "texture": "#base"} - } - }, - { - "from": [14, 1, 0], - "to": [16, 16, 14], - "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [14, 1, 16, 16], "texture": "#base"} - } - }, - { - "name": "door", - "from": [2, 14, 13.26875], - "to": [3.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [4, 14, 13.26875], - "to": [5.2, 15.2, 15.26875], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 8, 4, 11.75], "texture": "#0"}, + "east": {"uv": [4, 4, 0, 7.75], "texture": "#0"}, + "south": {"uv": [4, 8, 8, 11.75], "texture": "#0"}, + "west": {"uv": [0, 0, 4, 3.75], "texture": "#0"}, + "up": {"uv": [8.25, 4, 4.25, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.25, 4, 4.25, 8], "rotation": 90, "texture": "#0"} } }, { - "name": "door", - "from": [7.3, 13.9, 13.26875], - "to": [8.8, 15.4, 15.26875], + "from": [4, 2, -1], + "to": [12, 3, -1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, -1]}, "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"} } }, { - "name": "door", - "from": [11, 14, 13.26875], - "to": [12.2, 15.2, 15.26875], + "from": [4, 2, -0.03125], + "to": [12, 3, -0.03125], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, -0.03125]}, "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"} } }, { - "name": "door", - "from": [13, 14, 13.26875], - "to": [14.2, 15.2, 15.26875], + "from": [4, 2, -1], + "to": [4, 3, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 2, 0]}, "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [0, 1, 14], - "to": [16, 4, 15], + "from": [12, 2, -1], + "to": [12, 3, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 0]}, "faces": { - "north": {"uv": [0, 11, 16, 15], "texture": "#base"}, - "east": {"uv": [15, 11, 16, 15], "texture": "#base"}, - "south": {"uv": [0, 11, 16, 15], "texture": "#base"}, - "west": {"uv": [15, 11, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#base"}, - "down": {"uv": [0, 1, 16, 2], "texture": "#base"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [0, 13.5, 14], - "to": [16, 16, 15], + "from": [2, 11, -1], + "to": [14, 12, -1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 11, -1]}, "faces": { - "north": {"uv": [0, 1, 16, 3], "texture": "#base"}, - "east": {"uv": [15, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 8, 16, 10.5], "texture": "#base"}, - "west": {"uv": [15, 1, 16, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#base"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [0, 4.5, 14], - "to": [3, 13, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [2, 11, -0.03125], + "to": [14, 12, -0.03125], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 11, -0.03125]}, "faces": { - "north": {"uv": [3, 3, 6, 10.5], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#base"}, - "south": {"uv": [0, 3, 3, 11.5], "texture": "#base"}, - "west": {"uv": [15, 5, 16, 13.5], "texture": "#base"}, - "up": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "down": {"uv": [0, 15, 3, 16], "texture": "#base"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [3, 5.5, 14.5], - "to": [13, 11.8, 14.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [2, 11, -1], + "to": [2, 12, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 11, 0]}, "faces": { - "north": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "texture": "#2"}, - "south": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 9.5], "texture": "#2"}, - "up": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "down": {"uv": [3, 1.4, 13, 1.5], "texture": "#2"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [13, 4.5, 14], - "to": [16, 13, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [14, 11, -1], + "to": [14, 12, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 11, 0]}, "faces": { - "north": {"uv": [7, 6, 10, 13.5], "texture": "#base"}, - "east": {"uv": [15, 3, 16, 11.5], "texture": "#base"}, - "south": {"uv": [13, 3, 16, 11.5], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#base"}, - "up": {"uv": [13, 0, 16, 1], "texture": "#base"}, - "down": {"uv": [13, 15, 16, 16], "texture": "#base"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#0"} } }, { - "from": [3, 11.7, 14], - "to": [13, 13, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [1, 1, 15], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#base"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#base"}, - "south": {"uv": [2, 3.1, 15, 4.25], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#base"}, - "up": {"uv": [3, 0, 13, 1], "texture": "#base"}, - "down": {"uv": [3, 14, 13, 15], "texture": "#base"} + "north": {"uv": [4, 12.25, 7.5, 16], "texture": "#0"} } }, { - "from": [3, 4.5, 14], - "to": [13, 5.8, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [15, 1, 1], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 8.5, 8]}, "faces": { - "north": {"uv": [3, 9, 13, 10.5], "texture": "#base"}, - "east": {"uv": [1, 9, 2, 10.5], "texture": "#base"}, - "south": {"uv": [3, 10.2, 13, 11.5], "texture": "#base"}, - "west": {"uv": [14, 9, 15, 10.5], "texture": "#base"}, - "up": {"uv": [3, 14, 13, 15], "texture": "#base"}, - "down": {"uv": [3, 15, 13, 16], "texture": "#base"} + "west": {"uv": [4, 12.25, 7.5, 16], "texture": "#0"} } }, { - "name": "door", - "from": [1.8, 12.2, 15.5375], - "to": [14.3, 12.8, 16.1375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [1, 1, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8.5, 8]}, "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} + "east": {"uv": [4, 12.25, 7.5, 16], "texture": "#0"} } }, { - "name": "door", - "from": [2.5, 12.2, 14.06875], - "to": [3.1, 12.8, 15.56875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [1, 15, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14.5, 10.5]}, "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} + "down": {"uv": [6.75, 16, 4.25, 12.5], "rotation": 270, "texture": "#0"} } }, { - "name": "door", - "from": [12.6, 12.2, 14.06875], - "to": [13.2, 12.8, 15.56875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [1, 1, 5], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 10.5]}, "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } }, { - "from": [0.025, 3.975, 13.7], - "to": [15.985, 5.075, 14.2], + "from": [1, 5, 5], + "to": [15, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 10.5]}, "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "from": [0.025, 5.075, 13.7], - "to": [2.005, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "from": [13.975, 5.075, 13.7], - "to": [15.975, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.8, 2.9, 15.4375], - "to": [14.3, 3.5, 16.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 2.9, 13.46875], - "to": [3.1, 3.5, 15.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 2.9, 13.46875], - "to": [13.2, 3.5, 15.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [0.025, 13, 13.7], - "to": [15.985, 13.5, 14.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "from": [2, 1, 0], - "to": [14, 16, 2], - "faces": { - "north": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#base"}, - "down": {"uv": [2, 14, 14, 16], "texture": "#base"} - } - }, - { - "name": "door", - "from": [7.8, 15.9, 2.33125], - "to": [8, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [9.8, 15.9, 2.23125], - "to": [10, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [5.8, 15.9, 2.23125], - "to": [6, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [3.8, 15.9, 2.23125], - "to": [4, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2, 15.9, 2.23125], - "to": [2.2, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [11.8, 15.9, 2.33125], - "to": [12, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.8, 15.9, 2.33125], - "to": [14, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 8.2], - "to": [13.93125, 16.1, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 6.1], - "to": [13.93125, 16.1, 6.3], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 4], - "to": [13.83125, 16.1, 4.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 10.3], - "to": [13.93125, 16.1, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 12.2], - "to": [14.00937, 16.1, 12.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 13.8], - "to": [14.00937, 16.1, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.00469, 15.9, 2.2], - "to": [13.99375, 16.1, 2.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } } ], "display": { "thirdperson_righthand": { - "rotation": [59, -140, 0], + "rotation": [59, 45, 0], "translation": [-0.5, 0.25, -1.5], "scale": [0.39, 0.39, 0.39] }, "thirdperson_lefthand": { - "rotation": [59, -140, 0], + "rotation": [59, 45, 0], "translation": [-0.5, 0.25, -1.5], "scale": [0.39, 0.39, 0.39] }, "firstperson_righthand": { - "rotation": [-1, -146, 0], + "rotation": [-1, 145, 0], "translation": [1, 0.75, 0], "scale": [0.32, 0.32, 0.32] }, "firstperson_lefthand": { - "rotation": [-1, -146, 0], + "rotation": [-1, 145, 0], "translation": [1, 0.75, 0], "scale": [0.32, 0.32, 0.32] }, "ground": { - "translation": [0, -0.75, 0], + "translation": [0, 1.5, 0], "scale": [0.39, 0.39, 0.39] }, "gui": { - "rotation": [30, 45, 0], + "rotation": [30, -135, 0], "translation": [0.5, -0.5, 0], "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [-1, -180, 0], - "translation": [0, 0.75, -2], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, -0.75, -2], - "scale": [0.9, 0.9, 0.9] } }, "groups": [ { - "name": "stove", - "origin": [0, 0, 0], + "name": "oven", + "origin": [8, 3.5, 8.5], "color": 0, "children": [ { - "name": "Base", - "origin": [0, 0, 0], + "name": "outside", + "origin": [0, 0, 15], "color": 0, "children": [ 0, 1, 2, - 3, - 4, - 5, - 6, - 7, { - "name": "burners", - "origin": [0, 0, 0], + "name": "handlebottom", + "origin": [5, 11, 0], "color": 0, - "children": [ - 8, - 9, - 10, - { - "name": "burnertips", - "origin": [0, 0, 0], - "color": 0, - "children": [11, 12, 13, 14] - }, - 15 - ] + "children": [3, 4, 5, 6] }, { - "name": "griddle_bottom", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], "color": 0, - "children": [ - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - { - "name": "griddle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39] - } - ] + "children": [7, 8, 9, 10] }, - 40, - 41, { - "name": "cooktop_controls", - "origin": [0, 0, 0], + "name": "grill", + "origin": [8, 7, 8.5], "color": 0, - "children": [42, 43, 44, 45, 46] - }, - 47, - 48, - { - "name": "stove_door", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 49, - 50, - 51, - 52, - 53, - { - "name": "stove_handle", - "origin": [0, 0, 0], - "color": 0, - "children": [54, 55, 56] - } - ] - }, - 57, - 58, - 59, + "children": [] + } + ] + }, + { + "name": "inside", + "origin": [1, 8.5, 8], + "color": 0, + "children": [ + 11, + 12, + 13, + 14, { - "name": "bottom_stove_handle", - "origin": [0, 0, 0], + "name": "oven_grate", + "origin": [8, 3.5, 8.5], "color": 0, - "children": [60, 61, 62] - }, - 63, - 64 + "children": [15, 16] + } ] } ] - }, - { - "name": "griddle", - "origin": [0, 0, 0], - "color": 0, - "children": [65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_stove_open.json b/common/src/main/resources/assets/pfm/models/block/iron_stove_open.json index 192c123e3..bcbf698e0 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_stove_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_stove_open.json @@ -1,1160 +1,267 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", - "particle": "block/iron_block", - "base": "block/iron_block", - "legs": "block/gray_concrete" + "0": "pfm:block/iron_stove", + "particle": "block/iron_block" }, "elements": [ { - "from": [0, 0, 0], - "to": [16, 1, 14], + "name": "grill", + "from": [1, 16.01, 1], + "to": [15, 16.01, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, "faces": { - "north": {"uv": [0, 15, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [1, 0, 15, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#base"} + "up": {"uv": [16, 3.5, 12.5, 0], "rotation": 180, "texture": "#0"} } }, { - "from": [2, 4, 1], - "to": [14, 5, 14], + "name": "base", + "from": [0, 0, 1], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8.5]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 13], "texture": "#base"} + "north": {"uv": [0, 11.75, 4, 12], "texture": "#0"}, + "east": {"uv": [3.75, 7.75, 0, 8], "texture": "#0"}, + "south": {"uv": [4, 11.75, 8, 12], "texture": "#0"}, + "west": {"uv": [0, 4, 3.75, 3.75], "texture": "#0"}, + "up": {"uv": [3.75, 16, 0, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.5, 4, 4.75, 8], "rotation": 90, "texture": "#0"} } }, { - "from": [2, 5, 2], - "to": [14, 14, 2.2], + "from": [4, -0.95, -1.05], + "to": [12, -0.95, -0.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 14, 1, 16], "texture": "#legs"} + "up": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#0"}, + "down": {"uv": [8.5, 4.25, 10.5, 4.5], "rotation": 180, "texture": "#0"} } }, { - "from": [1.9, 5, 1.9], - "to": [2.1, 14, 13.9], + "from": [4, 0.01875, -1.05], + "to": [12, 0.01875, -0.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#legs"} + "down": {"uv": [8.5, 4.25, 10.5, 4.5], "rotation": 180, "texture": "#0"} } }, { - "from": [13.9, 5, 1.9], - "to": [14.1, 14, 13.9], + "from": [4, -0.95, -1.05], + "to": [4, 0.05, -0.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#legs"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 270, "texture": "#0"} } }, { - "from": [2, 15, 2], - "to": [14, 15.8, 14], + "from": [12, -0.95, -1.05], + "to": [12, 0.05, -0.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 270, "texture": "#0"} } }, { - "from": [2, 13.2, 2], - "to": [14, 14, 14], + "from": [2, -0.95, -10.05], + "to": [14, -0.95, -9.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 270, "texture": "#0"}, + "up": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "down": {"uv": [8.5, 4, 11.5, 4.25], "rotation": 180, "texture": "#0"} } }, { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 13.9], + "from": [2, 0.01875, -10.05], + "to": [14, 0.01875, -9.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#legs"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.5, 4, 11.5, 4.25], "rotation": 180, "texture": "#0"} } }, { - "from": [2.8, 15.6, 2.7], - "to": [6.3, 15.9, 6.2], + "from": [2, -0.95, -10.05], + "to": [2, 0.05, -9.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 270, "texture": "#0"}, + "up": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "down": {"uv": [8.5, 4, 11.5, 4.25], "rotation": 180, "texture": "#0"} } }, { - "from": [9.8, 15.6, 3.2], - "to": [12.8, 15.9, 6.2], + "from": [14, -0.95, -10.05], + "to": [14, 0.05, -9.05], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} + "east": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "rotation": 270, "texture": "#0"}, + "up": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#0"}, + "down": {"uv": [8.5, 4, 11.5, 4.25], "rotation": 180, "texture": "#0"} } }, { - "from": [9.3, 15.6, 9.3], - "to": [13.3, 15.9, 13.3], + "name": "main", + "from": [0, 0.05, -10.05], + "to": [16, 1.05, 0.95], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.8, 0.95]}, "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} + "north": {"uv": [4.5, 4, 4.25, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.25, 5, 0, 7.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [4.5, 4, 4.25, 8], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 0.25, 3.75], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 9, 4, 11.75], "texture": "#0"}, + "down": {"uv": [0, 9, 4, 11.75], "rotation": 180, "texture": "#0"} } }, { - "from": [3.05, 15.75, 10.05], - "to": [6.05, 16.05, 13.05], + "name": "main", + "from": [0, 1, 1], + "to": [16, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} + "east": {"uv": [4, 5, 0.25, 7.75], "texture": "#0"}, + "south": {"uv": [4, 9, 8, 11.75], "texture": "#0"}, + "west": {"uv": [0.25, 1, 4, 3.75], "texture": "#0"}, + "up": {"uv": [8.5, 4, 4.25, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.25, 4, 4.5, 8], "rotation": 90, "texture": "#0"} } }, { - "from": [3.05, 15.75, 2.95], - "to": [6.05, 16.05, 5.95], + "name": "main", + "from": [0, 12, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} + "north": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 4, 0, 5], "texture": "#0"}, + "south": {"uv": [4, 8, 8, 9], "texture": "#0"}, + "west": {"uv": [0, 0, 4, 1], "texture": "#0"}, + "up": {"uv": [8.5, 4, 4.25, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.25, 4, 4.25, 8], "rotation": 90, "texture": "#0"} } }, { - "from": [10.05, 15.75, 3.45], - "to": [12.55, 16.05, 5.95], + "from": [1, 1, 15], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} + "north": {"uv": [7.75, 12, 11.25, 15.75], "texture": "#0"} } }, { - "from": [9.55, 15.75, 9.55], - "to": [13.05, 16.05, 13.05], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [2.8, 15.6, 9.8], - "to": [6.3, 15.9, 13.3], - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#legs"}, - "up": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"}, - "down": {"uv": [6.5, 2, 9.5, 14], "texture": "#legs"} - } - }, - { - "from": [2, 5.9, 2.9], - "to": [14, 6.1, 3.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 8], - "to": [14, 6.1, 8.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 12.9], - "to": [14, 6.1, 13.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 5.9, 2.9], - "to": [2.2, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 5.9, 2.9], - "to": [13.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 5.9, 2.9], - "to": [12.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 5.9, 2.9], - "to": [10.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 5.9, 2.9], - "to": [9.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 5.9, 2.9], - "to": [7.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 5.9, 2.9], - "to": [6.4, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 5.9, 2.9], - "to": [4.9, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 5.9, 2.9], - "to": [3.6, 6.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 8], - "to": [14, 8.6, 8.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [14, 8.6, 3.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 12.9], - "to": [14, 8.6, 13.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 8.4, 2.9], - "to": [2.2, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 8.4, 2.9], - "to": [13.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 8.4, 2.9], - "to": [12.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 8.4, 2.9], - "to": [10.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 8.4, 2.9], - "to": [9.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 8.4, 2.9], - "to": [7.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 8.4, 2.9], - "to": [6.4, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 8.4, 2.9], - "to": [4.9, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 8.4, 2.9], - "to": [3.6, 8.6, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [0, 1, 0], - "to": [2, 16, 14], - "faces": { - "north": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 15], "texture": "#base"} - } - }, - { - "from": [14, 1, 0], - "to": [16, 16, 14], - "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [14, 1, 16, 16], "texture": "#base"} - } - }, - { - "name": "door", - "from": [2, 14, 13.26875], - "to": [3.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [4, 14, 13.26875], - "to": [5.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [7.3, 13.9, 13.26875], - "to": [8.8, 15.4, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [11, 14, 13.26875], - "to": [12.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13, 14, 13.26875], - "to": [14.2, 15.2, 15.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#legs"} - } - }, - { - "from": [0, 1, 14], - "to": [16, 4, 15], - "faces": { - "north": {"uv": [0, 11, 16, 15], "texture": "#base"}, - "east": {"uv": [15, 11, 16, 15], "texture": "#base"}, - "south": {"uv": [0, 11, 16, 15], "texture": "#base"}, - "west": {"uv": [15, 11, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#base"}, - "down": {"uv": [0, 1, 16, 2], "texture": "#base"} - } - }, - { - "from": [0, 13.5, 14], + "from": [15, 1, 1], "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 8.5, 8]}, "faces": { - "north": {"uv": [0, 1, 16, 3], "texture": "#base"}, - "east": {"uv": [15, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 8, 16, 10.5], "texture": "#base"}, - "west": {"uv": [15, 1, 16, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#base"} + "north": {"uv": [0, 8.25, 0.25, 12], "texture": "#0"}, + "west": {"uv": [4, 12.25, 7.5, 16], "texture": "#0"} } }, { - "from": [0, 3, 14.5], - "to": [3, 4, 23], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, + "from": [0, 1, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8.5, 8]}, "faces": { - "north": {"uv": [0, 15, 3, 16], "rotation": 180, "texture": "#base"}, - "east": {"uv": [5, 3, 6, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "west": {"uv": [15, 5, 16, 13.5], "rotation": 90, "texture": "#base"}, - "up": {"uv": [3, 3, 6, 10.5], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 11.5], "texture": "#base"} + "north": {"uv": [3.75, 8, 4, 11.75], "texture": "#0"}, + "east": {"uv": [4, 12.25, 7.5, 16], "texture": "#0"} } }, { - "from": [3, 3.4, 15.5], - "to": [13, 3.5, 21.8], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, + "from": [1, 11.9, 1], + "to": [15, 11.9, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.4, 10.5]}, "faces": { - "north": {"uv": [3, 1.4, 13, 1.5], "rotation": 180, "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "rotation": 270, "texture": "#2"}, - "south": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 9.5], "rotation": 90, "texture": "#2"}, - "up": {"uv": [3, 4.2, 13, 9.5], "rotation": 180, "texture": "#2"}, - "down": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"} + "down": {"uv": [6.75, 16, 4.25, 12.5], "rotation": 270, "texture": "#0"} } }, { - "from": [13, 3, 14.5], - "to": [16, 4, 23], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, + "from": [1, 1, 6], + "to": [15, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 11.5]}, "faces": { - "north": {"uv": [13, 15, 16, 16], "rotation": 180, "texture": "#base"}, - "east": {"uv": [15, 3, 16, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [13, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 11.5], "rotation": 90, "texture": "#base"}, - "up": {"uv": [7, 6, 10, 13.5], "rotation": 180, "texture": "#base"}, - "down": {"uv": [13, 3, 16, 11.5], "texture": "#base"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } }, { - "from": [3, 3, 21.7], - "to": [13, 4, 23], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, + "from": [1, 5, 6], + "to": [15, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 11.5]}, "faces": { - "north": {"uv": [3, 14, 13, 15], "rotation": 180, "texture": "#base"}, - "east": {"uv": [5, 3, 6, 10.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [3, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [2, 3, 3, 10.5], "rotation": 90, "texture": "#base"}, - "up": {"uv": [1, 7, 14, 8.5], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3.1, 15, 4.25], "texture": "#base"} - } - }, - { - "from": [3, 3, 14.5], - "to": [13, 4, 15.8], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 15, 13, 16], "rotation": 180, "texture": "#base"}, - "east": {"uv": [1, 9, 2, 10.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [3, 14, 13, 15], "texture": "#base"}, - "west": {"uv": [14, 9, 15, 10.5], "rotation": 90, "texture": "#base"}, - "up": {"uv": [3, 9, 13, 10.5], "rotation": 180, "texture": "#base"}, - "down": {"uv": [3, 10.2, 13, 11.5], "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.8, 1.8625, 22.2], - "to": [14.3, 2.4625, 22.8], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "rotation": 180, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "rotation": 180, "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 2.43125, 22.2], - "to": [3.1, 3.93125, 22.8], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 180, "texture": "#3"}, - "south": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "texture": "#3"}, - "up": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 2.43125, 22.2], - "to": [13.2, 3.93125, 22.8], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 180, "texture": "#3"}, - "south": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "texture": "#3"}, - "up": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [0.025, 3.975, 13.7], - "to": [15.985, 5.075, 14.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "from": [0.025, 5.075, 13.7], - "to": [2.005, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "from": [13.975, 5.075, 13.7], - "to": [15.975, 13.175, 14.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.8, 2.9, 15.4375], - "to": [14.3, 3.5, 16.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 2.9, 13.46875], - "to": [3.1, 3.5, 15.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 2.9, 13.46875], - "to": [13.2, 3.5, 15.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [0.025, 13, 13.7], - "to": [15.985, 13.5, 14.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#legs"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#legs"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#legs"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#legs"}, - "up": {"uv": [2, 0, 18, 1], "texture": "#legs"}, - "down": {"uv": [2, 14, 18, 15], "texture": "#legs"} - } - }, - { - "from": [2, 1, 0], - "to": [14, 16, 2], - "faces": { - "north": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#base"}, - "down": {"uv": [2, 14, 14, 16], "texture": "#base"} - } - }, - { - "name": "door", - "from": [7.8, 15.9, 2.33125], - "to": [8, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [9.8, 15.9, 2.23125], - "to": [10, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [5.8, 15.9, 2.23125], - "to": [6, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [3.8, 15.9, 2.23125], - "to": [4, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2, 15.9, 2.23125], - "to": [2.2, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [11.8, 15.9, 2.33125], - "to": [12, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.8, 15.9, 2.33125], - "to": [14, 16.1, 13.83125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 8.2], - "to": [13.93125, 16.1, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 6.1], - "to": [13.93125, 16.1, 6.3], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 4], - "to": [13.83125, 16.1, 4.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.13125, 15.9, 10.3], - "to": [13.93125, 16.1, 10.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 12.2], - "to": [14.00937, 16.1, 12.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.99687, 15.9, 13.8], - "to": [14.00937, 16.1, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [2.00469, 15.9, 2.2], - "to": [13.99375, 16.1, 2.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#0"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 270, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, -140, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.39, 0.39, 0.39] - }, - "thirdperson_lefthand": { - "rotation": [59, -140, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.39, 0.39, 0.39] - }, - "firstperson_righthand": { - "rotation": [-1, -146, 0], - "translation": [1, 0.75, 0], - "scale": [0.32, 0.32, 0.32] - }, - "firstperson_lefthand": { - "rotation": [-1, -146, 0], - "translation": [1, 0.75, 0], - "scale": [0.32, 0.32, 0.32] - }, - "ground": { - "translation": [0, -0.75, 0], - "scale": [0.39, 0.39, 0.39] - }, - "gui": { - "rotation": [30, 45, 0], - "translation": [0.5, -0.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "rotation": [-1, -180, 0], - "translation": [0, 0.75, -2], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "rotation": [0, -180, 0], - "translation": [0, -0.75, -2], - "scale": [0.9, 0.9, 0.9] - } - }, "groups": [ { - "name": "stove", - "origin": [0, 0, 0], + "name": "oven_open", + "origin": [8, 3.5, 8.5], "color": 0, "children": [ { - "name": "Base", - "origin": [0, 0, 0], + "name": "outside", + "origin": [0, 0, 15], "color": 0, "children": [ 0, 1, - 2, - 3, - 4, - 5, - 6, - 7, { - "name": "burners", - "origin": [0, 0, 0], + "name": "door", + "origin": [-8, 8.5, 8], "color": 0, "children": [ - 8, - 9, - 10, { - "name": "burnertips", - "origin": [0, 0, 0], + "name": "handlebottom", + "origin": [5, 11, 0], "color": 0, - "children": [11, 12, 13, 14] + "children": [2, 3, 4, 5] }, - 15 - ] - }, - { - "name": "griddle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, { - "name": "griddle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], "color": 0, - "children": [28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39] - } + "children": [6, 7, 8, 9] + }, + 10 ] }, - 40, - 41, + 11, + 12, { - "name": "cooktop_controls", - "origin": [0, 0, 0], + "name": "grill", + "origin": [8, 7, 8.5], "color": 0, - "children": [42, 43, 44, 45, 46] - }, - 47, - 48, - { - "name": "stove_door", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 49, - 50, - 51, - 52, - 53, - { - "name": "stove_handle", - "origin": [0, 0, 0], - "color": 0, - "children": [54, 55, 56] - } - ] - }, - 57, - 58, - 59, + "children": [] + } + ] + }, + { + "name": "inside", + "origin": [1, 8.5, 8], + "color": 0, + "children": [ + 13, + 14, + 15, + 16, { - "name": "bottom_stove_handle", - "origin": [0, 0, 0], + "name": "oven_grate", + "origin": [8, 3.5, 8.5], "color": 0, - "children": [60, 61, 62] - }, - 63, - 64 + "children": [17, 18] + } ] } ] - }, - { - "name": "griddle", - "origin": [0, 0, 0], - "color": 0, - "children": [65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json b/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json index 4b201bb5a..015be5ca6 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_toaster/iron_toaster_on.json @@ -96,9 +96,9 @@ } }, { - "from": [6, 5, 2], - "to": [8, 6, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 1]}, + "from": [6, 2, 2], + "to": [8, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 1]}, "faces": { "north": {"uv": [0, 0, 1, 0.5], "texture": "#0"}, "east": {"uv": [0, 0, 0.5, 0.5], "texture": "#0"}, diff --git a/common/src/main/resources/assets/pfm/textures/block/iron_stove.png b/common/src/main/resources/assets/pfm/textures/block/iron_stove.png new file mode 100644 index 0000000000000000000000000000000000000000..df3615a7675e5ea90c7548b915aef0565b7f0686 GIT binary patch literal 2061 zcmV+o2=e!dP)P_RH8)+1+&myHLE24PReUDxsY^=kltv*a-O&09AC0Gg)xuIujZ1|bA9Gc!{8nJ>?5sY{T{Ix0>j^#>TQM{8)BwY%IH?sG5pQCgXdkw{PD906cGX zr4&VB$IZ>nzInW|ypmMuxN`a%7cN}zosSwPf#MMlPyc&bC8*bZXJ%%gX&O^Du6$~G z7E{x+H9dS9h#dl`gn=vsR82)bpNDCh$mjEDZ*K=7g#9foEd|Oc`g*z&Df0NyL!3VS zDdVDIaltp1ohud>;0pnn>+_&48WaKm(BI#WmX?;l2Mv?o`RQjgYdQ?0?0t?CO_s~V z#TTD{RzC-L#6zi6s=6^HJpgRQMTp_>?AbE_Kzn<;bbge)S<}(evj>l#Jb|w3a9tPO zU0tv&3y$l;&~=|||G)sIr(XowCKi|nh^sFnJrTSI^!N9(W7!Hv$)~1gaq84b3>_P4 zsuBj^PUZjjjUO;JmX)UBCF`S@gP*Owu+LP+!i*~-i2Qq)@qGzzgf01|KD zJs@cv&?qPXs!Cx*l*3{jz#Ae-9gqZda{vHeDIC@nMwP)y>wqK><2^2vyLbNp0H~S< zL)YQBE<8e@R*1^bbpU|lx&Q#L;<3WX`0;nV z-%~bLn9)Qzm7P6%c7=vUP^zSyv9z>=+qZ8g${G}@?FV%2+6|A)!LlrNjw&i1i|0I! z3`ONBiKeBnh{!a^CdSwgPy<%ZBSdNd+qRj()=I%Bq`Dsoo9#zfB#*q&mftq^(NJ4;m3ti#3p%4@r>xtOC03`i@7!ERp zM7QTby~MWdx*k3aMD7TM?F-0y0SJcRkApmeBC48`jgzA0{Qv~?0^k(n<6ow9kXJOE z19-&QAqw&Ua6~Ap1vWzLQ`FTBqT&Uj2ZW_KJ~N1Ek@uMOM(jce5-*T-gF)a8vQbta zaXo-vd4zBPAKTQ;!?FNB2aO^@2>St1nE)|4fPyL+C+-_Ug5dT8qB_DTSEo%4AJ?+X zK%r`yuOn;(l!^NjK%FftZKVNV_SH-DcWm()K~yg2HyVkmcl&Yn1=8Hm;9rC^tQj&| z3;@9R_&5k57#$tOwr$&R>Cz==nud{)5uoy3o)ChI7cT;p_wq>iPESN{@4M`{SX}Up zDNJ+qCCc#dxvK5&THs5A3#Aek78e=G<@0&8wYEZ06sW4oz=r?;>>n5?m%KZ6 zusPHN_74mIT=eRB`%Yr>W565w^xVR|XV`K2Z7U}^(-vLn=hM{rC$Ye5A zgvqBmUk_jyXl-qUVHj(nLn8P*z#|^A+3ex43(78E?E$uJmt$MkVd^?&^Lc5}d!LoK%c^M(g zc>dz$nr5Gd*8x;X`Wu8SGY+9{zm^1=xDKeNrss_*#`bz=i@-X7N0hu4BZSonXdON literal 0 HcmV?d00001 From 4017954e7e4dd4b59a05126426d5f4405b169ce6 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:31:40 -0600 Subject: [PATCH 12/17] Overhauled White and Gray Fridges Models and Collisions Also fixed White and Gray Stoves not opening --- .../pfm/blocks/FreezerBlock.java | 8 +- .../unlikepaladin/pfm/blocks/FridgeBlock.java | 26 +- .../models/fridge/UnbakedFreezerModel.java | 12 +- .../models/fridge/UnbakedFridgeModel.java | 28 +- .../assets/pfm/blockstates/gray_freezer.json | 8 +- .../assets/pfm/blockstates/gray_fridge.json | 8 +- .../assets/pfm/blockstates/gray_stove.json | 12 +- .../assets/pfm/blockstates/white_freezer.json | 8 +- .../assets/pfm/blockstates/white_fridge.json | 8 +- .../assets/pfm/blockstates/white_stove.json | 12 +- .../pfm/models/block/fridge/freezer.json | 352 --- .../pfm/models/block/fridge/freezer_open.json | 966 ------- .../models/block/fridge/freezer_single.json | 306 -- .../block/fridge/freezer_single_open.json | 893 ------ .../pfm/models/block/fridge/fridge.json | 397 --- .../models/block/fridge/fridge_bottom.json | 279 -- .../block/fridge/fridge_bottom_open.json | 472 --- .../pfm/models/block/fridge/fridge_full.json | 2563 ----------------- .../models/block/fridge/fridge_middle.json | 265 -- .../block/fridge/fridge_middle_freezer.json | 383 --- .../fridge/fridge_middle_freezer_open.json | 570 ---- .../block/fridge/fridge_middle_open.json | 428 --- .../pfm/models/block/fridge/fridge_open.json | 596 ---- .../models/block/fridge/fridge_single.json | 306 -- .../block/fridge/fridge_single_open.json | 465 --- .../pfm/models/block/fridge/fridge_top.json | 339 --- .../models/block/fridge/fridge_top_open.json | 497 ---- .../pfm/models/block/gray_fridge/freezer.json | 8 + .../block/gray_fridge/freezer_open.json | 8 + .../block/gray_fridge/freezer_single.json | 8 + .../gray_fridge/freezer_single_open.json | 8 + .../pfm/models/block/gray_fridge/fridge.json | 8 + .../block/gray_fridge/fridge_bottom.json | 8 + .../block/gray_fridge/fridge_bottom_open.json | 8 + .../models/block/gray_fridge/fridge_full.json | 8 + .../block/gray_fridge/fridge_middle.json | 8 + .../gray_fridge/fridge_middle_freezer.json | 8 + .../fridge_middle_freezer_open.json | 8 + .../block/gray_fridge/fridge_middle_open.json | 8 + .../models/block/gray_fridge/fridge_open.json | 8 + .../block/gray_fridge/fridge_single.json | 8 + .../block/gray_fridge/fridge_single_open.json | 8 + .../models/block/gray_fridge/fridge_top.json | 8 + .../block/gray_fridge/fridge_top_open.json | 8 + .../block/gray_fridge/gray_freezer.json | 9 - .../block/gray_fridge/gray_freezer_open.json | 9 - .../gray_fridge/gray_freezer_single.json | 9 - .../gray_fridge/gray_freezer_single_open.json | 9 - .../models/block/gray_fridge/gray_fridge.json | 9 - .../block/gray_fridge/gray_fridge_bottom.json | 9 - .../gray_fridge/gray_fridge_bottom_open.json | 9 - .../block/gray_fridge/gray_fridge_full.json | 9 - .../block/gray_fridge/gray_fridge_middle.json | 9 - .../gray_fridge_middle_freezer.json | 9 - .../gray_fridge_middle_freezer_open.json | 9 - .../gray_fridge/gray_fridge_middle_open.json | 9 - .../block/gray_fridge/gray_fridge_open.json | 9 - .../block/gray_fridge/gray_fridge_single.json | 9 - .../gray_fridge/gray_fridge_single_open.json | 9 - .../block/gray_fridge/gray_fridge_top.json | 9 - .../gray_fridge/gray_fridge_top_open.json | 9 - .../models/block/white_fridge/freezer.json | 135 + .../block/white_fridge/freezer_open.json | 304 ++ .../block/white_fridge/freezer_single.json | 181 ++ .../white_fridge/freezer_single_open.json | 381 +++ .../pfm/models/block/white_fridge/fridge.json | 199 ++ .../block/white_fridge/fridge_bottom.json | 118 + .../white_fridge/fridge_bottom_open.json | 355 +++ .../block/white_fridge/fridge_full.json | 220 ++ .../block/white_fridge/fridge_middle.json | 109 + .../white_fridge/fridge_middle_freezer.json | 224 ++ .../fridge_middle_freezer_open.json | 531 ++++ .../white_fridge/fridge_middle_open.json | 399 +++ .../block/white_fridge/fridge_open.json | 485 ++++ .../block/white_fridge/fridge_single.json | 181 ++ .../white_fridge/fridge_single_open.json | 415 +++ .../models/block/white_fridge/fridge_top.json | 118 + .../block/white_fridge/fridge_top_open.json | 425 +++ .../pfm/models/block/white_stove_open.json | 4 +- .../assets/pfm/models/item/gray_freezer.json | 2 +- .../assets/pfm/models/item/gray_fridge.json | 2 +- .../assets/pfm/models/item/white_freezer.json | 2 +- .../assets/pfm/models/item/white_fridge.json | 2 +- .../assets/pfm/textures/block/gray_fridge.png | Bin 0 -> 915 bytes .../pfm/textures/block/white_fridge.png | Bin 0 -> 872 bytes 85 files changed, 4991 insertions(+), 10297 deletions(-) delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/freezer.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/freezer_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/freezer_single.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/freezer_single_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_full.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_single.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_single_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_top.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/fridge/fridge_top_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_full.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top.json create mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_full.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single_open.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top.json delete mode 100644 common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/freezer.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_full.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single_open.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top.json create mode 100644 common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top_open.json create mode 100644 common/src/main/resources/assets/pfm/textures/block/gray_fridge.png create mode 100644 common/src/main/resources/assets/pfm/textures/block/white_fridge.png diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/FreezerBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/FreezerBlock.java index 68d5aa1d7..22c53647e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/FreezerBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/FreezerBlock.java @@ -106,10 +106,10 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { return this.getDefaultState().with(FACING, ctx.getPlayerFacing()); } - protected static final Map FREEZER = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, -16, 3,15.5, 16, 16),createCuboidShape(0.5, 5, 2,14.83, 16, 3.1),createCuboidShape(13, 5.19, 0.09,14, 15.19, 1.09),createCuboidShape(13, 5.19, 0.98,14, 6.19, 2.98),createCuboidShape(13, 14.19, 1.06,14, 15.19, 3.06)));}}; - protected static final Map FREEZER_SINGLE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.51, 0.131, 2.609,15.19, 1.1, 3.609),createCuboidShape(0.5, 1, 3,15.5, 16, 16),createCuboidShape(0.5, 0, 2.844,15.5, 1, 15.844),createCuboidShape(12.979, 3, 0.027,13.979, 14, 1.027),createCuboidShape(12.979, 3, 0.918,13.979, 4, 2.918),createCuboidShape(12.979, 13, 0.918,13.979, 14, 2.918),createCuboidShape(0.479, 1, 1.933,14.174, 16, 3.033),createCuboidShape(13.814, 1, 2.081,14.814, 16, 3.481)));}}; - protected static final Map FREEZER_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, -16, 2.8,15.5, 16, 16),createCuboidShape(0.5, 5, -11.29,1.5, 16, 3.05),createCuboidShape(-1.41, 5.19, -10.45,-0.41, 15.19, -9.45),createCuboidShape(-0.52, 5.19, -10.45,1.48, 6.19, -9.45),createCuboidShape(-0.44, 14.19, -10.45,1.26, 15.19, -9.45)));}}; - protected static final Map FREEZER_SINGLE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, 1, 3,15.5, 16, 16),createCuboidShape(0.5, 0, 2.844,15.5, 1, 15.844),createCuboidShape(-1.407, 3, -10.505,-0.407, 14, -9.505),createCuboidShape(-0.516, 3, -10.505,1.484, 4, -9.505),createCuboidShape(-0.516, 13, -10.505,1.484, 14, -9.505),createCuboidShape(0.5, 1, -10.7,1.6, 16, 2.995),createCuboidShape(0.647, 1, -11.34,2.047, 16, -10.34),createCuboidShape(0.688, 0.3, 2.612,15.116, 15.82, 4.013),createCuboidShape(1.4, 9.5, -10.7,4.4, 12.5, 2.3),createCuboidShape(1.4, 2, -10.7,4.4, 5, 2.3)));}}; + protected static final Map FREEZER = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 5, -0.5,13, 15, 1),createCuboidShape(1, 5, 1,15, 16, 2),createCuboidShape(1, -16, 2,15, 16, 16)));}}; + protected static final Map FREEZER_SINGLE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 4, -0.5,13, 15, 1),createCuboidShape(1, 1, 1,15, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FREEZER_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 5, -10,1, 15, -9),createCuboidShape(1, 5, -12,3, 16, 2),createCuboidShape(1, 5, 2,15, 16, 16),createCuboidShape(1, -16, 1,15, 5, 16)));}}; + protected static final Map FREEZER_SINGLE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 4, -10,1, 15, -9),createCuboidShape(1, 1, -12,3, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/FridgeBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/FridgeBlock.java index f0c5f13e6..4a0663f6a 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/FridgeBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/FridgeBlock.java @@ -152,19 +152,19 @@ public float getAmbientOcclusionLightLevel(BlockState state, BlockView world, Bl return 1.0f; } - protected static final Map FRIDGE_SINGLE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.51, 0.131, 2.609,14.49, 1.1, 3.609), createCuboidShape(0.5, 1, 3,15.5, 16, 16), createCuboidShape(0.5, 0, 2.844,15.5, 1, 15.844), createCuboidShape(12.979, 4, 0.027,13.979, 15, 1.027), createCuboidShape(12.979, 4, 0.918,13.979, 5, 2.918), createCuboidShape(12.979, 14, 0.918,13.979, 15, 2.918), createCuboidShape(0.479, 1, 1.933,14.174, 16, 3.033), createCuboidShape(13.814, 1, 2.081,14.814, 16, 3.481)));}}; - protected static final Map FRIDGE_TOP = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, 0, 3, 15.5, 16, 16), createCuboidShape(0.5, 0, 2, 14.2, 16, 3), createCuboidShape(13.84, -0.05, 2.15,14.84, 16, 3.55), createCuboidShape(13, -0.01, 0.09, 14, 15.19, 1.09), createCuboidShape(13, 14.19, 1.06, 14, 15.19, 3.06)));}}; - protected static final Map FRIDGE_MIDDLE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, 0, 3, 15.5, 16.2, 16), createCuboidShape(12.979, 0, 0.027,13.979, 16.2, 1.027), createCuboidShape(0.479, 0, 1.933,14.174, 16.2, 3.033), createCuboidShape(13.81385, 0, 2.08103,14.81385, 16.2, 3.48103)));}}; - protected static final Map FRIDGE_BOTTOM = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.51, 0.13, 2.61,14.49, 1.1, 3.61), createCuboidShape(0.48563, 1, 3,15.5, 16, 16), createCuboidShape(0.5, 0, 2.84,15.5, 1, 15.84), createCuboidShape(12.98, 4, 0.03,13.98, 16, 1.03), createCuboidShape(12.98, 4, 0.92,13.98, 5, 2.92), createCuboidShape(0.48, 1, 1.93,14.17, 16, 3.03), createCuboidShape(13.81, 1, 2.08,14.81, 16, 3.48)));}}; - protected static final Map FRIDGE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, 0, 3, 15.5, 32, 16), createCuboidShape(12.98, 4, 0.03,13.98, 20, 1.03),createCuboidShape(12.98, 4, 0.92,13.98, 5, 2.92),createCuboidShape(12.98, 18.98, 1,13.98, 19.98, 2.9),createCuboidShape(0.5, 1, 1.93,14.78, 19.98, 3.03)));}}; - protected static final Map FRIDGE_MIDDLE_FREEZER = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, 0, 3,15.5, 16, 16),createCuboidShape(12.979, 0, 0.027,13.979, 16, 1.027),createCuboidShape(12.979, 15.984, 0.027,13.979, 19.984, 1.027),createCuboidShape(12.979, 18.984, 0.996,13.979, 19.984, 2.896),createCuboidShape(0.479, 0, 1.933,14.174, 20, 3.033),createCuboidShape(13.814, 0, 2.081,14.814, 20, 3.481),createCuboidShape(0.487, 0, 2.62,15.123, 21, 4.013)));}}; - - protected static final Map FRIDGE_SINGLE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, 1, 3,15.5, 16, 16), createCuboidShape(0.5, 0, 2.844,15.5, 1, 15.844),createCuboidShape(-1.407, 4, -10.505,-0.407, 15, -9.505),createCuboidShape(-0.516, 4, -10.505,1.484, 5, -9.505),createCuboidShape(-0.516, 14, -10.505,1.484, 15, -9.505),createCuboidShape(0.5, 1, -10.7,1.6, 16, 3.019),createCuboidShape(0.647, 1, -11.34,2.047, 16, -10.34),createCuboidShape(1.688, 0.3, 2.612,15.116, 15.82, 4.013),createCuboidShape(1.4, 9.5, -10.7,4.4, 12.5, 2.3),createCuboidShape(1.4, 2, -10.7,4.4, 5, 2.3)));}}; - protected static final Map FRIDGE_TOP_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.425, 0, 3,15.495, 16, 16), createCuboidShape(1.4, 9.5, -10.7,4.4, 12.5, 2.3),createCuboidShape(1.4, 2, -10.7,4.4, 5, 2.3),createCuboidShape(0.426, 0, -10.633,1.426, 16, 3.067),createCuboidShape(0.773, 0, -11.476,1.773, 16, -10.076),createCuboidShape(-1.481, 0.188, -10.433,-0.481, 15.188, -9.433),createCuboidShape(-0.512, 14.188, -10.433,1.288, 15.188, -9.433),createCuboidShape(0.51, -0.037, 2.609,15.19, 15.931, 3.609)));}}; - protected static final Map FRIDGE_MIDDLE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.484, 0, 3,15.5, 16, 16),createCuboidShape(-1.43, 0, -10.505,-0.43, 16, -9.505),createCuboidShape(0.476, 0, -10.7,1.576, 16, 3.058),createCuboidShape(0.624, 0, -11.34,2.024, 16, -10.34),createCuboidShape(1.688, 0, 2.612,15.116, 16, 4.013),createCuboidShape(1.4, 9.5, -9.7,4.4, 12.5, 3.3),createCuboidShape(1.4, 2, -9.7,4.4, 5, 3.3)));}}; - protected static final Map FRIDGE_BOTTOM_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.51, 0.131, 2.609,15.19, 16.1, 3.609),createCuboidShape(0.5, 1, 3,15.5, 16, 16),createCuboidShape(0.5, 0, 2.844,15.5, 1, 15.844),createCuboidShape(-1.469, 4, -10.405,-0.469, 16, -9.405),createCuboidShape(-0.579, 4, -10.405,1.421, 5, -9.405),createCuboidShape(0.437, 1, -10.6,1.537, 16, 3.095),createCuboidShape(0.585, 1, -11.24,1.985, 16, -10.24),createCuboidShape(1.4, 9.5, -9.7,4.4, 12.5, 3.3),createCuboidShape(1.4, 2, -9.7,4.4, 5, 3.3)));}}; - protected static final Map FRIDGE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.5, 0, 3,15.5, 32, 16),createCuboidShape(-1.41, 4, -10.39,-0.41, 19.98, -9.39),createCuboidShape(-0.52, 4, -10.39,1.48, 5, -9.39),createCuboidShape(-0.45, 18.98, -10.39,1.45, 19.98, -9.39),createCuboidShape(0.5, 1, -11.59,1.48, 20, 3.11),createCuboidShape(0.75, 7.7, -10.42,3.75, 10.8, 2.98),createCuboidShape(0.75, 12.2, -10.42,3.75, 15.3, 2.98)));}}; - protected static final Map FRIDGE_MIDDLE_FREEZER_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-1.415, 0, -10.391,-0.415, 20, -9.391),createCuboidShape(-0.446, 18.984, -10.391,1.454, 19.984, -9.391),createCuboidShape(0.491, 0, -10.591,1.491, 20, 3.109),createCuboidShape(0.634, 0, -11.221,2.034, 20, -10.221),createCuboidShape(1.4, 9, -10.7,4.4, 12, 2.3),createCuboidShape(1.4, 2, -10.7,4.4, 5, 2.3),createCuboidShape(1.4, 15.5, -10.7,4.4, 18.5, 2.3),createCuboidShape(0.487, 0, 2.62,15.123, 21, 4.013),createCuboidShape(0.5, 0, 3,15.5, 16, 16)));}}; + protected static final Map FRIDGE_SINGLE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 3, -0.5,13, 14, 1), createCuboidShape(1, 1, 1,15, 16, 2), createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FRIDGE_TOP = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 0, -0.5, 13, 15, 1), createCuboidShape(1, 0, 1, 15, 16, 16)));}}; + protected static final Map FRIDGE_MIDDLE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 0, -0.5, 13, 16, 1), createCuboidShape(1, 0, 1,15, 16, 16)));}}; + protected static final Map FRIDGE_BOTTOM = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 4, -0.5,13, 16, 1), createCuboidShape(1, 1, 1,15, 16, 2), createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FRIDGE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 4, -0.5, 13, 20, 1), createCuboidShape(1, 1, 1,15, 21, 2),createCuboidShape(1, 0, 2,15, 32, 16)));}}; + protected static final Map FRIDGE_MIDDLE_FREEZER = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 0, -0.5,13, 20, 1),createCuboidShape(1, 0, 1,15, 21, 16),createCuboidShape(1, 21, 2,15, 32, 16)));}}; + + protected static final Map FRIDGE_SINGLE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 3, -10,1, 14, -9), createCuboidShape(1, 1, -12,3, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FRIDGE_TOP_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 0, -10,1, 15, -9), createCuboidShape(1, 0, -12,3, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FRIDGE_MIDDLE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 0, -10,1, 16, -9),createCuboidShape(1, 0, -12,3, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FRIDGE_BOTTOM_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 4, -10,1, 16, -9),createCuboidShape(1, 1, -12,3, 16, 2),createCuboidShape(1, 0, 3,15, 16, 16),createCuboidShape(1, 1, 2,15, 16, 3)));}}; + protected static final Map FRIDGE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 4, -10,1, 20, -9),createCuboidShape(1, 1, -12,3, 20, 2),createCuboidShape(1, 20, 1,15, 21, 2),createCuboidShape(1, 0, 2,15, 32, 16)));}}; + protected static final Map FRIDGE_MIDDLE_FREEZER_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 0, -10,1, 20, -9),createCuboidShape(1, 0, -12,3, 20, 2),createCuboidShape(1, 0, 2,15, 32, 16),createCuboidShape(1, 20, 1,15, 21, 2)));}}; @Override diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFreezerModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFreezerModel.java index cc7025369..5d3aa4e09 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFreezerModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFreezerModel.java @@ -23,10 +23,10 @@ public class UnbakedFreezerModel implements UnbakedModel { public static final List FREEZER_MODEL_PARTS_BASE = new ArrayList<>() { { - add("block/fridge/freezer_single"); - add("block/fridge/freezer"); - add("block/fridge/freezer_single_open"); - add("block/fridge/freezer_open"); + add("block/white_fridge/freezer_single"); + add("block/white_fridge/freezer"); + add("block/white_fridge/freezer_single_open"); + add("block/white_fridge/freezer_open"); } }; @@ -36,7 +36,7 @@ public class UnbakedFreezerModel implements UnbakedModel { add(new Identifier(PaladinFurnitureMod.MOD_ID, part)); } for (String part : FREEZER_MODEL_PARTS_BASE) { - add(new Identifier(PaladinFurnitureMod.MOD_ID, part.replaceAll("fridge", "gray_fridge").replaceAll("freezer", "gray_freezer"))); + add(new Identifier(PaladinFurnitureMod.MOD_ID, part.replaceAll("white", "gray"))); } } }; @@ -70,7 +70,7 @@ public BakedModel bake(ModelLoader loader, Function te Map bakedModels = new LinkedHashMap<>(); for (String modelPart : FREEZER_MODEL_PARTS_BASE) { if (modelId.getPath().contains("gray")) - modelPart = modelPart.replaceAll("fridge", "gray_fridge").replaceAll("freezer", "gray_freezer"); + modelPart = modelPart.replaceAll("white", "gray"); bakedModels.put(modelPart, loader.bake(new Identifier(PaladinFurnitureMod.MOD_ID, modelPart), rotationContainer)); } return getBakedModel(textureGetter.apply(frameTex), rotationContainer, bakedModels, bakedModels.keySet().stream().toList()); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFridgeModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFridgeModel.java index d2c501a16..b8805eae4 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFridgeModel.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/fridge/UnbakedFridgeModel.java @@ -24,18 +24,18 @@ public class UnbakedFridgeModel implements UnbakedModel { public static final List FRIDGE_MODEL_PARTS_BASE = new ArrayList<>() { { - add("block/fridge/fridge_single"); - add("block/fridge/fridge_top"); - add("block/fridge/fridge_middle"); - add("block/fridge/fridge_bottom"); - add("block/fridge/fridge"); - add("block/fridge/fridge_middle_freezer"); - add("block/fridge/fridge_single_open"); - add("block/fridge/fridge_top_open"); - add("block/fridge/fridge_middle_open"); - add("block/fridge/fridge_bottom_open"); - add("block/fridge/fridge_open"); - add("block/fridge/fridge_middle_freezer_open"); + add("block/white_fridge/fridge_single"); + add("block/white_fridge/fridge_top"); + add("block/white_fridge/fridge_middle"); + add("block/white_fridge/fridge_bottom"); + add("block/white_fridge/fridge"); + add("block/white_fridge/fridge_middle_freezer"); + add("block/white_fridge/fridge_single_open"); + add("block/white_fridge/fridge_top_open"); + add("block/white_fridge/fridge_middle_open"); + add("block/white_fridge/fridge_bottom_open"); + add("block/white_fridge/fridge_open"); + add("block/white_fridge/fridge_middle_freezer_open"); } }; @@ -45,7 +45,7 @@ public class UnbakedFridgeModel implements UnbakedModel { add(new Identifier(PaladinFurnitureMod.MOD_ID, part)); } for (String part : FRIDGE_MODEL_PARTS_BASE) { - add(new Identifier(PaladinFurnitureMod.MOD_ID, part.replaceAll("fridge", "gray_fridge"))); + add(new Identifier(PaladinFurnitureMod.MOD_ID, part.replaceAll("white", "gray"))); } } }; @@ -78,7 +78,7 @@ public BakedModel bake(ModelLoader loader, Function te Map bakedModels = new LinkedHashMap<>(); for (String modelPart : FRIDGE_MODEL_PARTS_BASE) { if (modelId.getPath().contains("gray")) - modelPart = modelPart.replaceAll("fridge", "gray_fridge"); + modelPart = modelPart.replaceAll("white", "gray"); bakedModels.put(modelPart, loader.bake(new Identifier(PaladinFurnitureMod.MOD_ID, modelPart), rotationContainer)); } return getBakedModel(textureGetter.apply(frameTex), rotationContainer, bakedModels, bakedModels.keySet().stream().toList()); diff --git a/common/src/main/resources/assets/pfm/blockstates/gray_freezer.json b/common/src/main/resources/assets/pfm/blockstates/gray_freezer.json index 7252a0a5d..a3bb91256 100644 --- a/common/src/main/resources/assets/pfm/blockstates/gray_freezer.json +++ b/common/src/main/resources/assets/pfm/blockstates/gray_freezer.json @@ -1,9 +1,9 @@ {"variants": { - "facing=north":{"model":"pfm:block/gray_freezer","y":180,"uvlock":"true"}, - "facing=east":{"model":"pfm:block/gray_freezer","y":270,"uvlock":"true"}, - "facing=south":{"model":"pfm:block/gray_freezer","y":0,"uvlock":"true"}, - "facing=west":{"model":"pfm:block/gray_freezer","y":90,"uvlock":"true"} + "facing=north":{"model":"pfm:block/gray_freezer","y":180,"uvlock":"false"}, + "facing=east":{"model":"pfm:block/gray_freezer","y":270,"uvlock":"false"}, + "facing=south":{"model":"pfm:block/gray_freezer","y":0,"uvlock":"false"}, + "facing=west":{"model":"pfm:block/gray_freezer","y":90,"uvlock":"false"} } } diff --git a/common/src/main/resources/assets/pfm/blockstates/gray_fridge.json b/common/src/main/resources/assets/pfm/blockstates/gray_fridge.json index 6c9d6b726..85040e452 100644 --- a/common/src/main/resources/assets/pfm/blockstates/gray_fridge.json +++ b/common/src/main/resources/assets/pfm/blockstates/gray_fridge.json @@ -1,9 +1,9 @@ {"variants": { - "facing=north":{"model":"pfm:block/gray_fridge","y":180,"uvlock":"true"}, - "facing=east":{"model":"pfm:block/gray_fridge","y":270,"uvlock":"true"}, - "facing=south":{"model":"pfm:block/gray_fridge","y":0,"uvlock":"true"}, - "facing=west":{"model":"pfm:block/gray_fridge","y":90,"uvlock":"true"} + "facing=north":{"model":"pfm:block/gray_fridge","y":180,"uvlock":"false"}, + "facing=east":{"model":"pfm:block/gray_fridge","y":270,"uvlock":"false"}, + "facing=south":{"model":"pfm:block/gray_fridge","y":0,"uvlock":"false"}, + "facing=west":{"model":"pfm:block/gray_fridge","y":90,"uvlock":"false"} } } diff --git a/common/src/main/resources/assets/pfm/blockstates/gray_stove.json b/common/src/main/resources/assets/pfm/blockstates/gray_stove.json index e89dda5f1..e99062445 100644 --- a/common/src/main/resources/assets/pfm/blockstates/gray_stove.json +++ b/common/src/main/resources/assets/pfm/blockstates/gray_stove.json @@ -1,10 +1,14 @@ {"variants": { - "facing=north":{"model":"pfm:block/gray_stove","y":0}, - "facing=east":{"model":"pfm:block/gray_stove","y":90}, - "facing=south":{"model":"pfm:block/gray_stove","y":180}, - "facing=west":{"model":"pfm:block/gray_stove","y":270} + "open=true,facing=north":{"model":"pfm:block/gray_stove_open","y":0}, + "open=true,facing=east":{"model":"pfm:block/gray_stove_open","y":90}, + "open=true,facing=south":{"model":"pfm:block/gray_stove_open","y":180}, + "open=true,facing=west":{"model":"pfm:block/gray_stove_open","y":270}, + "open=false,facing=north":{"model":"pfm:block/gray_stove","y":0}, + "open=false,facing=east":{"model":"pfm:block/gray_stove","y":90}, + "open=false,facing=south":{"model":"pfm:block/gray_stove","y":180}, + "open=false,facing=west":{"model":"pfm:block/gray_stove","y":270} } } diff --git a/common/src/main/resources/assets/pfm/blockstates/white_freezer.json b/common/src/main/resources/assets/pfm/blockstates/white_freezer.json index 2bb3c9526..6a3967d00 100644 --- a/common/src/main/resources/assets/pfm/blockstates/white_freezer.json +++ b/common/src/main/resources/assets/pfm/blockstates/white_freezer.json @@ -1,9 +1,9 @@ {"variants": { - "facing=north":{"model":"pfm:block/white_freezer","y":180,"uvlock":"true"}, - "facing=east":{"model":"pfm:block/white_freezer","y":270,"uvlock":"true"}, - "facing=south":{"model":"pfm:block/white_freezer","y":0,"uvlock":"true"}, - "facing=west":{"model":"pfm:block/white_freezer","y":90,"uvlock":"true"} + "facing=north":{"model":"pfm:block/white_freezer","y":180,"uvlock":"false"}, + "facing=east":{"model":"pfm:block/white_freezer","y":270,"uvlock":"false"}, + "facing=south":{"model":"pfm:block/white_freezer","y":0,"uvlock":"false"}, + "facing=west":{"model":"pfm:block/white_freezer","y":90,"uvlock":"false"} } } diff --git a/common/src/main/resources/assets/pfm/blockstates/white_fridge.json b/common/src/main/resources/assets/pfm/blockstates/white_fridge.json index 1c14234c2..be55ab59f 100644 --- a/common/src/main/resources/assets/pfm/blockstates/white_fridge.json +++ b/common/src/main/resources/assets/pfm/blockstates/white_fridge.json @@ -1,9 +1,9 @@ {"variants": { - "facing=north":{"model":"pfm:block/white_fridge","y":180,"uvlock":"true"}, - "facing=east":{"model":"pfm:block/white_fridge","y":270,"uvlock":"true"}, - "facing=south":{"model":"pfm:block/white_fridge","y":0,"uvlock":"true"}, - "facing=west":{"model":"pfm:block/white_fridge","y":90,"uvlock":"true"} + "facing=north":{"model":"pfm:block/white_fridge","y":180,"uvlock":"false"}, + "facing=east":{"model":"pfm:block/white_fridge","y":270,"uvlock":"false"}, + "facing=south":{"model":"pfm:block/white_fridge","y":0,"uvlock":"false"}, + "facing=west":{"model":"pfm:block/white_fridge","y":90,"uvlock":"false"} } } diff --git a/common/src/main/resources/assets/pfm/blockstates/white_stove.json b/common/src/main/resources/assets/pfm/blockstates/white_stove.json index a8d0f7779..8b5844f1f 100644 --- a/common/src/main/resources/assets/pfm/blockstates/white_stove.json +++ b/common/src/main/resources/assets/pfm/blockstates/white_stove.json @@ -1,10 +1,14 @@ {"variants": { - "facing=north":{"model":"pfm:block/white_stove", "y":0}, - "facing=east":{"model":"pfm:block/white_stove","y":90}, - "facing=south":{"model":"pfm:block/white_stove","y":180}, - "facing=west":{"model":"pfm:block/white_stove","y":270} + "open=true,facing=north":{"model":"pfm:block/white_stove_open","y":0}, + "open=true,facing=east":{"model":"pfm:block/white_stove_open","y":90}, + "open=true,facing=south":{"model":"pfm:block/white_stove_open","y":180}, + "open=true,facing=west":{"model":"pfm:block/white_stove_open","y":270}, + "open=false,facing=north":{"model":"pfm:block/white_stove","y":0}, + "open=false,facing=east":{"model":"pfm:block/white_stove","y":90}, + "open=false,facing=south":{"model":"pfm:block/white_stove","y":180}, + "open=false,facing=west":{"model":"pfm:block/white_stove","y":270} } } diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/freezer.json b/common/src/main/resources/assets/pfm/models/block/fridge/freezer.json deleted file mode 100644 index f23967350..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/freezer.json +++ /dev/null @@ -1,352 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "base", - "from": [14.5, 0, 3], - "to": [15.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, 0, 3], - "to": [1.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 0, 14.5], - "to": [15, 4, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, 4, 14.975], - "to": [15.5, 16, 15.99844], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 4, 3], - "to": [1.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.51563, 4.04688, 3], - "to": [14.51563, 4.98438, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.9375, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.9375, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 3], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 11.3, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 11.3, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 11.3], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 4, 3], - "to": [15.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.5, 5, 2], - "to": [14.2, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.6281, 5, 4.828], - "to": [24.6281, 16, 6.228], - "rotation": {"angle": 45, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [13, 5.1875, 0.09375], - "to": [14, 15.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13, 5.1875, 0.98438], - "to": [14, 6.1875, 2.98438], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13, 14.1875, 1.0625], - "to": [14, 15.1875, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.51, 14.9625, 2.60938], - "to": [14.49, 15.93125, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1, 0, 15.01563], - "to": [15, 15, 16.03907], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [0.51563, 0, 2.6125], - "to": [1.51563, 5, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 5, 2.6125], - "to": [1.51563, 15.92188, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - { - "name": "freezer_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - 8, - 9, - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [10, 11, 12] - } - ] - }, - 13 - ] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 14, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [] - } - ] - }, - 15, - 16 - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/freezer_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/freezer_open.json deleted file mode 100644 index 0cb7841d4..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/freezer_open.json +++ /dev/null @@ -1,966 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "3": "block/ice", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "base", - "from": [14.5, 0, 3], - "to": [15.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, 0, 3], - "to": [1.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 0, 14.5], - "to": [15, 4, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 4, 14.475], - "to": [15, 16, 15.475], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 4, 3], - "to": [1.375, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.875, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.875, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.875, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.875, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.34375, 4, 3], - "to": [1.44375, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.51563, 4, 3], - "to": [14.61563, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.42188, 15, 3], - "to": [14.51563, 16, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 1, 13.09375], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1, 13.09375], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13.09375], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13.09375], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.51563, 4.04688, 3], - "to": [14.51563, 4.98438, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.9375, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.9375, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [6.91562, 8.0625, 9.18438], - "to": [7.41562, 9.98438, 14.68438], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.92188, 5.5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 1.92188, 5.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.4, 8.0625, 9.21563], - "to": [1.9, 11, 14.21563], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.9375, 0.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.9375, 5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 2.9375, 0.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.9375, 5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 8.04688, 9.2], - "to": [6.91563, 9.98438, 9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.9375, 5.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.9375, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.9375, 5.5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.9375, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 8.0625, 13.96562], - "to": [6.91563, 9.98438, 14.46562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.92188, 5.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.92188, 5.5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.91562, 8.0625, 9.7], - "to": [6.91563, 8.40625, 14.2], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.34375, 5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.34375, 4.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.34375, 5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.34375, 4.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 4.5, 5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 4.5, 5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 9.94687, 9.2], - "to": [4.41563, 10.69375, 9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.74687, 3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.74687, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.74687, 3], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.74687, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 3], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 9.94687, 13.98125], - "to": [3.41563, 10.99375, 14.48125], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.04688, 2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.04688, 2], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [7.8375, 11.29062, 13.98125], - "to": [9.8375, 12.3375, 14.48125], - "rotation": {"angle": -45, "axis": "z", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.04688, 2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.04688, 2], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"} - } - }, - { - "from": [5.5, 8.45, 12.5], - "to": [6.5, 9.45, 13.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -16, 0]}, - "faces": { - "north": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "east": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "south": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "west": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "up": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "down": {"uv": [11, 7, 15, 11], "texture": "#3"} - } - }, - { - "from": [3.5, 8.45, 10.5], - "to": [4.5, 9.45, 11.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -16, 0]}, - "faces": { - "north": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "east": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "south": {"uv": [6, 9, 10, 13], "texture": "#3"}, - "west": {"uv": [10, 6, 14, 10], "texture": "#3"}, - "up": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "down": {"uv": [6, 6, 10, 10], "texture": "#3"} - } - }, - { - "from": [2.35937, 8.45, 9.82813], - "to": [3.35938, 9.45, 10.82813], - "rotation": {"angle": -22.5, "axis": "y", "origin": [2.85938, 8.95, 10.32813]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} - } - }, - { - "from": [2.7, 8.45, 12.6], - "to": [3.7, 9.45, 13.6], - "rotation": {"angle": 45, "axis": "y", "origin": [3.2, 8.95, 13.1]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} - } - }, - { - "from": [2.34645, 8.45, 11.39792], - "to": [3.34645, 9.45, 12.39792], - "rotation": {"angle": 22.5, "axis": "y", "origin": [2.84645, 8.95, 11.89792]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} - } - }, - { - "from": [4.5, 8.45, 11.5], - "to": [5.5, 9.45, 12.5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [6, 8.95, 13]}, - "faces": { - "north": {"uv": [11, 6, 15, 10], "texture": "#3"}, - "east": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "south": {"uv": [9, 8, 13, 12], "texture": "#3"}, - "west": {"uv": [12, 5, 16, 9], "texture": "#3"}, - "up": {"uv": [12, 5, 16, 9], "texture": "#3"}, - "down": {"uv": [10, 4, 14, 8], "texture": "#3"} - } - }, - { - "from": [4.74504, 8.93437, 11.65266], - "to": [5.74504, 9.93437, 12.65266], - "rotation": {"angle": -22.5, "axis": "z", "origin": [5.43254, 9.45, 12.15266]}, - "faces": { - "north": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "east": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "south": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "west": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "up": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "down": {"uv": [2, 7, 6, 11], "texture": "#3"} - } - }, - { - "from": [4.24504, 9.425, 9.85266], - "to": [5.24504, 10.425, 10.85266], - "rotation": {"angle": -22.5, "axis": "x", "origin": [5.43254, 9.45, 12.15266]}, - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#3"} - } - }, - { - "from": [2.78254, 9.00616, 11.81263], - "to": [3.78254, 10.00616, 12.81263], - "rotation": {"angle": 22.5, "axis": "y", "origin": [2.34504, 9.50616, 11.047]}, - "faces": { - "north": {"uv": [2, 8, 6, 12], "texture": "#3"}, - "east": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "south": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "west": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "up": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "down": {"uv": [1, 10, 5, 14], "texture": "#3"} - } - }, - { - "from": [2.46152, 9.28741, 10.02426], - "to": [3.46152, 10.28741, 11.02426], - "rotation": {"angle": -22.5, "axis": "y", "origin": [2.96152, 9.92803, 12.82113]}, - "faces": { - "north": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "east": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "south": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "west": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "up": {"uv": [4, 1, 8, 5], "texture": "#3"}, - "down": {"uv": [4, 6, 8, 10], "texture": "#3"} - } - }, - { - "from": [1.71152, 9.31866, 11.10238], - "to": [2.71152, 10.31866, 12.10238], - "rotation": {"angle": 22.5, "axis": "x", "origin": [2.96152, 9.92803, 12.82113]}, - "faces": { - "north": {"uv": [5, 5, 9, 9], "texture": "#3"}, - "east": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "south": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "west": {"uv": [4, 8, 8, 12], "texture": "#3"}, - "up": {"uv": [6, 8, 10, 12], "texture": "#3"}, - "down": {"uv": [5, 10, 9, 14], "texture": "#3"} - } - }, - { - "from": [2.46152, 9.42803, 12.32113], - "to": [3.46152, 10.42803, 13.32113], - "rotation": {"angle": -22.5, "axis": "z", "origin": [2.96152, 9.92803, 12.82113]}, - "faces": { - "north": {"uv": [6, 7, 10, 11], "texture": "#3"}, - "east": {"uv": [7, 10, 11, 14], "texture": "#3"}, - "south": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "west": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "up": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "down": {"uv": [10, 6, 14, 10], "texture": "#3"} - } - }, - { - "from": [3.73964, 9.00616, 12.67116], - "to": [4.73964, 10.00616, 13.67116], - "rotation": {"angle": -22.5, "axis": "y", "origin": [4.23964, 9.50616, 13.17116]}, - "faces": { - "north": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "east": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "south": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "west": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "up": {"uv": [5, 9, 9, 13], "texture": "#3"}, - "down": {"uv": [4, 6, 8, 10], "texture": "#3"} - } - }, - { - "from": [5.53651, 8.99053, 11.98366], - "to": [6.53651, 9.99053, 12.98366], - "rotation": {"angle": -22.5, "axis": "y", "origin": [4.23964, 9.50616, 13.17116]}, - "faces": { - "north": {"uv": [6, 9, 10, 13], "texture": "#3"}, - "east": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "south": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "west": {"uv": [8, 10, 12, 14], "texture": "#3"}, - "up": {"uv": [7, 7, 11, 11], "texture": "#3"}, - "down": {"uv": [4, 8, 8, 12], "texture": "#3"} - } - }, - { - "from": [4.4, 8.45, 11.4], - "to": [5.4, 9.45, 12.4], - "rotation": {"angle": -45, "axis": "y", "origin": [6, 8.95, 13]}, - "faces": { - "north": {"uv": [3, 8, 7, 12], "texture": "#3"}, - "east": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "south": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "west": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "up": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "down": {"uv": [8, 6, 12, 10], "texture": "#3"} - } - }, - { - "from": [4.925, 11.19375, 9.40625], - "to": [5.225, 11.49375, 13.40625], - "rotation": {"angle": 0, "axis": "y", "origin": [6.8, 8.775, 18.6]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "up": {"uv": [4, 2, 15.99, 15], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"} - } - }, - { - "from": [4.2447, 11.28735, 9.4125], - "to": [4.5447, 14.9086, 9.7125], - "rotation": {"angle": 22.5, "axis": "z", "origin": [4.3947, 13.09797, 9.5625]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"}, - "up": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "from": [6.08212, 11.87875, 13.1125], - "to": [6.38212, 15.5, 13.4125], - "rotation": {"angle": 22.5, "axis": "z", "origin": [6.8, 8.775, 20.1]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"}, - "up": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [3.1, 11.73438, 9.41562], - "to": [4.6, 12.35938, 13.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.625, 1.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.625, 4], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.625, 1.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.625, 4], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.5, 4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.5, 4], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 12.425, 12.41562], - "to": [5.24375, 12.725, 13.41562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 1.475], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 1.475], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.475, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.475, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 12.425, 9.41562], - "to": [5.25938, 12.7375, 10.41562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3125, 1.49062], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3125, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3125, 1.49062], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3125, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.49062, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.49062, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 12.425, 10.91562], - "to": [5.24375, 12.72187, 11.91562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.29688, 1.475], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.29688, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.29688, 1.475], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.29688, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.475, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.475, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 12.22188, 8.78125], - "to": [4.7, 14.15938, 9.74375], - "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.9375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.9375, 0.9625], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.9375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 1.9375, 0.9625], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 0.9625], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 0.9625], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [2.03438, 11.54688, 9.48437], - "to": [2.23438, 15.28438, 13.48437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 3.7375, 0.2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 3.7375, 4], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 3.7375, 0.2], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 3.7375, 4], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 0.2, 4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.2, 4], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 11.54688, 13.41562], - "to": [4.7, 15.08438, 14.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 3.5375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 3.5375, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 3.5375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 3.5375, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 13.53125, 13.36875], - "to": [4.7, 15.55625, 14.3375], - "rotation": {"angle": -22.5, "axis": "x", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.025, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.025, 0.96875], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 2.025, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.025, 0.96875], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 0.96875], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 0.96875], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 11.54688, 8.41562], - "to": [4.7, 13.98438, 9.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.4375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.4375, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 2.4375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.4375, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.6, 4, 3], - "to": [15.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.9, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.9, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.9, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.9, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.49927, 5, -10.65406], - "to": [1.49927, 16, 3.04594], - "rotation": {"angle": 0, "axis": "y", "origin": [0.87261, 10.35491, 2.37334]}, - "faces": { - "north": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.82066, 5, -7.10381], - "to": [11.22066, 16, -6.10381], - "rotation": {"angle": 45, "axis": "y", "origin": [0.87261, 10.35491, 2.37334]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [-1.40698, 5.1875, -10.45406], - "to": [-0.40698, 15.1875, -9.45406], - "rotation": {"angle": 0, "axis": "y", "origin": [0.87261, 10.35491, 2.37334]}, - "faces": { - "north": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.51636, 5.1875, -10.45406], - "to": [1.48364, 6.1875, -9.45406], - "rotation": {"angle": 0, "axis": "y", "origin": [0.87261, 10.35491, 2.37334]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.43823, 14.1875, -10.45406], - "to": [1.26177, 15.1875, -9.45406], - "rotation": {"angle": 0, "axis": "y", "origin": [0.87261, 10.35491, 2.37334]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.61, 4.03125, 2.61719], - "to": [13.69, 5, 3.9375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.41125, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.41125, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.41125, 1.35938], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.41125, 1.35938], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 0, 2.62031], - "to": [14.52344, 15.95313, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, -0.05937, 5.49063], - "to": [24.41406, 15.95313, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.61, 14.9625, 2.61719], - "to": [13.69, 15.93125, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14.03469, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 14.03469, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 14.03469, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 14.03469, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 0, 2.6125], - "to": [1.51563, 5, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 5, 2.6125], - "to": [1.51563, 15.92188, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1, 0, 15.01563], - "to": [15, 15, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.44531, 4, 14.975], - "to": [15.5, 16, 15.99844], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.24219, 7.2, 5], - "to": [14.5, 8.2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - { - "name": "ice_maker", - "origin": [4, 30, 13], - "color": 0, - "children": [ - { - "name": "bucket", - "origin": [4, 30, 13], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4, 17, 13], - "color": 0, - "children": [9, 10, 11, 12, 13, 14, 15, 16] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [17, 18, 19, 20, 21] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [22, 23, 24, 25, 26, 27, 28, 29, 30] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [31] - } - ] - }, - { - "name": "bracket", - "origin": [6.8, 16.775, 20.1], - "color": 0, - "children": [32, 33, 34] - }, - { - "name": "top", - "origin": [4, 30, 13], - "color": 0, - "children": [35, 36, 37, 38, 39, 40, 41, 42, 43] - } - ] - }, - 44, - { - "name": "freezer_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - 45, - 46, - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [47, 48, 49] - } - ] - }, - 50, - 51, - 52, - 53, - 54, - 55 - ] - } - ] - }, - 56, - 57, - 58 - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/freezer_single.json b/common/src/main/resources/assets/pfm/models/block/fridge/freezer_single.json deleted file mode 100644 index 2c8596193..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/freezer_single.json +++ /dev/null @@ -1,306 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 0.13125, 2.60938], - "to": [14.49, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 15], - "to": [15, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1.04688, 15.01563], - "to": [15, 15.96094, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 3, 0.02708], - "to": [13.97914, 14, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 3, 0.91771], - "to": [13.97914, 4, 2.91771], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 13, 0.91771], - "to": [13.97914, 14, 2.91771], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47914, 1, 1.93333], - "to": [14.17414, 16, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 3], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 1, 4.285], - "to": [10.93119, 16, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.14063, 5.45938], - "to": [24.40625, 15.125, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 15.89844, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 15.82031, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [30, -135, 0], - "translation": [0.5, -1.25, 0], - "scale": [0.41, 0.41, 0.41] - }, - "head": { - "translation": [0, -0.5, -1.5] - }, - "fixed": { - "translation": [0, -0.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 1, - 2, - 3, - 4, - 5, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [6, 7, 8] - }, - 9, - 10, - 11 - ] - }, - 12, - 13, - 14 - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/freezer_single_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/freezer_single_open.json deleted file mode 100644 index 4670c9473..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/freezer_single_open.json +++ /dev/null @@ -1,893 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "3": "block/ice", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 14.83125, 2.60938], - "to": [14.49, 15.8, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 3], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 0.2, 4], - "to": [14.5, 1.2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 3.7, 5], - "to": [14.5, 4.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 7.5, 5], - "to": [14.5, 8.5, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [6.91562, 8.0625, 9.18438], - "to": [7.41562, 9.98438, 14.68438], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.92188, 5.5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 1.92188, 5.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.4, 8.0625, 9.21563], - "to": [1.9, 11, 14.21563], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.9375, 0.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.9375, 5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 2.9375, 0.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.9375, 5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 8.04688, 9.2], - "to": [6.91563, 9.98438, 9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.9375, 5.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.9375, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.9375, 5.5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.9375, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 8.0625, 13.96562], - "to": [6.91563, 9.98438, 14.46562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.92188, 5.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.92188, 5.5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.91562, 8.0625, 9.7], - "to": [6.91563, 8.40625, 14.2], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.34375, 5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.34375, 4.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.34375, 5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.34375, 4.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 4.5, 5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 4.5, 5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 9.94687, 9.2], - "to": [4.41563, 10.69375, 9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.74687, 3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.74687, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.74687, 3], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.74687, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 3], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 9.94687, 13.98125], - "to": [3.41563, 10.99375, 14.48125], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.04688, 2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.04688, 2], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [7.8375, 11.29062, 13.98125], - "to": [9.8375, 12.3375, 14.48125], - "rotation": {"angle": -45, "axis": "z", "origin": [4, 17, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.04688, 2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.04688, 2], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.1, 11.73438, 9.41562], - "to": [4.6, 12.35938, 13.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.625, 1.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.625, 4], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.625, 1.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.625, 4], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.5, 4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.5, 4], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 12.425, 12.41562], - "to": [5.24375, 12.725, 13.41562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 1.475], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 1.475], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.475, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.475, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 12.425, 9.41562], - "to": [5.25938, 12.7375, 10.41562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3125, 1.49062], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3125, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3125, 1.49062], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3125, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.49062, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.49062, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 12.425, 10.91562], - "to": [5.24375, 12.72187, 11.91562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 14.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.29688, 1.475], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.29688, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.29688, 1.475], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.29688, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.475, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.475, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 12.22188, 8.78125], - "to": [4.7, 14.15938, 9.74375], - "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.9375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.9375, 0.9625], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.9375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 1.9375, 0.9625], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 0.9625], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 0.9625], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [2.03438, 11.54688, 9.48437], - "to": [2.23438, 15.28438, 13.48437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 3.7375, 0.2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 3.7375, 4], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 3.7375, 0.2], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 3.7375, 4], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 0.2, 4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.2, 4], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 11.54688, 13.41562], - "to": [4.7, 15.08438, 14.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 3.5375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 3.5375, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 3.5375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 3.5375, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 13.53125, 13.36875], - "to": [4.7, 15.55625, 14.3375], - "rotation": {"angle": -22.5, "axis": "x", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.025, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.025, 0.96875], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 2.025, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.025, 0.96875], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 0.96875], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 0.96875], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 11.54688, 8.41562], - "to": [4.7, 13.98438, 9.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.4375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.4375, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 2.4375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.4375, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 1], "texture": "#base"} - } - }, - { - "from": [4.925, 11.19375, 9.40625], - "to": [5.225, 11.49375, 13.40625], - "rotation": {"angle": 0, "axis": "y", "origin": [6.8, 8.775, 18.6]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "up": {"uv": [4, 2, 15.99, 15], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"} - } - }, - { - "from": [4.2447, 11.28735, 9.4125], - "to": [4.5447, 14.9086, 9.7125], - "rotation": {"angle": 22.5, "axis": "z", "origin": [4.3947, 13.09797, 9.5625]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"}, - "up": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "from": [6.08212, 11.87875, 13.1125], - "to": [6.38212, 15.5, 13.4125], - "rotation": {"angle": 22.5, "axis": "z", "origin": [6.8, 8.775, 20.1]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"}, - "up": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1, 1, 15], - "to": [15, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1.04688, 15.01563], - "to": [15, 15.96094, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-1.40667, 3, -10.50461], - "to": [-0.40667, 14, -9.50461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.51604, 3, -10.50461], - "to": [1.48396, 4, -9.50461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.51604, 13, -10.50461], - "to": [1.48396, 14, -9.50461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.49958, 1, -10.69961], - "to": [1.59958, 16, 2.99539], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.15175, 1, -6.88332], - "to": [10.55175, 16, -5.88332], - "rotation": {"angle": 45, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.25782, 5.45938], - "to": [24.40625, 15.825, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 15.89844, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 0.3, 2.6125], - "to": [14.51563, 15.82031, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 2, -10.7], - "to": [4.4, 3, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3, -10.7], - "to": [4.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, -10.7], - "to": [3.4, 5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, 1.3], - "to": [3.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "from": [4.5, 8.45, 11.5], - "to": [5.5, 9.45, 12.5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [6, 8.95, 13]}, - "faces": { - "north": {"uv": [11, 6, 15, 10], "texture": "#3"}, - "east": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "south": {"uv": [9, 8, 13, 12], "texture": "#3"}, - "west": {"uv": [12, 5, 16, 9], "texture": "#3"}, - "up": {"uv": [12, 5, 16, 9], "texture": "#3"}, - "down": {"uv": [10, 4, 14, 8], "texture": "#3"} - } - }, - { - "from": [4.74504, 8.93437, 11.65266], - "to": [5.74504, 9.93437, 12.65266], - "rotation": {"angle": -22.5, "axis": "z", "origin": [5.43254, 9.45, 12.15266]}, - "faces": { - "north": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "east": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "south": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "west": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "up": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "down": {"uv": [2, 7, 6, 11], "texture": "#3"} - } - }, - { - "from": [4.24504, 9.425, 9.85266], - "to": [5.24504, 10.425, 10.85266], - "rotation": {"angle": -22.5, "axis": "x", "origin": [5.43254, 9.45, 12.15266]}, - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#3"} - } - }, - { - "from": [2.78254, 9.00616, 11.81263], - "to": [3.78254, 10.00616, 12.81263], - "rotation": {"angle": 22.5, "axis": "y", "origin": [2.34504, 9.50616, 11.047]}, - "faces": { - "north": {"uv": [2, 8, 6, 12], "texture": "#3"}, - "east": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "south": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "west": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "up": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "down": {"uv": [1, 10, 5, 14], "texture": "#3"} - } - }, - { - "from": [2.46152, 9.28741, 10.02426], - "to": [3.46152, 10.28741, 11.02426], - "rotation": {"angle": -22.5, "axis": "y", "origin": [2.96152, 9.92803, 12.82113]}, - "faces": { - "north": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "east": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "south": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "west": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "up": {"uv": [4, 1, 8, 5], "texture": "#3"}, - "down": {"uv": [4, 6, 8, 10], "texture": "#3"} - } - }, - { - "from": [1.71152, 9.31866, 11.10238], - "to": [2.71152, 10.31866, 12.10238], - "rotation": {"angle": 22.5, "axis": "x", "origin": [2.96152, 9.92803, 12.82113]}, - "faces": { - "north": {"uv": [5, 5, 9, 9], "texture": "#3"}, - "east": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "south": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "west": {"uv": [4, 8, 8, 12], "texture": "#3"}, - "up": {"uv": [6, 8, 10, 12], "texture": "#3"}, - "down": {"uv": [5, 10, 9, 14], "texture": "#3"} - } - }, - { - "from": [2.46152, 9.42803, 12.32113], - "to": [3.46152, 10.42803, 13.32113], - "rotation": {"angle": -22.5, "axis": "z", "origin": [2.96152, 9.92803, 12.82113]}, - "faces": { - "north": {"uv": [6, 7, 10, 11], "texture": "#3"}, - "east": {"uv": [7, 10, 11, 14], "texture": "#3"}, - "south": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "west": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "up": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "down": {"uv": [10, 6, 14, 10], "texture": "#3"} - } - }, - { - "from": [3.73964, 9.00616, 12.67116], - "to": [4.73964, 10.00616, 13.67116], - "rotation": {"angle": -22.5, "axis": "y", "origin": [4.23964, 9.50616, 13.17116]}, - "faces": { - "north": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "east": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "south": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "west": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "up": {"uv": [5, 9, 9, 13], "texture": "#3"}, - "down": {"uv": [4, 6, 8, 10], "texture": "#3"} - } - }, - { - "from": [5.53651, 8.99053, 11.98366], - "to": [6.53651, 9.99053, 12.98366], - "rotation": {"angle": -22.5, "axis": "y", "origin": [4.23964, 9.50616, 13.17116]}, - "faces": { - "north": {"uv": [6, 9, 10, 13], "texture": "#3"}, - "east": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "south": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "west": {"uv": [8, 10, 12, 14], "texture": "#3"}, - "up": {"uv": [7, 7, 11, 11], "texture": "#3"}, - "down": {"uv": [4, 8, 8, 12], "texture": "#3"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [30, -135, 0], - "translation": [0.5, -1.25, 0], - "scale": [0.41, 0.41, 0.41] - }, - "head": { - "translation": [0, -0.5, -1.5] - }, - "fixed": { - "translation": [0, -0.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [1, 2, 3, 4] - }, - 5, - 6, - { - "name": "group", - "origin": [4, 17, 13], - "color": 0, - "children": [ - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - { - "name": "top", - "origin": [4, 30, 13], - "color": 0, - "children": [15, 16, 17, 18, 19, 20, 21, 22, 23] - }, - { - "name": "bracket", - "origin": [6.8, 16.775, 20.1], - "color": 0, - "children": [24, 25, 26] - } - ] - }, - 27, - 28, - 29, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [30, 31, 32] - }, - 33, - 34 - ] - }, - 35, - 36, - 37 - ] - } - ] - }, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [38, 39, 40, 41, 42, 43, 44, 45] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [46, 47, 48, 49, 50, 51, 52, 53, 54] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge.json deleted file mode 100644 index 95bc9d398..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge.json +++ /dev/null @@ -1,397 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 0.13125, 2.60938], - "to": [14.49, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1.04688, 15.01563], - "to": [15, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.02708], - "to": [13.97914, 16, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 15.98438, 0.02708], - "to": [13.97914, 19.98438, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.91771], - "to": [13.97914, 5, 2.91771], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 18.98438, 0.99583], - "to": [13.97914, 19.98438, 2.89583], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1.9, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1.9, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47914, 16, 1.93333], - "to": [14.17414, 20, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.47914, 1, 1.93333], - "to": [14.17414, 16, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 16, 4.285], - "to": [10.93119, 20, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 1, 4.285], - "to": [10.93119, 16, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.14063, 5.45938], - "to": [24.40625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.44906, 20, 2.62], - "to": [13.69, 21, 3.97937], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1.35938], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1.35938], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 16, 2.62031], - "to": [1.51563, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, 15.94063, 5.49063], - "to": [24.41406, 21, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 16, 2.62031], - "to": [14.52344, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 1, - 2, - 3, - 4, - 5, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [6, 7, 8, 9] - }, - 10, - 11, - 12, - 13 - ] - }, - 14, - 15, - 16, - 17, - 18, - 19, - 20 - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom.json deleted file mode 100644 index 565aa7fab..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom.json +++ /dev/null @@ -1,279 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 0.13125, 2.60938], - "to": [14.49, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1.04688, 15.01563], - "to": [15, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.02708], - "to": [13.97914, 16, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.91771], - "to": [13.97914, 5, 2.91771], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47914, 1, 1.93333], - "to": [14.17414, 16, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 1, 4.285], - "to": [10.93119, 16, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.14063, 5.45938], - "to": [24.40625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 1, - 2, - 3, - 4, - 5, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [6, 7] - }, - 8, - 9 - ] - }, - 10, - 11, - 12 - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom_open.json deleted file mode 100644 index 5e6ca0f91..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_bottom_open.json +++ /dev/null @@ -1,472 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 0.13125, 2.60938], - "to": [14.49, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1.04688, 15.01563], - "to": [15, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-1.46917, 4, -10.40461], - "to": [-0.46917, 16, -9.40461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.15789, 7.25, 0.75414]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.57854, 4, -10.40461], - "to": [1.42146, 5, -9.40461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.15789, 7.25, 0.75414]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.43708, 1, -10.59961], - "to": [1.53708, 16, 3.09539], - "rotation": {"angle": 0, "axis": "y", "origin": [0.15789, 7.25, 0.75414]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [8.38215, 1, -7.07622], - "to": [9.78215, 16, -6.07622], - "rotation": {"angle": 45, "axis": "y", "origin": [0.15789, 7.25, 0.75414]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.14063, 5.45938], - "to": [24.40625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.5, 0.2, 4], - "to": [14.5, 1.2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 4], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 3.7, 5], - "to": [14.5, 4.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 8.7, 5], - "to": [14.5, 9.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 9.5, -9.7], - "to": [4.4, 10.5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 10.5, -9.7], - "to": [4.4, 12.5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, -9.7], - "to": [3.4, 12.5, -8.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, 2.3], - "to": [3.4, 12.5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 2, -9.7], - "to": [4.4, 3, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3, -9.7], - "to": [4.4, 5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, -9.7], - "to": [3.4, 5, -8.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, 2.3], - "to": [3.4, 5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.71094, 1, 2.6125], - "to": [1.71094, 15.92188, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 1, - 2, - 3, - 4, - 5, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [6, 7] - }, - 8, - 9 - ] - }, - 10, - 11, - 12 - ] - } - ] - }, - 13, - 14, - 15, - 16, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [17, 18, 19, 20, 21, 22, 23, 24] - }, - 25 - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_full.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_full.json deleted file mode 100644 index 7bb1a6660..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_full.json +++ /dev/null @@ -1,2563 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "3": "block/ice", - "4": "pfm:block/fridge/icecream", - "5": "pfm:block/fridge/waffles", - "6": "pfm:block/fridge/machacream", - "7": "pfm:block/fridge/pizzabox", - "8": "block/glass", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "base", - "from": [14.5, 16, 3], - "to": [15.5, 20, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, 16, 3], - "to": [1.5, 20, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 16, 14.5], - "to": [15, 20, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 20, 15], - "to": [15, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 20, 14.475], - "to": [15, 32, 15.475], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 20, 3], - "to": [1.375, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.875, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.875, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.875, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.875, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.34375, 20, 3], - "to": [1.44375, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.51563, 20, 3], - "to": [14.61563, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.42188, 31, 3], - "to": [14.51563, 32, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 1, 13.09375], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1, 13.09375], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13.09375], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13.09375], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.51563, 20.04688, 3], - "to": [14.51563, 20.98438, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.9375, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.9375, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.51563, 24.04688, 7.5], - "to": [14.51563, 24.07813, 7.8], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 13], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 0.3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 13], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 0.3], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.51563, 24.04688, 11.2], - "to": [14.51563, 24.07813, 11.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 13], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 0.3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 13], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 0.3], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [11.2, 24.0625, 7.58437], - "to": [11.4, 24.09375, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [9.5, 24.05469, 7.58437], - "to": [9.7, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [10.4, 24.04688, 7.58437], - "to": [10.6, 24.07813, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [11.9, 24.04688, 7.58437], - "to": [12.1, 24.07813, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [13.5, 24.04688, 7.58437], - "to": [13.7, 24.07813, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [8.6, 24.04688, 7.58437], - "to": [8.8, 24.07813, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [7.7, 24.05469, 7.58437], - "to": [7.9, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [6.7, 24.05469, 7.58437], - "to": [6.9, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [4.7, 24.05469, 7.58437], - "to": [4.9, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [2.7, 24.05469, 7.58437], - "to": [2.9, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [5.8, 24.05469, 7.58437], - "to": [6, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [3.8, 24.05469, 7.58437], - "to": [4, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.8, 24.05469, 7.58437], - "to": [2, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [14.2, 24.05469, 7.58437], - "to": [14.4, 24.08594, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [12.8, 24.04688, 7.58437], - "to": [13, 24.07813, 14.18437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 6.6], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 0.2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 6.6], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.2, 6.6], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.2, 6.6], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.51563, 24.04688, 14.1], - "to": [14.51563, 24.07813, 14.4], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.03125, 13], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 0.03125, 0.3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 0.03125, 13], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 0.03125, 0.3], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.4, 24.0625, 9.21563], - "to": [1.9, 27, 14.21563], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.9375, 0.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.9375, 5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 2.9375, 0.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.9375, 5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 24.04688, 9.2], - "to": [6.91563, 25.98438, 9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.9375, 5.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.9375, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.9375, 5.5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.9375, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 24.0625, 13.96562], - "to": [6.91563, 25.98438, 14.46562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.92188, 5.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.92188, 5.5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.91562, 24.0625, 9.7], - "to": [6.91563, 24.40625, 14.2], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.34375, 5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.34375, 4.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.34375, 5], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.34375, 4.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 4.5, 5], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 4.5, 5], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 25.94688, 9.2], - "to": [4.41563, 26.69375, 9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.74687, 3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.74687, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.74687, 3], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.74687, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 3], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.41562, 25.94688, 13.98125], - "to": [3.41563, 26.99375, 14.48125], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.04688, 2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.04688, 2], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [7.8375, 27.29063, 13.98125], - "to": [9.8375, 28.3375, 14.48125], - "rotation": {"angle": -45, "axis": "z", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.04688, 2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.04688, 2], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 1.04688, 0.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 2], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [6.91562, 24.0625, 9.18438], - "to": [7.41562, 25.98438, 14.68438], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 33, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.92188, 5.5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 1.92188, 0.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 1.92188, 5.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.5, 5.5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.5, 5.5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [8.71562, 20.93125, 9.5125], - "to": [14.21562, 22.81563, 12.18438], - "rotation": {"angle": 22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [1, 0, 16, 5], "texture": "#5"}, - "east": {"uv": [8.5, 7, 16, 15.5], "rotation": 90, "texture": "#5"}, - "south": {"uv": [7.5, 0, 10, 6.5], "rotation": 270, "texture": "#5"}, - "west": {"uv": [8.5, 7, 16, 15.5], "rotation": 90, "texture": "#5"}, - "up": {"uv": [1, 0, 16, 5.5], "texture": "#5"}, - "down": {"uv": [9.21562, 2.61562, 14.71562, 6.2875], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "bulk", - "from": [2.09062, 20.93125, 7.5125], - "to": [7.59062, 21.81563, 13.0125], - "rotation": {"angle": -22.5, "axis": "y", "origin": [4.84062, 21.37344, 10.2625]}, - "faces": { - "north": {"uv": [6, 0, 16, 3], "texture": "#7"}, - "east": {"uv": [6, 0, 16, 3], "texture": "#7"}, - "south": {"uv": [6, 0, 16, 3], "rotation": 180, "texture": "#7"}, - "west": {"uv": [6, 0, 16, 3], "texture": "#7"}, - "up": {"uv": [3.5, 7, 12.5, 16], "texture": "#7"}, - "down": {"uv": [3.5, 7, 12.5, 16], "rotation": 180, "texture": "#7"} - } - }, - { - "name": "bulk", - "from": [2.09062, 21.73125, 7.5125], - "to": [7.59062, 22.61563, 13.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [4.84062, 21.37344, 10.2625]}, - "faces": { - "north": {"uv": [6, 0, 16, 3], "texture": "#7"}, - "east": {"uv": [6, 0, 16, 3], "texture": "#7"}, - "south": {"uv": [6, 0, 16, 3], "rotation": 180, "texture": "#7"}, - "west": {"uv": [6, 0, 16, 3], "texture": "#7"}, - "up": {"uv": [3.5, 7, 12.5, 16], "texture": "#7"}, - "down": {"uv": [3.5, 7, 12.5, 16], "rotation": 180, "texture": "#7"} - } - }, - { - "name": "bulk", - "from": [10.61562, 27.05, 10.85313], - "to": [13.54062, 27.35, 13.28438], - "rotation": {"angle": 45, "axis": "y", "origin": [12.16562, 25.0234, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 2.925], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 2.43125], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 2.925], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 2.43125], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 2.925, 2.43125], "texture": "#base"}, - "down": {"uv": [0, 0, 2.925, 2.43125], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [10.925, 27.05, 10.74688], - "to": [13.47187, 27.35, 12.64688], - "rotation": {"angle": 45, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 2.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 1.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 2.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 1.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 2.54688, 1.9], "texture": "#base"}, - "down": {"uv": [0, 0, 2.54688, 1.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [10.70625, 27.05, 10.74688], - "to": [13.25312, 27.35, 12.64688], - "rotation": {"angle": 45, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 2.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 1.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 2.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 1.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 2.54688, 1.9], "texture": "#base"}, - "down": {"uv": [0, 0, 2.54688, 1.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [10.78437, 27.05, 10.68438], - "to": [13.33125, 27.35, 13.58438], - "rotation": {"angle": 45, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 2.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 2.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 2.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 2.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 2.54688, 2.9], "texture": "#base"}, - "down": {"uv": [0, 0, 2.54688, 2.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [10.69062, 24.43125, 10.86875], - "to": [13.47187, 27.31563, 13.38438], - "rotation": {"angle": 45, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [10, 8.5, 8.5, 13.5], "texture": "#4"}, - "east": {"uv": [10.5, 9.5, 9.5, 14.5], "texture": "#4"}, - "south": {"uv": [3.33125, 0, 0, 2.5], "rotation": 270, "texture": "#4"}, - "west": {"uv": [3.33125, 0, 0, 2.5], "rotation": 270, "texture": "#4"}, - "up": {"uv": [10.5, 2.5, 1, 11.5], "rotation": 180, "texture": "#4"}, - "down": {"uv": [2.5, 0, 0, 2.5], "rotation": 180, "texture": "#4"} - } - }, - { - "name": "bulk", - "from": [10.81562, 24.43125, 10.7125], - "to": [13.31562, 27.31563, 13.38438], - "rotation": {"angle": 45, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 11, 13], "texture": "#4"}, - "east": {"uv": [0, 9.5, 3, 14.5], "texture": "#4"}, - "south": {"uv": [0, 0, 3.33125, 2.5], "rotation": 270, "texture": "#4"}, - "west": {"uv": [0, 0, 3.33125, 2.5], "rotation": 270, "texture": "#4"}, - "up": {"uv": [1, 2.5, 10.5, 11.5], "rotation": 180, "texture": "#4"}, - "down": {"uv": [0, 0, 2.5, 2.5], "rotation": 180, "texture": "#4"} - } - }, - { - "name": "bulk", - "from": [10.70625, 24.03125, 10.8375], - "to": [13.39375, 27.3625, 13.38438], - "rotation": {"angle": 45, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 11, 14.5], "texture": "#4"}, - "east": {"uv": [0, 11, 1.5, 14], "texture": "#4"}, - "south": {"uv": [0, 0, 3.33125, 2.5], "rotation": 270, "texture": "#4"}, - "west": {"uv": [0, 0, 3.33125, 2.5], "rotation": 270, "texture": "#4"}, - "up": {"uv": [1, 2.5, 10.5, 11.5], "rotation": 180, "texture": "#4"}, - "down": {"uv": [0, 0, 2.5, 2.5], "rotation": 180, "texture": "#4"} - } - }, - { - "name": "bulk", - "from": [9.19375, 26.19063, 11.85313], - "to": [11.11875, 26.34688, 13.28438], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.0234, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.15625, 1.925], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.15625, 1.43125], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.15625, 1.925], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.15625, 1.43125], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 1.925, 1.43125], "texture": "#base"}, - "down": {"uv": [0, 0, 1.925, 1.43125], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [9.3625, 26.19063, 11.68438], - "to": [10.90937, 26.34688, 13.58438], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.15625, 1.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.15625, 1.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 1.54688, 1.9], "texture": "#base"}, - "down": {"uv": [0, 0, 1.54688, 1.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [9.4875, 26.19063, 11.79375], - "to": [11.03437, 26.34688, 12.69375], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.15625, 0.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.15625, 0.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 1.54688, 0.9], "texture": "#base"}, - "down": {"uv": [0, 0, 1.54688, 0.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [9.28437, 26.19063, 11.79375], - "to": [10.83125, 26.34688, 12.69375], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.15625, 0.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.15625, 0.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 1.54688, 0.9], "texture": "#base"}, - "down": {"uv": [0, 0, 1.54688, 0.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [9.28437, 26.19063, 12.54375], - "to": [10.83125, 26.34688, 13.44375], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.15625, 0.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.15625, 0.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 1.54688, 0.9], "texture": "#base"}, - "down": {"uv": [0, 0, 1.54688, 0.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [9.47187, 26.19063, 12.54375], - "to": [11.01875, 26.34688, 13.44375], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.15625, 0.9], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.15625, 1.54688], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.15625, 0.9], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 1.54688, 0.9], "texture": "#base"}, - "down": {"uv": [0, 0, 1.54688, 0.9], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [10.26875, 24.43125, 11.86875], - "to": [11.05, 26.31563, 13.38438], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [10, 9, 8.5, 13.5], "texture": "#6"}, - "east": {"uv": [10.5, 9.5, 9.5, 14.5], "texture": "#6"}, - "south": {"uv": [3.33125, 0, 0, 2.5], "rotation": 270, "texture": "#6"}, - "west": {"uv": [3.33125, 0, 0, 2.5], "rotation": 270, "texture": "#6"}, - "up": {"uv": [10.5, 2.5, 1, 11.5], "rotation": 180, "texture": "#6"}, - "down": {"uv": [2.5, 0, 0, 2.5], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "bulk", - "from": [9.26875, 24.43125, 11.86875], - "to": [10.05, 26.31563, 13.38438], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [11.5, 8.5, 10, 13], "texture": "#6"}, - "east": {"uv": [10.5, 9.5, 9.5, 14.5], "texture": "#6"}, - "south": {"uv": [3.33125, 0, 0, 2.5], "rotation": 270, "texture": "#6"}, - "west": {"uv": [5, 10.5, 0, 14], "rotation": 90, "texture": "#6"}, - "up": {"uv": [10.5, 2.5, 1, 11.5], "rotation": 180, "texture": "#6"}, - "down": {"uv": [2.5, 0, 0, 2.5], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "bulk", - "from": [9.39375, 24.43125, 11.7125], - "to": [10.89375, 26.31563, 13.38438], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 0, 11, 13], "texture": "#6"}, - "east": {"uv": [0, 9.5, 3, 14.5], "texture": "#6"}, - "south": {"uv": [0, 0, 3.33125, 2.5], "rotation": 270, "texture": "#6"}, - "west": {"uv": [0, 0, 3.33125, 2.5], "rotation": 270, "texture": "#6"}, - "up": {"uv": [1, 2.5, 10.5, 11.5], "rotation": 180, "texture": "#6"}, - "down": {"uv": [0, 0, 2.5, 2.5], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "bulk", - "from": [9.33125, 24.03125, 11.82188], - "to": [10.9875, 26.3625, 13.38438], - "rotation": {"angle": -22.5, "axis": "y", "origin": [12.16562, 25.02344, 10.68438]}, - "faces": { - "north": {"uv": [0, 4, 11.5, 14], "texture": "#6"}, - "east": {"uv": [0, 11, 1.5, 14], "texture": "#6"}, - "south": {"uv": [0, 0, 3.33125, 2.5], "rotation": 270, "texture": "#6"}, - "west": {"uv": [0, 12, 3.33125, 14.5], "texture": "#6"}, - "up": {"uv": [1, 2.5, 10.5, 11.5], "rotation": 180, "texture": "#6"}, - "down": {"uv": [0, 0, 2.5, 2.5], "rotation": 180, "texture": "#6"} - } - }, - { - "from": [5.5, 24.45, 12.5], - "to": [6.5, 25.45, 13.5], - "faces": { - "north": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "east": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "south": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "west": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "up": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "down": {"uv": [11, 7, 15, 11], "texture": "#3"} - } - }, - { - "from": [3.5, 24.45, 10.5], - "to": [4.5, 25.45, 11.5], - "faces": { - "north": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "east": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "south": {"uv": [6, 9, 10, 13], "texture": "#3"}, - "west": {"uv": [10, 6, 14, 10], "texture": "#3"}, - "up": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "down": {"uv": [6, 6, 10, 10], "texture": "#3"} - } - }, - { - "from": [2.35937, 24.45, 9.82813], - "to": [3.35938, 25.45, 10.82813], - "rotation": {"angle": -22.5, "axis": "y", "origin": [2.85938, 24.95, 10.32813]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} - } - }, - { - "from": [2.7, 24.45, 12.6], - "to": [3.7, 25.45, 13.6], - "rotation": {"angle": 45, "axis": "y", "origin": [3.2, 24.95, 13.1]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} - } - }, - { - "from": [2.34645, 24.45, 11.39792], - "to": [3.34645, 25.45, 12.39792], - "rotation": {"angle": 22.5, "axis": "y", "origin": [2.84645, 24.95, 11.89792]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} - } - }, - { - "from": [4.5, 24.45, 11.5], - "to": [5.5, 25.45, 12.5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [6, 24.95, 13]}, - "faces": { - "north": {"uv": [11, 6, 15, 10], "texture": "#3"}, - "east": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "south": {"uv": [9, 8, 13, 12], "texture": "#3"}, - "west": {"uv": [12, 5, 16, 9], "texture": "#3"}, - "up": {"uv": [12, 5, 16, 9], "texture": "#3"}, - "down": {"uv": [10, 4, 14, 8], "texture": "#3"} - } - }, - { - "from": [4.74504, 24.93437, 11.65266], - "to": [5.74504, 25.93437, 12.65266], - "rotation": {"angle": -22.5, "axis": "z", "origin": [5.43254, 25.45, 12.15266]}, - "faces": { - "north": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "east": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "south": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "west": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "up": {"uv": [2, 7, 6, 11], "texture": "#3"}, - "down": {"uv": [2, 7, 6, 11], "texture": "#3"} - } - }, - { - "from": [4.24504, 25.425, 9.85266], - "to": [5.24504, 26.425, 10.85266], - "rotation": {"angle": -22.5, "axis": "x", "origin": [5.43254, 25.45, 12.15266]}, - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#3"} - } - }, - { - "from": [2.78254, 25.00616, 11.81263], - "to": [3.78254, 26.00616, 12.81263], - "rotation": {"angle": 22.5, "axis": "y", "origin": [2.34504, 25.50616, 11.047]}, - "faces": { - "north": {"uv": [2, 8, 6, 12], "texture": "#3"}, - "east": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "south": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "west": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "up": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "down": {"uv": [1, 10, 5, 14], "texture": "#3"} - } - }, - { - "from": [2.46152, 25.28741, 10.02426], - "to": [3.46152, 26.28741, 11.02426], - "rotation": {"angle": -22.5, "axis": "y", "origin": [2.96152, 25.92803, 12.82113]}, - "faces": { - "north": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "east": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "south": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "west": {"uv": [1, 3, 5, 7], "texture": "#3"}, - "up": {"uv": [4, 1, 8, 5], "texture": "#3"}, - "down": {"uv": [4, 6, 8, 10], "texture": "#3"} - } - }, - { - "from": [1.71152, 25.31866, 11.10238], - "to": [2.71152, 26.31866, 12.10238], - "rotation": {"angle": 22.5, "axis": "x", "origin": [2.96152, 25.92803, 12.82113]}, - "faces": { - "north": {"uv": [5, 5, 9, 9], "texture": "#3"}, - "east": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "south": {"uv": [1, 7, 5, 11], "texture": "#3"}, - "west": {"uv": [4, 8, 8, 12], "texture": "#3"}, - "up": {"uv": [6, 8, 10, 12], "texture": "#3"}, - "down": {"uv": [5, 10, 9, 14], "texture": "#3"} - } - }, - { - "from": [2.46152, 25.42803, 12.32113], - "to": [3.46152, 26.42803, 13.32113], - "rotation": {"angle": -22.5, "axis": "z", "origin": [2.96152, 25.92803, 12.82113]}, - "faces": { - "north": {"uv": [6, 7, 10, 11], "texture": "#3"}, - "east": {"uv": [7, 10, 11, 14], "texture": "#3"}, - "south": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "west": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "up": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "down": {"uv": [10, 6, 14, 10], "texture": "#3"} - } - }, - { - "from": [3.73964, 25.00616, 12.67116], - "to": [4.73964, 26.00616, 13.67116], - "rotation": {"angle": -22.5, "axis": "y", "origin": [4.23964, 25.50616, 13.17116]}, - "faces": { - "north": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "east": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "south": {"uv": [8, 7, 12, 11], "texture": "#3"}, - "west": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "up": {"uv": [5, 9, 9, 13], "texture": "#3"}, - "down": {"uv": [4, 6, 8, 10], "texture": "#3"} - } - }, - { - "from": [5.53651, 24.99053, 11.98366], - "to": [6.53651, 25.99053, 12.98366], - "rotation": {"angle": -22.5, "axis": "y", "origin": [4.23964, 25.50616, 13.17116]}, - "faces": { - "north": {"uv": [6, 9, 10, 13], "texture": "#3"}, - "east": {"uv": [11, 7, 15, 11], "texture": "#3"}, - "south": {"uv": [9, 9, 13, 13], "texture": "#3"}, - "west": {"uv": [8, 10, 12, 14], "texture": "#3"}, - "up": {"uv": [7, 7, 11, 11], "texture": "#3"}, - "down": {"uv": [4, 8, 8, 12], "texture": "#3"} - } - }, - { - "from": [4.4, 24.45, 11.4], - "to": [5.4, 25.45, 12.4], - "rotation": {"angle": -45, "axis": "y", "origin": [6, 24.95, 13]}, - "faces": { - "north": {"uv": [3, 8, 7, 12], "texture": "#3"}, - "east": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "south": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "west": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "up": {"uv": [7, 6, 11, 10], "texture": "#3"}, - "down": {"uv": [8, 6, 12, 10], "texture": "#3"} - } - }, - { - "from": [4.925, 27.19375, 9.40625], - "to": [5.225, 27.49375, 13.40625], - "rotation": {"angle": 0, "axis": "y", "origin": [6.8, 24.775, 18.6]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#legs"}, - "up": {"uv": [4, 2, 15.99, 15], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"} - } - }, - { - "from": [4.2447, 27.28735, 9.4125], - "to": [4.5447, 30.9086, 9.7125], - "rotation": {"angle": 22.5, "axis": "z", "origin": [4.3947, 29.09797, 9.5625]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"}, - "up": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "from": [6.08212, 27.87875, 13.1125], - "to": [6.38212, 31.5, 13.4125], - "rotation": {"angle": 22.5, "axis": "z", "origin": [6.8, 24.775, 20.1]}, - "faces": { - "north": {"uv": [2, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [4, 2, 15.99, 15], "texture": "#legs"}, - "south": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#legs"}, - "up": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [2, 0, 14, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [3.1, 27.73438, 9.41562], - "to": [4.6, 28.35938, 13.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.625, 1.5], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.625, 4], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.625, 1.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.625, 4], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.5, 4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.5, 4], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 28.425, 12.41562], - "to": [5.24375, 28.725, 13.41562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 30.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 1.475], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 1.475], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.475, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.475, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 28.425, 9.41562], - "to": [5.25938, 28.7375, 10.41562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 30.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3125, 1.49062], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3125, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3125, 1.49062], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3125, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.49062, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.49062, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [3.76875, 28.425, 10.91562], - "to": [5.24375, 28.72187, 11.91562], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4, 30.2, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.29688, 1.475], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.29688, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.29688, 1.475], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.29688, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 1.475, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1.475, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 28.22188, 8.78125], - "to": [4.7, 30.15938, 9.74375], - "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 1.9375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 1.9375, 0.9625], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 1.9375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 1.9375, 0.9625], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 0.9625], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 0.9625], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [2.03438, 27.54688, 9.48437], - "to": [2.23438, 31.28438, 13.48437], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 3.7375, 0.2], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 3.7375, 4], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 3.7375, 0.2], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 3.7375, 4], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 0.2, 4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.2, 4], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 27.54688, 13.41562], - "to": [4.7, 31.08438, 14.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 3.5375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 3.5375, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 3.5375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 3.5375, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 29.53125, 13.36875], - "to": [4.7, 31.55625, 14.3375], - "rotation": {"angle": -22.5, "axis": "x", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.025, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.025, 0.96875], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 2.025, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.025, 0.96875], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 0.96875], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 0.96875], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.1, 27.54688, 8.41562], - "to": [4.7, 29.98438, 9.41562], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 2.4375, 3.6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 2.4375, 1], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 2.4375, 3.6], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 2.4375, 1], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 3.6, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 3.6, 1], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.6, 20, 3], - "to": [15.5, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.9, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0.9, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0.9, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.9, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.5, 21, 2], - "to": [14.2, 32, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.6281, 21, 4.828], - "to": [24.6281, 32, 6.228], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [13, 21.1875, 0.09375], - "to": [14, 31.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13, 21.1875, 0.98438], - "to": [14, 22.1875, 2.98438], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13, 30.1875, 1.0625], - "to": [14, 31.1875, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51, 20.03125, 2.57813], - "to": [14.49, 21, 3.9375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1.35938], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1.35938], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51, 30.9625, 2.60938], - "to": [14.49, 31.93125, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51, 0.13125, 2.60938], - "to": [14.49, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.51563, 15.74688, 4.7], - "to": [14.51563, 16.04688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.17813, 15.64688, 4.85], - "to": [14.47813, 16.04688, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8.01563, 13.89688, 8.85]}, - "faces": { - "north": {"uv": [0, 0, 0.4, 0.3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.4, 9.5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.4, 0.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.4, 9.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 9.5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 9.5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.59062, 15.64688, 4.85], - "to": [1.99063, 16.04688, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8.01563, 13.89688, 8.85]}, - "faces": { - "north": {"uv": [0, 0, 0.4, 0.4], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.4, 9.5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.4, 0.4], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.4, 9.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.4, 9.5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.4, 9.5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [8.09062, 15.74688, 4.85], - "to": [14.79063, 15.94688, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8.01563, 13.89688, 8.85]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [0, 0, 0.2, 9.5], "rotation": 90, "texture": "#8"}, - "south": {"uv": [0, 0, 15, 0], "rotation": 270, "texture": "#8"}, - "west": {"uv": [8, 4, 8.2, 13.5], "rotation": 270, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.49062, 15.74688, 4.85], - "to": [8.09062, 15.94688, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [5.14063, 13.84688, 9.6]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.51563, 4.24688, 4.7], - "to": [14.51563, 4.34688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.1, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.1, 0.3], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.1, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.1, 0.3], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [7.89063, 1.09688, 4.8], - "to": [11.19063, 4.19688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.29062, 1.09688, 4.8], - "to": [4.59062, 4.19688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [11.19063, 1.09688, 4.8], - "to": [14.69063, 4.19688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [0, 0, 15, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [4.59063, 1.09688, 4.8], - "to": [7.89063, 4.19688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.99063, 4.15, 4.85], - "to": [14.69063, 4.35, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.29062, 4.15, 4.85], - "to": [7.99063, 4.35, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.29062, 1.15, 4.85], - "to": [7.99063, 1.35, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.99063, 1.15, 4.85], - "to": [14.69063, 1.35, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.99063, 4.64375, 4.85], - "to": [14.69063, 4.84375, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [11.19063, 4.59063, 4.8], - "to": [14.69063, 7.69063, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [0, 0, 15, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [4.59063, 4.59063, 4.8], - "to": [7.89063, 7.69063, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.99063, 7.64375, 4.85], - "to": [14.69063, 7.84375, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [0, 0, 15, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.29062, 7.64375, 4.85], - "to": [7.99063, 7.84375, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.29062, 4.64375, 4.85], - "to": [7.99063, 4.84375, 14.75], - "rotation": {"angle": 0, "axis": "y", "origin": [7.91563, 2.64688, 4.9]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.51563, 7.64688, 4.7], - "to": [14.51563, 7.84688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.2, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.29062, 4.59063, 4.8], - "to": [4.59062, 7.69063, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.89063, 4.59063, 4.8], - "to": [11.19063, 7.69063, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4.79062, 1.84688, 9.6]}, - "faces": { - "north": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.51563, 11.24688, 4.7], - "to": [14.51563, 11.54688, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.17813, 11.14688, 4.85], - "to": [14.47813, 11.54688, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8.01563, 13.89688, 8.85]}, - "faces": { - "north": {"uv": [0, 0, 0.4, 0.3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.4, 9.5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.4, 0.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.4, 9.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 9.5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 9.5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.49062, 11.14688, 4.85], - "to": [1.89063, 11.54688, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8.01563, 13.89688, 8.85]}, - "faces": { - "north": {"uv": [0, 0, 0.4, 0.4], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.4, 9.5], "rotation": 90, "texture": "#base"}, - "south": {"uv": [0, 0, 0.4, 0.4], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.4, 9.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.4, 9.5], "texture": "#base"}, - "down": {"uv": [0, 0, 0.4, 9.5], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.51563, 11.24688, 14.2], - "to": [14.51563, 11.54688, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 30, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [8.09062, 11.24688, 4.85], - "to": [14.79063, 11.44687, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8.01563, 13.89688, 8.85]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [0, 0, 0.2, 9.5], "rotation": 90, "texture": "#8"}, - "south": {"uv": [0, 0, 15, 0], "rotation": 270, "texture": "#8"}, - "west": {"uv": [8, 4, 8.2, 13.5], "rotation": 270, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [1.49062, 11.24688, 4.85], - "to": [8.09062, 11.44687, 14.35], - "rotation": {"angle": 0, "axis": "y", "origin": [5.14063, 13.84688, 9.6]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 15.01563], - "to": [15, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1, 16, 15.01563], - "to": [15, 31, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.02708], - "to": [13.97914, 16, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 15.98438, 0.02708], - "to": [13.97914, 19.98438, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.91771], - "to": [13.97914, 5, 2.91771], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 18.98438, 0.99583], - "to": [13.97914, 19.98438, 2.89583], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1.9, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1.9, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47914, 16, 1.93333], - "to": [14.17914, 20, 2.93333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.47914, 1, 1.93333], - "to": [14.17914, 16, 2.93333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 16, 4.27722], - "to": [10.93119, 20, 5.67722], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 1, 4.27722], - "to": [10.93119, 16, 5.67722], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.58417, 15.02188, 4.97875], - "to": [14.08417, 15.32188, 5.27875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 13.5], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 13.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 13.5], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 13.5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.58417, 15.02188, 2.15688], - "to": [0.88417, 15.32188, 5.00063], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 2.84375], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 2.84375], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 2.84375], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 2.84375], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [13.78417, 15.02188, 2.15688], - "to": [14.08417, 15.32188, 5.00063], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 2.84375], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 2.84375], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 2.84375], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 2.84375], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [4.10917, 12.19688, 4.97875], - "to": [7.40917, 15.29688, 5.17875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [10.70917, 12.19688, 4.97875], - "to": [14.00917, 15.29688, 5.17875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [13.81229, 12.19688, 2.19125], - "to": [14.01229, 15.29688, 5.19125], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "south": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.61229, 12.19688, 2.19125], - "to": [0.81229, 15.29688, 5.19125], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "south": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.60917, 12.19688, 4.97875], - "to": [4.10917, 15.29688, 5.17875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [5.65565, 12.19688, 4.3454], - "to": [8.95565, 15.19687, 4.5454], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.30917, 12.25, 2.22875], - "to": [14.00917, 12.35, 5.12875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.60917, 12.25, 2.22875], - "to": [7.30917, 12.35, 5.12875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.58417, 10.52188, 4.97875], - "to": [14.08417, 10.82188, 5.27875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 13.5], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 13.5], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 13.5], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 13.5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.58417, 10.52188, 2.15688], - "to": [0.88417, 10.82188, 5.00063], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 2.84375], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 2.84375], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 2.84375], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 2.84375], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [13.78417, 10.52188, 2.15688], - "to": [14.08417, 10.82188, 5.00063], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.3, 2.84375], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.3, 0.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 0, 0.3, 2.84375], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 0, 0.3, 2.84375], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 0.3, 2.84375], "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [4.10917, 7.69688, 4.97875], - "to": [7.40917, 10.79688, 5.17875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [10.70917, 7.69688, 4.97875], - "to": [14.00917, 10.79688, 5.17875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [1, 0, 16, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [13.81229, 7.69688, 2.19125], - "to": [14.01229, 10.79688, 5.19125], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "south": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.61229, 7.69688, 2.19125], - "to": [0.81229, 10.79688, 5.19125], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "south": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.60917, 7.69688, 4.97875], - "to": [4.10917, 10.79688, 5.17875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.40917, 7.69688, 4.97875], - "to": [10.70917, 10.69687, 5.17875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [1, 0, 16, 16], "rotation": 180, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "texture": "#8"}, - "south": {"uv": [1, 0, 15, 16], "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "texture": "#8"}, - "up": {"uv": [0, 0, 0.2, 0.3], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [7.30917, 7.75, 2.22875], - "to": [14.00917, 7.85, 5.12875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "up": {"uv": [1, 0, 16, 16], "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "texture": "#8"} - } - }, - { - "name": "bulk", - "from": [0.60917, 7.75, 2.22875], - "to": [7.30917, 7.85, 5.12875], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "east": {"uv": [7, 3, 7.2, 12.5], "rotation": 90, "texture": "#8"}, - "south": {"uv": [0, 0, 0.2, 0.3], "rotation": 270, "texture": "#8"}, - "west": {"uv": [7, 4, 7.2, 13.5], "rotation": 270, "texture": "#8"}, - "up": {"uv": [0, 0, 15, 16], "texture": "#8"}, - "down": {"uv": [1, 0, 16, 16], "texture": "#8"} - } - }, - { - "name": "door", - "from": [23.40625, 0.14063, 5.45938], - "to": [24.40625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, 15.94063, 5.45938], - "to": [24.40625, 21, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, 20.94063, 5.45938], - "to": [24.40625, 31.92188, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 10.98125], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.98125], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 10.98125], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.98125], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 16, 2.6125], - "to": [1.51563, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 21, 2.6125], - "to": [1.51563, 31.92188, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 16, 2.6125], - "to": [14.51563, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 21, 2.6125], - "to": [14.51563, 31.92188, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 10.92188], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 10.92188], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [30, -135, 0], - "translation": [0.5, -3, 0], - "scale": [0.41, 0.41, 0.41] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - { - "name": "rack", - "origin": [4, 30, 13], - "color": 0, - "children": [10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27] - }, - { - "name": "ice_maker", - "origin": [4, 30, 13], - "color": 0, - "children": [ - { - "name": "bucket", - "origin": [4, 30, 13], - "color": 0, - "children": [ - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - { - "name": "Waffle", - "origin": [12.16562, 25.02344, 10.68438], - "color": 0, - "children": [36, 37, 38] - }, - { - "name": "IceCream", - "origin": [12.16562, 25.02344, 10.68438], - "color": 0, - "children": [39, 40, 41, 42, 43, 44, 45] - }, - { - "name": "MachaIceCream", - "origin": [12.16562, 25.02344, 10.68438], - "color": 0, - "children": [46, 47, 48, 49, 50, 51, 52, 53, 54, 55] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [56, 57, 58, 59, 60] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [61, 62, 63, 64, 65, 66, 67, 68, 69] - }, - { - "name": "ice", - "origin": [0, 0, 0], - "color": 0, - "children": [70] - } - ] - }, - { - "name": "bracket", - "origin": [6.8, 16.775, 20.1], - "color": 0, - "children": [71, 72, 73] - }, - { - "name": "top", - "origin": [4, 30, 13], - "color": 0, - "children": [74, 75, 76, 77, 78, 79, 80, 81, 82] - } - ] - }, - 83, - { - "name": "freezer_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - 84, - 85, - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [86, 87, 88] - } - ] - }, - 89, - 90, - 91 - ] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [92, 93, 94, 95, 96] - }, - { - "name": "bottom_drawer", - "origin": [4.79062, 1.84688, 9.6], - "color": 0, - "children": [97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114] - }, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [115, 116, 117, 118, 119, 120] - }, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 121, - 122, - 123, - 124, - 125, - 126, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [127, 128, 129, 130] - }, - 131, - 132, - 133, - 134, - { - "name": "door_shelf1", - "origin": [4.79062, 1.84688, 9.6], - "color": 0, - "children": [135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145] - }, - { - "name": "door_shelf", - "origin": [4.79062, 1.84688, 9.6], - "color": 0, - "children": [146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156] - } - ] - }, - 157, - 158, - 159, - 160, - 161, - 162, - 163, - 164, - 165 - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle.json deleted file mode 100644 index 3e928de78..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle.json +++ /dev/null @@ -1,265 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "bulk", - "from": [0.5, 0, 3], - "to": [1.5, 16.2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 0, 3], - "to": [15.5, 16.2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [12.97914, 0, 0.02708], - "to": [13.97914, 16.2, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47914, 0, 1.93333], - "to": [14.17414, 16.2, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.47914, 15, 2.87864], - "to": [14.57414, 16.2, 15.97864], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.095, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13.1, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13.095, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13.1, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13.095, 13.1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.095, 13.1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.47914, 0, 2.87864], - "to": [14.57414, 1, 15.97864], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.095, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13.1, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13.095, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13.1, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13.095, 13.1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.095, 13.1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 0, 4.285], - "to": [10.93119, 16.2, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1, 0.001, 15.01563], - "to": [15, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 14], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1, 14, 15.01563], - "to": [15, 16.199, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 0, - 1, - 2, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [3] - }, - 4, - 5, - 6, - 7 - ] - }, - 8, - 9 - ] - } - ] - }, - 10, - 11 - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer.json deleted file mode 100644 index f0a0b9fc2..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer.json +++ /dev/null @@ -1,383 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 0.13125, 2.60938], - "to": [14.49, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.5, 0, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 0, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 0, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 2.04688, 15.01563], - "to": [15, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 13.95312], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1, -0.05312, 15.01563], - "to": [15, 2.1, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.95312], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [12.97914, 0, 0.02708], - "to": [13.97914, 16, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 15.98438, 0.02708], - "to": [13.97914, 19.98438, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 18.98438, 0.99583], - "to": [13.97914, 19.98438, 2.89583], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1.9, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1.9, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47914, 16, 1.93333], - "to": [14.17414, 20, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.47914, 0, 1.93333], - "to": [14.17414, 16, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 16, 4.285], - "to": [10.93119, 20, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 0, 4.285], - "to": [10.93119, 16, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.14063, 5.45938], - "to": [24.40625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.44906, 20, 2.62], - "to": [13.69, 21, 3.97937], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.35938, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1.35938], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1.35938], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 16, 2.62031], - "to": [1.51563, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, 15.94063, 5.49063], - "to": [24.41406, 21, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 16, 2.62031], - "to": [14.52344, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 1, - 2, - 3, - 4, - 5, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [6, 7, 8] - }, - 9, - 10, - 11, - 12 - ] - }, - 13, - 14, - 15, - 16, - 17, - 18, - 19 - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer_open.json deleted file mode 100644 index 1e59c9602..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_freezer_open.json +++ /dev/null @@ -1,570 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "bulk", - "from": [0.5, 0, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "south"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 0, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "south"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base", "cullface": "up"} - } - }, - { - "name": "bulk", - "from": [1, 2, 15.01563], - "to": [15, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 13.95312], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1, -0.05312, 15.01563], - "to": [15, 2.1, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.95312], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [-1.41483, 0, -10.39122], - "to": [-0.41483, 16, -9.39122], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs", "cullface": "west"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs", "cullface": "west"} - } - }, - { - "name": "door", - "from": [-1.41483, 15.98438, -10.39122], - "to": [-0.41483, 19.98438, -9.39122], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#legs", "cullface": "west"}, - "south": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs", "cullface": "west"} - } - }, - { - "name": "door", - "from": [-0.44608, 18.98438, -10.39122], - "to": [1.45392, 19.98438, -9.39122], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs", "cullface": "north"}, - "up": {"uv": [0, 0, 1.9, 1], "texture": "#legs", "cullface": "north"}, - "down": {"uv": [0, 0, 1.9, 1], "rotation": 180, "texture": "#legs", "cullface": "north"} - } - }, - { - "name": "door", - "from": [0.49142, 16, -10.59122], - "to": [1.49142, 20, 3.10878], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 13.7, 4], "texture": "#base", "cullface": "up"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "up"}, - "west": {"uv": [0, 0, 13.7, 4], "texture": "#base", "cullface": "up"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base", "cullface": "up"} - } - }, - { - "name": "door", - "from": [0.49142, 0, -10.59122], - "to": [1.49142, 16, 3.10878], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [10.25217, 16, -7.95777], - "to": [11.65217, 20, -6.95777], - "rotation": {"angle": 45, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 4], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 1.4, 4], "texture": "#base", "cullface": "north"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 90, "texture": "#base", "cullface": "north"} - } - }, - { - "name": "door", - "from": [10.25217, 0, -7.95777], - "to": [11.65217, 16, -6.95777], - "rotation": {"angle": 45, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 15], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 1.4, 15], "texture": "#base", "cullface": "north"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "north"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 270, "texture": "#base", "cullface": "north"} - } - }, - { - "name": "door", - "from": [0.60157, 0.22656, 2.6125], - "to": [1.53907, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.58595, 16, 2.6125], - "to": [1.53907, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "up"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs", "cullface": "up"} - } - }, - { - "name": "door", - "from": [23.40625, 15.94063, 5.49063], - "to": [24.41406, 21, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs", "cullface": "up"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs", "cullface": "up"}, - "south": {"uv": [0, 0, 1, 5.05937], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs", "cullface": "up"} - } - }, - { - "name": "door", - "from": [13.6875, -0.02031, 2.62031], - "to": [14.52344, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -5, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, -0.02656, 5.49063], - "to": [24.41406, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, -5, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 16, 2.62031], - "to": [14.52344, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs", "cullface": "up"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs", "cullface": "up"} - } - }, - { - "name": "bulk", - "from": [1.5, 0.2, 4], - "to": [14.5, 1.2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 3.7, 5], - "to": [14.5, 4.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 8.7, 5], - "to": [14.5, 9.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 9, -10.7], - "to": [4.4, 10, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 10, -10.7], - "to": [4.4, 12, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10, -10.7], - "to": [3.4, 12, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10, 1.3], - "to": [3.4, 12, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, 1.3], - "to": [3.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, -10.7], - "to": [3.4, 5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3, -10.7], - "to": [4.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 2, -10.7], - "to": [4.4, 3, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 16.5, 1.3], - "to": [3.4, 18.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 16.5, -10.7], - "to": [3.4, 18.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 16.5, -10.7], - "to": [4.4, 18.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 15.5, -10.7], - "to": [4.4, 16.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 0, - 1, - 2, - 3, - 4, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [5, 6, 7] - }, - 8, - 9, - 10, - 11 - ] - }, - 12, - 13 - ] - } - ] - }, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [21, 22, 23, 24] - }, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [25, 26, 27, 28] - }, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [29, 30, 31, 32] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_open.json deleted file mode 100644 index a76b6d01d..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_middle_open.json +++ /dev/null @@ -1,428 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [1.47914, 15, 2.87864], - "to": [14.57414, 16, 15.97864], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.17961, 8, 4.97786]}, - "faces": { - "north": {"uv": [0, 0, 13.095, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13.1, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13.095, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13.1, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13.095, 13.1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.095, 13.1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 0, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 0, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [-1.43011, 0, -10.50461], - "to": [-0.43011, 16, -9.50461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.19695, 8, 2.65414]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47614, 0, -10.69961], - "to": [1.57614, 16, 2.99539], - "rotation": {"angle": 0, "axis": "y", "origin": [0.19695, 8, 2.65414]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.83542, 0, -6.59043], - "to": [11.23542, 16, -5.59043], - "rotation": {"angle": 45, "axis": "y", "origin": [0.19695, 8, 2.65414]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 0, 2.6125], - "to": [14.51563, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1, 0.001, 15.01563], - "to": [15, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 14], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1, 14, 15.01563], - "to": [15, 15.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1.51563, 0.04688, 3], - "to": [14.51563, 0.98438, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.9375, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.9375, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.00782, 5.45938], - "to": [24.40625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.5, 8.7, 5], - "to": [14.5, 9.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 9.5, -9.7], - "to": [4.4, 10.5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 10.5, -9.7], - "to": [4.4, 12.5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, -9.7], - "to": [3.4, 12.5, -8.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, 2.3], - "to": [3.4, 12.5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 2, -9.7], - "to": [4.4, 3, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3, -9.7], - "to": [4.4, 5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, -9.7], - "to": [3.4, 5, -8.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, 2.3], - "to": [3.4, 5, 3.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 3.7, 5], - "to": [14.5, 4.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 0, - 1, - 2, - 3, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [4] - }, - 5, - 6 - ] - }, - 7, - 8 - ] - } - ] - }, - 9, - 10, - 11, - 12, - 13, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [14, 15, 16, 17, 18, 19, 20, 21] - }, - 22 - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_open.json deleted file mode 100644 index 44403dc74..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_open.json +++ /dev/null @@ -1,596 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.53344, 0.13125, 2.63282], - "to": [14.51344, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "south"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "south"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 14.5], - "to": [15, 16, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base", "cullface": "up"} - } - }, - { - "name": "bulk", - "from": [1, 1, 15.01563], - "to": [15, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2", "cullface": "up"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs", "cullface": "down"} - } - }, - { - "name": "door", - "from": [-1.41483, 4, -10.39122], - "to": [-0.41483, 16, -9.39122], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs", "cullface": "west"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs", "cullface": "west"} - } - }, - { - "name": "door", - "from": [-1.41483, 15.98438, -10.39122], - "to": [-0.41483, 19.98438, -9.39122], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 1], "rotation": 90, "texture": "#legs", "cullface": "west"}, - "south": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 1], "rotation": 270, "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs", "cullface": "west"} - } - }, - { - "name": "door", - "from": [-0.5242, 4, -10.39122], - "to": [1.4758, 5, -9.39122], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs", "cullface": "north"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs", "cullface": "north"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs", "cullface": "north"} - } - }, - { - "name": "door", - "from": [-0.44608, 18.98438, -10.39122], - "to": [1.45392, 19.98438, -9.39122], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs", "cullface": "north"}, - "up": {"uv": [0, 0, 1.9, 1], "texture": "#legs", "cullface": "north"}, - "down": {"uv": [0, 0, 1.9, 1], "rotation": 180, "texture": "#legs", "cullface": "north"} - } - }, - { - "name": "door", - "from": [0.49142, 16, -10.59122], - "to": [1.49142, 20, 3.10878], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 13.7, 4], "texture": "#base", "cullface": "up"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "up"}, - "west": {"uv": [0, 0, 13.7, 4], "texture": "#base", "cullface": "up"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base", "cullface": "up"} - } - }, - { - "name": "door", - "from": [0.49142, 1, -10.59122], - "to": [1.49142, 16, 3.10878], - "rotation": {"angle": 0, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [10.25217, 16, -7.95777], - "to": [11.65217, 20, -6.95777], - "rotation": {"angle": 45, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 4], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 1.4, 4], "texture": "#base", "cullface": "north"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 90, "texture": "#base", "cullface": "north"} - } - }, - { - "name": "door", - "from": [10.25217, 1, -7.95777], - "to": [11.65217, 16, -6.95777], - "rotation": {"angle": 45, "axis": "y", "origin": [2.20426, 12.01875, 2.52117]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 15], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 1.4, 15], "texture": "#base", "cullface": "north"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "north"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 270, "texture": "#base", "cullface": "north"} - } - }, - { - "name": "door", - "from": [0.60157, 1, 2.6125], - "to": [1.53907, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.58595, 16, 2.6125], - "to": [1.53907, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "up"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs", "cullface": "up"} - } - }, - { - "name": "door", - "from": [23.40625, 15.94063, 5.49063], - "to": [24.41406, 21, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs", "cullface": "up"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs", "cullface": "up"}, - "south": {"uv": [0, 0, 1, 5.05937], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs", "cullface": "up"} - } - }, - { - "name": "door", - "from": [13.6875, 0.14844, 2.62031], - "to": [14.52344, 16, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -5, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, 0.13594, 5.49063], - "to": [24.41406, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, -5, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5.05937], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5.05937], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 16, 2.62031], - "to": [14.52344, 21, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 5], "texture": "#legs", "cullface": "up"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "south": {"uv": [0, 0, 0.82813, 5], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs", "cullface": "up"} - } - }, - { - "name": "bulk", - "from": [1.5, 0.2, 4], - "to": [14.5, 1.2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 3.7, 5], - "to": [14.5, 4.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 8.7, 5], - "to": [14.5, 9.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 9, -10.7], - "to": [4.4, 10, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 10, -10.7], - "to": [4.4, 12, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10, -10.7], - "to": [3.4, 12, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10, 1.3], - "to": [3.4, 12, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, 1.3], - "to": [3.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, -10.7], - "to": [3.4, 5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3, -10.7], - "to": [4.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 2, -10.7], - "to": [4.4, 3, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 16.5, 1.3], - "to": [3.4, 18.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 16.5, -10.7], - "to": [3.4, 18.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 16.5, -10.7], - "to": [4.4, 18.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 15.5, -10.7], - "to": [4.4, 16.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 1, - 2, - 3, - 4, - 5, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [6, 7, 8, 9] - }, - 10, - 11, - 12, - 13 - ] - }, - 14, - 15 - ] - } - ] - }, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [23, 24, 25, 26] - }, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [27, 28, 29, 30] - }, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [31, 32, 33, 34] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_single.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_single.json deleted file mode 100644 index bbfc8414a..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_single.json +++ /dev/null @@ -1,306 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 0.13125, 2.60938], - "to": [14.49, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 15], - "to": [15, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1.04688, 15.01563], - "to": [15, 15.96094, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.02708], - "to": [13.97914, 15, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 4, 0.91771], - "to": [13.97914, 5, 2.91771], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 14, 0.91771], - "to": [13.97914, 15, 2.91771], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.47914, 1, 1.93333], - "to": [14.17414, 16, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 3], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.93119, 1, 4.285], - "to": [10.93119, 16, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.14063, 5.45938], - "to": [24.40625, 15.125, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 15.89844, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 1, 2.6125], - "to": [14.51563, 15.82031, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [30, -135, 0], - "translation": [0.5, -1.25, 0], - "scale": [0.41, 0.41, 0.41] - }, - "head": { - "translation": [0, -0.5, -1.5] - }, - "fixed": { - "translation": [0, -0.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [] - }, - 1, - 2, - 3, - 4, - 5, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [6, 7, 8] - }, - 9, - 10, - 11 - ] - }, - 12, - 13, - 14 - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_single_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_single_open.json deleted file mode 100644 index d8699f9b3..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_single_open.json +++ /dev/null @@ -1,465 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "door", - "from": [0.51, 14.83125, 2.60938], - "to": [14.49, 15.8, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 3], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 0.2, 4], - "to": [14.5, 1.2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 3.7, 5], - "to": [14.5, 4.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 8.7, 5], - "to": [14.5, 9.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 1, 3], - "to": [1.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 1, 3], - "to": [15.5, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1, 15], - "to": [15, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1, 1.04688, 15.01563], - "to": [15, 15.96094, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [0.5, 0, 2.84375], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-1.40667, 4, -10.50461], - "to": [-0.40667, 15, -9.50461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.51604, 4, -10.50461], - "to": [1.48396, 5, -9.50461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.51604, 14, -10.50461], - "to": [1.48396, 15, -9.50461], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.49958, 1, -10.69961], - "to": [1.59958, 16, 2.99539], - "rotation": {"angle": 0, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.15175, 1, -6.88332], - "to": [10.55175, 16, -5.88332], - "rotation": {"angle": 45, "axis": "y", "origin": [0.22039, 9.5, 1.65414]}, - "faces": { - "north": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.40625, 0.25782, 5.45938], - "to": [24.40625, 15.825, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 1, 2.6125], - "to": [1.51563, 15.89844, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 0.3, 2.6125], - "to": [14.51563, 15.82031, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 2, -10.7], - "to": [4.4, 3, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3, -10.7], - "to": [4.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, -10.7], - "to": [3.4, 5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, 1.3], - "to": [3.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [30, -135, 0], - "translation": [0.5, -1.25, 0], - "scale": [0.41, 0.41, 0.41] - }, - "head": { - "translation": [0, -0.5, -1.5] - }, - "fixed": { - "translation": [0, -0.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - { - "name": "group", - "origin": [4, 30, 13], - "color": 0, - "children": [1, 2, 3, 4] - }, - 5, - 6, - 7, - 8, - 9, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [10, 11, 12] - }, - 13, - 14 - ] - }, - 15, - 16, - 17 - ] - } - ] - }, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [18, 19, 20, 21, 22, 23, 24, 25] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_top.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_top.json deleted file mode 100644 index 62a34da25..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_top.json +++ /dev/null @@ -1,339 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "base", - "from": [14.5, -0.031, 3], - "to": [15.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, -0.055, 3], - "to": [1.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, -0.07031, 14.5], - "to": [15, 4, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, 4, 14.975], - "to": [15.5, 16, 15.998], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 4, 3], - "to": [1.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.516, -0.047, 3], - "to": [14.516, 0.984, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.938, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.938, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.938, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.938, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 3], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 11.3, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 11.3, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 11.3], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 4, 3], - "to": [15.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [12.9791, 14.2, 0.963], - "to": [13.9791, 15.2, 3.063], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.51, 14.963, 2.609], - "to": [14.49, 15.931, 3.609], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.969], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.969], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.969], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.969], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1, -0.07825, 15.016], - "to": [15, 15, 16.039], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [0.516, 0, 2.612], - "to": [1.516, 5, 4.013], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.516, 5, 2.612], - "to": [1.516, 15.922, 4.013], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 10.922], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.922], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 10.922], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.922], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [12.97914, 0, 0.02708], - "to": [13.97914, 15.2, 1.02708], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [9.93119, 0, 4.285], - "to": [10.93119, 16.2, 5.685], - "rotation": {"angle": 45, "axis": "y", "origin": [9.71244, 13.25, -0.80403]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.47914, 0, 1.93333], - "to": [14.17414, 16.2, 3.03333], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.12996, 12.01875, 1.33495]}, - "faces": { - "north": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.7, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 180, "texture": "#base"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - { - "name": "freezer_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [8] - } - ] - }, - 9 - ] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 10, - { - "name": "refrigerator_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [] - } - ] - }, - 11, - 12 - ] - } - ] - }, - 13, - 14, - 15 - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_top_open.json b/common/src/main/resources/assets/pfm/models/block/fridge/fridge_top_open.json deleted file mode 100644 index f861caef4..000000000 --- a/common/src/main/resources/assets/pfm/models/block/fridge/fridge_top_open.json +++ /dev/null @@ -1,497 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/white_concrete", - "base": "block/white_concrete" - }, - "elements": [ - { - "name": "base", - "from": [14.5, 0, 3], - "to": [15.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, 0, 3], - "to": [1.5, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 0, 14.5], - "to": [15, 4, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.5, 4, 14.975], - "to": [15.5, 16, 15.99844], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.5, 4, 3], - "to": [1.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.51563, 0.04688, 3], - "to": [14.51563, 0.98438, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 14, 13]}, - "faces": { - "north": {"uv": [0, 0, 0.9375, 13], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 0.9375, 13], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 0.9375, 11.5], "rotation": 270, "texture": "#base"}, - "up": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 11.5, 13], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 15, 3], - "to": [14.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 11.3, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 11.3, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 11.3], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [14.5, 4, 3], - "to": [15.5, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 2, -10.7], - "to": [4.4, 3, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3, -10.7], - "to": [4.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, -10.7], - "to": [3.4, 5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3, 1.3], - "to": [3.4, 5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.42556, 0, -10.63295], - "to": [1.42556, 16, 3.06705], - "rotation": {"angle": 0, "axis": "y", "origin": [0.14631, 11.1875, 1.72075]}, - "faces": { - "north": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 13.7, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 13.7, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.7, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [-8.39301, 0, -8.61238], - "to": [-7.39301, 16, -7.21238], - "rotation": {"angle": -45, "axis": "y", "origin": [0.14631, 11.1875, 1.72075]}, - "faces": { - "north": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "east": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 0, 1.4, 11], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.4], "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.4], "texture": "#base"} - } - }, - { - "name": "door", - "from": [-1.48069, 0.1875, -10.43295], - "to": [-0.48069, 15.1875, -9.43295], - "rotation": {"angle": 0, "axis": "y", "origin": [0.14631, 11.1875, 1.72075]}, - "faces": { - "north": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 10, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.51194, 14.1875, -10.43295], - "to": [1.28806, 15.1875, -9.43295], - "rotation": {"angle": 0, "axis": "y", "origin": [0.14631, 11.1875, 1.72075]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.51, 14.9625, 2.60938], - "to": [14.49, 15.93125, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.96875], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.96875], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1, 0, 15.01563], - "to": [15, 15, 16.03907], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [0.51563, 0, 2.6125], - "to": [1.51563, 5, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.51563, 5, 2.6125], - "to": [1.51563, 15.92188, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 10.92188], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 10.92188], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.6875, 0, 2.6125], - "to": [14.51563, 15.92031, 4.0125], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.82813, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.82813, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.40625, 0.03907, 5.45938], - "to": [24.40625, 15.92656, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.85938], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.85938], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.5, 3.7, 5], - "to": [14.5, 4.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.5, 8.7, 5], - "to": [14.5, 9.7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [8, -142, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.66, 0.66, 0.66] - }, - "head": { - "rotation": [-1, 90, 0], - "translation": [0, 4.5, 0], - "scale": [0.93, 0.95, 0.92] - }, - "fixed": { - "translation": [0, -4.75, -5.5], - "scale": [0.66, 0.66, 0.66] - } - }, - "groups": [ - { - "name": "fridge", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - { - "name": "freezer_door", - "origin": [16, 0, 16], - "color": 0, - "children": [ - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [8, 9, 10, 11, 12, 13, 14, 15] - }, - 16, - 17, - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [18, 19] - } - ] - }, - 20 - ] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [21, 22, 23, 24, 25] - } - ] - }, - 26, - 27 - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer.json new file mode 100644 index 000000000..87911227b --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/freezer", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_open.json new file mode 100644 index 000000000..9c7d55e90 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/freezer_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single.json new file mode 100644 index 000000000..f958f0a1d --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/freezer_single", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single_open.json new file mode 100644 index 000000000..9face3ca8 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/freezer_single_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/freezer_single_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge.json new file mode 100644 index 000000000..b0033f945 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom.json new file mode 100644 index 000000000..826aba2bf --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_bottom", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom_open.json new file mode 100644 index 000000000..6f59f9dcd --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_bottom_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_bottom_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_full.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_full.json new file mode 100644 index 000000000..250eb4eb4 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_full.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_full", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle.json new file mode 100644 index 000000000..8f5340bf6 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_middle", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer.json new file mode 100644 index 000000000..122d44919 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_middle_freezer", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer_open.json new file mode 100644 index 000000000..c400a0573 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_freezer_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_middle_freezer_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_open.json new file mode 100644 index 000000000..5ae47f889 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_middle_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_middle_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_open.json new file mode 100644 index 000000000..cb7c1be63 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single.json new file mode 100644 index 000000000..25d08b0e3 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_single", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single_open.json new file mode 100644 index 000000000..c0c7f8f80 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_single_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_single_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top.json new file mode 100644 index 000000000..3fbd44227 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_top", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top_open.json new file mode 100644 index 000000000..4c9db32b4 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/gray_fridge/fridge_top_open.json @@ -0,0 +1,8 @@ +{ + "credit": "By UnlikePaladin", + "parent": "pfm:block/white_fridge/fridge_top_open", + "textures": { + "particle": "pfm:block/gray_fridge", + "0": "pfm:block/gray_fridge" + } +} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer.json deleted file mode 100644 index fe35884e3..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/freezer", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_open.json deleted file mode 100644 index 1eb361258..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/freezer_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single.json deleted file mode 100644 index c46f54756..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/freezer_single", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single_open.json deleted file mode 100644 index 3350a1862..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_freezer_single_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/freezer_single_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge.json deleted file mode 100644 index 4055d9a1f..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom.json deleted file mode 100644 index e4d2522ae..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_bottom", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom_open.json deleted file mode 100644 index 49e7ab00c..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_bottom_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_bottom_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_full.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_full.json deleted file mode 100644 index 4f0fefd7a..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_full.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_full", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle.json deleted file mode 100644 index 1d3adf462..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_middle", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer.json deleted file mode 100644 index b8480e406..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_middle_freezer", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer_open.json deleted file mode 100644 index f2129c7dc..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_freezer_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_middle_freezer_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_open.json deleted file mode 100644 index 7d9b3831f..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_middle_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_middle_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_open.json deleted file mode 100644 index 4b6a70a69..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single.json deleted file mode 100644 index ea174a8c6..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_single", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single_open.json deleted file mode 100644 index ea9c2322b..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_single_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_single_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top.json deleted file mode 100644 index 15a2fbac6..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_top", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top_open.json b/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top_open.json deleted file mode 100644 index a0ef37086..000000000 --- a/common/src/main/resources/assets/pfm/models/block/gray_fridge/gray_fridge_top_open.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit": "By UnlikePaladin", - "parent": "pfm:block/fridge/fridge_top_open", - "textures": { - "particle": "block/gray_concrete", - "base": "block/gray_concrete", - "legs": "pfm:block/raw_concrete" - } -} diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer.json new file mode 100644 index 000000000..193a03b53 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer.json @@ -0,0 +1,135 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 5, -0.5], + "to": [13, 15, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, -0.01562]}, + "faces": { + "north": {"uv": [10.5, 0.25, 13, 0.5], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 15, -0.5], + "to": [13, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [12, 5, -0.5], + "to": [13, 5, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 11, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [12, 5, 0.96875], + "to": [13, 15, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, 0.48438]}, + "faces": { + "north": {"uv": [10.5, 0.25, 13, 0.5], "rotation": 270, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 5, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -11, 14]}, + "faces": { + "north": {"uv": [6.75, 12.5, 10, 15.25], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 12, 0.25, 14.75], "texture": "#0", "cullface": "up"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [13.43684, 5, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 1.5, 1.85247]}, + "faces": { + "north": {"uv": [7, 8.5, 7.35586, 11.25], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [1, 5, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, + "faces": { + "north": {"uv": [10, 11.75, 13.5, 14.75], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.5, 9, 0, 11.75], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 0.75, 7, 3.5], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 9, 3.5, 11.75], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10, 11, 13.5, 14.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [1, 4, 4], + "to": [15, 5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -17, 15]}, + "faces": { + "north": {"uv": [10, 11.75, 13.5, 14.75], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.5, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0.5, 11.75, 3.5, 12], "texture": "#0", "cullface": "up"}, + "down": {"uv": [10, 11, 13.5, 14.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6, + 7 + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_open.json new file mode 100644 index 000000000..dd9b31fa7 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_open.json @@ -0,0 +1,304 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [13.43684, 5.01, 2.36028], + "to": [14.86028, 15.99, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"} + } + }, + { + "name": "base", + "from": [3, 5.01, 2], + "to": [13.99, 6.01, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -11, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "base", + "from": [3, 15, 2], + "to": [13.99, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -1, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [10.54732, 5, -8.9939], + "to": [11.97076, 16, -8.00171], + "rotation": {"angle": 45, "axis": "y", "origin": [3.35313, 1.5, 1.52971]}, + "faces": { + "north": {"uv": [7, 8.5, 7.35586, 11.25], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 4.5, 6.99805, 5.5], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.25, 4.25, 7.35586, 5.25], "texture": "#0", "cullface": "north"}, + "west": {"uv": [6.75, 4.5, 6.99805, 5.5], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"} + } + }, + { + "from": [-0.5, 5, -10], + "to": [-0.5, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [3.36875, 1.5, 1.55315]}, + "faces": { + "east": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0.25, 13, 0.5], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [-0.5, 15, -10], + "to": [1, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [3.36875, 1.5, 1.55315]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [-0.5, 5, -10], + "to": [1, 5, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [3.36875, 1.5, 1.55315]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [0.99, 5, -10], + "to": [0.99, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [3.36875, 1.5, 1.55315]}, + "faces": { + "west": {"uv": [10.5, 0.25, 13, 0.5], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [1, 5, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [3.36875, 1.5, 1.55315]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [6.75, 12.5, 10, 15.25], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [14, 5, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 1.5, 1.35315]}, + "faces": { + "north": {"uv": [10, 11.75, 13.5, 14.75], "texture": "#0"}, + "east": {"uv": [3.5, 9, 0.25, 11.75], "texture": "#0"}, + "south": {"uv": [6.75, 0.75, 7, 3.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0.25, 9, 3.5, 11.75], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [13.25, 11, 13.5, 14.25], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1, 5, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 1.5, 1.35315]}, + "faces": { + "east": {"uv": [3.5, 9, 0, 11.75], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 3.75, 3.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0, 9, 3.5, 11.75], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10, 11, 10.25, 14.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 5, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0.46875, 1.5, 1.35315]}, + "faces": { + "north": {"uv": [10, 11.75, 13.5, 14.75], "texture": "#0"}, + "south": {"uv": [3.75, 0.75, 6.75, 3.5], "texture": "#0", "cullface": "south"}, + "up": {"uv": [7.25, 3.5, 10.25, 3.75], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [1, 4, 4], + "to": [15, 5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 1.5, 1.35315]}, + "faces": { + "north": {"uv": [10, 11.75, 13.5, 14.75], "texture": "#0"}, + "east": {"uv": [3.5, 11.75, 0.5, 12], "texture": "#0"}, + "south": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0.5, 11.75, 3.5, 12], "texture": "#0"}, + "down": {"uv": [10, 11, 13.5, 14.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 4, 3], + "to": [14, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 1.5, -0.64685]}, + "faces": { + "north": {"uv": [10.25, 11.75, 13.25, 12], "texture": "#0"}, + "east": {"uv": [3.5, 11.75, 0.5, 12], "texture": "#0"}, + "west": {"uv": [0.5, 11.75, 3.5, 12], "texture": "#0"}, + "down": {"uv": [10.25, 13.25, 13.25, 13.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 5, 3], + "to": [14, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 2.5, 1.35315]}, + "faces": { + "north": {"uv": [10, 11.75, 13.5, 14.75], "texture": "#0"}, + "up": {"uv": [7.25, 3.75, 10.25, 6.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 10, 3], + "to": [14, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 7.5, 1.35315]}, + "faces": { + "north": {"uv": [8, 4, 9.5, 4.25], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9.5, 4, 8, 4.25], "texture": "#0"}, + "up": {"uv": [8, 4, 9.5, 6.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 4, 9.5, 6.25], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 11, 6], + "to": [7, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 8.5, 1.35315]}, + "faces": { + "north": {"uv": [10.5, 5.5, 11.75, 6.5], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9.5, 4, 8, 4.25], "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 15, 3], + "to": [14, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 12.5, 1.35315]}, + "faces": { + "north": {"uv": [10, 11.75, 13.5, 14.75], "texture": "#0"}, + "up": {"uv": [7.25, 3.75, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10, 11, 13.5, 14.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11.25, 10.925, 12.25, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [4, 7.5, 8, 7.75], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [2, 5, -12], + "to": [3, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.975, 10.925, 12.725, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 15, 14], + "color": 0, + "children": [0, 1, 2] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 5, 14], + "color": 0, + "children": [ + 3, + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [4, 5, 6, 7] + }, + 8 + ] + }, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17 + ] + }, + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [] + } + ] + }, + 18, + 19 + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single.json new file mode 100644 index 000000000..d210300f9 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single.json @@ -0,0 +1,181 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 4, -0.5], + "to": [13, 15, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 9.5, 0.23438]}, + "faces": { + "north": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [11, 0, 13.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 4, -0.5], + "to": [13, 4, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 9.5, 0.23438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 15, -0.5], + "to": [13, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 9.5, 0.23438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 4, 0.96875], + "to": [13, 15, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 9.5, 0.23438]}, + "faces": { + "north": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.4913, 1, -7.90129], + "to": [10.91474, 16, -6.9091], + "rotation": {"angle": -45, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [14, 12, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [3.5, 12.75, 6.75, 15.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "texture": "#0"} + } + }, + { + "from": [1, 12, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 14, 1.98438]}, + "faces": { + "north": {"uv": [3.75, 8, 7, 9], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "north": {"uv": [0, 0.75, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 4.75, 3.5, 8], "texture": "#0"}, + "south": {"uv": [10, 12, 13.5, 15.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4.75, 7, 8], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 13, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 13]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0.75], "texture": "#0"}, + "east": {"uv": [7, 7.75, 3.5, 7], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 7, 1.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.75, 7, 7], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, 40, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.25, 0.25, 0.25] + }, + "thirdperson_lefthand": { + "rotation": [59, 40, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_righthand": { + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_lefthand": { + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], + "scale": [0.25, 0.25, 0.25] + }, + "ground": { + "translation": [0, 1, 0], + "scale": [0.26, 0.26, 0.26] + }, + "gui": { + "rotation": [30, -135, 0], + "translation": [0.5, -3, 0], + "scale": [0.41, 0.41, 0.41] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6 + ] + }, + 7, + 8 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single_open.json new file mode 100644 index 000000000..6b6d69781 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/freezer_single_open.json @@ -0,0 +1,381 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [-0.5, 4, -10], + "to": [-0.5, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "east": {"uv": [11, 0, 13.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [-0.5, 4, -10], + "to": [1, 4, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.9844]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [-0.5, 15, -10], + "to": [1, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 1.9844]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [0.99, 4, -10], + "to": [0.99, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "west": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.47568, 1, -7.88566], + "to": [11.89912, 16, -6.89347], + "rotation": {"angle": 45, "axis": "y", "origin": [1.98438, 10, 2]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [8.5, 5.25, 8.85586, 5.49805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "north"} + } + }, + { + "from": [1, 1, -11], + "to": [2, 12, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.5, 12.75, 6.75, 15.5], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1, 12, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.75, 8, 7, 9], "texture": "#0"}, + "up": {"uv": [8.5, 6.25, 8.75, 3.75], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 3.75], "texture": "#0"}, + "south": {"uv": [0, 4.75, 0.25, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4.5, 7, 7.75], "texture": "#0"} + } + }, + { + "from": [14, 1, 3], + "to": [15, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 13.5], "texture": "#0"}, + "east": {"uv": [7, 4.75, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [3.25, 4.75, 3.5, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 0.75, 14, 4.5], "texture": "#0"} + } + }, + { + "from": [2, 1, 15], + "to": [14, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-9, 0, 14]}, + "faces": { + "north": {"uv": [10.25, 12.25, 13.25, 15], "texture": "#0", "cullface": "south"}, + "south": {"uv": [10.25, 12.25, 13.25, 15], "texture": "#0", "cullface": "south"} + } + }, + { + "from": [2, 12, 15], + "to": [14, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-9, 3, 14]}, + "faces": { + "north": {"uv": [3.75, 1, 6.75, 1.75], "texture": "#0", "cullface": "south"}, + "south": {"uv": [3.75, 1, 6.75, 1.75], "texture": "#0", "cullface": "south"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 3.75, 6.75, 4], "texture": "#0"}, + "east": {"uv": [10.5, 3.25, 7, 3.5], "texture": "#0"}, + "south": {"uv": [7.25, 0.25, 7, 3.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.75, 7, 8], "texture": "#0"}, + "up": {"uv": [7.25, 3.5, 7, 6.5], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 15, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 13]}, + "faces": { + "north": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#0"}, + "east": {"uv": [7, 7.75, 3.75, 7.5], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 7, 1], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.75, 7.75, 7, 7.5], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0"} + } + }, + { + "from": [1, 13, 2], + "to": [2, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 13]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 1.25], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 3.75, 1.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.5, 7, 7], "texture": "#0"} + } + }, + { + "from": [1, 15, 2], + "to": [2, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 15, 2]}, + "faces": { + "west": {"uv": [2.75, 3.5, 3, 3.75], "texture": "#0"}, + "up": {"uv": [2.75, 3.5, 3, 3.75], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [14, 13, 3], + "to": [15, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 3, 13]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 0.5], "texture": "#0"}, + "east": {"uv": [7, 7.5, 3.75, 7], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 3.75, 1.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.5, 7, 7], "texture": "#0"} + } + }, + { + "name": "base", + "from": [2, 1, 2], + "to": [14, 2, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -15, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "base", + "from": [3, 15, 2], + "to": [13.99, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -1, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13.43684, 1, 2.36028], + "to": [14.86028, 15.99, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 5, 4], + "to": [14.5, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 10, 4], + "to": [14.5, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 11, 6], + "to": [7, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-0.53125, 8.5, 1.35315]}, + "faces": { + "north": {"uv": [10.5, 5.5, 11.75, 6.5], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9.5, 4, 8, 4.25], "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 7.7, 0.3], + "to": [4.4, 9.7, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -3.8, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 7.7, -10.7], + "to": [4.4, 9.7, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -3.8, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [4.4, 7.7, -10.7], + "to": [5.4, 9.7, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -3.8, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 6.7, -10.7], + "to": [5.4, 7.7, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -3.8, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2, 1, -12], + "to": [3, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.975, 10.925, 12.725, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11.25, 10.925, 12.25, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8.35, 5.075, 8.48477, 6.6], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6 + ] + }, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + } + ] + }, + 16, + 17, + 18, + 19, + 20, + 21, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [22, 23, 24, 25] + }, + 26, + 27 + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge.json new file mode 100644 index 000000000..559236e9f --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge.json @@ -0,0 +1,199 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 4, -0.5], + "to": [13, 20, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10, -0.01562]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 4, 0.96875], + "to": [13, 20, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10, 0.48438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [12, 4, -0.5], + "to": [13, 4, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 20, -0.5], + "to": [13, 20, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 13, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, + "faces": { + "north": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "texture": "#0"} + } + }, + { + "from": [13.43684, 1, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 8.5, 1.85247]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0"} + } + }, + { + "from": [13.43684, 16, 1.36028], + "to": [14.86028, 20, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 12.5, 1.85247]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 8], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 4, 3.5, 8], "texture": "#0"}, + "south": {"uv": [0, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4, 7, 8], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "base", + "from": [1, 16, 2], + "to": [15, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.75, 8, 0.25, 9], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 2, 7, 3], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0.25, 8, 3.75, 9], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 0.25, 3.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 16, 1], + "to": [14, 20, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 14]}, + "faces": { + "north": {"uv": [3.75, 8, 7, 9], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 8, 0.25, 9], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 20, 1], + "to": [14, 21, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 4, 14]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0", "cullface": "up"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "west": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0", "cullface": "up"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [13.43684, 20, 1.36028], + "to": [14.86028, 21, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 17.5, 1.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0", "cullface": "up"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0", "cullface": "up"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [14, 20, 2], + "to": [15, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [1, 20, 2], + "to": [2, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 0, 15]}, + "faces": { + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [4, 5, 6, 7, 8, 9, 10, 11] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + 12, + 13 + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom.json new file mode 100644 index 000000000..47f3ef171 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom.json @@ -0,0 +1,118 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 4, -0.5], + "to": [13, 16, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 4, -0.5], + "to": [13, 4, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 4, 0.96875], + "to": [13, 16, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.4913, 1, -7.90129], + "to": [10.91474, 16, -6.9091], + "rotation": {"angle": -45, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "up": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [0, 0, 3.25, 0.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "texture": "#0"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 4.25, 3.5, 8], "texture": "#0"}, + "south": {"uv": [0, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4, 7, 8], "texture": "#0"}, + "up": {"uv": [7.25, 7, 7, 3.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2] + }, + 3, + 4 + ] + }, + 5 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom_open.json new file mode 100644 index 000000000..a905191b6 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_bottom_open.json @@ -0,0 +1,355 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [-0.5, 4, -10], + "to": [-0.5, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "east": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [0.99, 4, -10], + "to": [0.99, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "west": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.47656, 1, -7.89349], + "to": [11.9, 16, -6.9013], + "rotation": {"angle": 45, "axis": "y", "origin": [1.97656, 10, 1.99219]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 6, 7.10586, 6.24805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "north"} + } + }, + { + "from": [1, 1, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "up": {"uv": [2.75, 0.5, 3, 3.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [-0.48438, 4, -10.01562], + "to": [1.01562, 4, -9.01562], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 10, -9.51562]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 14.25], "texture": "#0"}, + "east": {"uv": [7, 4, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [3.25, 4, 3.5, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 0.75, 14, 4.5], "texture": "#0"}, + "up": {"uv": [7.25, 6.75, 7, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [2, 1, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 10.75, 6.5, 14.5], "texture": "#0"}, + "south": {"uv": [0.25, 4, 3.25, 7.75], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10.25, 3.75, 7.25, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [0, 4, 0.25, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4, 7, 7.75], "texture": "#0"}, + "up": {"uv": [7.25, 7, 7, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11.25, 10.925, 12.25, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8.05, 10.475, 8.225, 8.15], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [2, 1, -12], + "to": [3, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.975, 10.925, 12.725, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [13.43684, 1, 2.36028], + "to": [14.86028, 16, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"} + } + }, + { + "name": "base", + "from": [2, 1, 2], + "to": [14, 2, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -15, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 9.7, 4], + "to": [14.5, 10.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 0.7, 4], + "to": [14.5, 5.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.2, 9]}, + "faces": { + "north": {"uv": [10.5, 6.5, 13.75, 7.75], "texture": "#0"}, + "up": {"uv": [10.5, 7.75, 13.75, 10.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 15, 4], + "to": [14.5, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15.5, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [7.25, 3.5, 7, 6.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 3.75, 6.75, 4], "texture": "#0"}, + "east": {"uv": [10.5, 3.25, 7, 3.5], "texture": "#0"}, + "south": {"uv": [7.25, 0.25, 7, 3.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.75, 7, 8], "texture": "#0"}, + "up": {"uv": [7.25, 3.5, 7, 6.5], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "base", + "from": [1.9, 12.2, 0.3], + "to": [3.9, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 12.2, -10.7], + "to": [3.9, 14.2, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 12.2, -10.7], + "to": [4.9, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 11.2, -10.7], + "to": [4.9, 12.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 7.5, 0.3], + "to": [3.9, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 7.5, -10.7], + "to": [3.9, 9.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 7.5, -10.7], + "to": [4.9, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 6.5, -10.7], + "to": [4.9, 7.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1] + }, + 2, + 3, + 4 + ] + }, + 5, + 6, + 7, + 8, + 9 + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + 10, + { + "name": "group", + "origin": [8, 1.2, 10], + "color": 0, + "children": [11] + } + ] + }, + 12, + 13, + 14, + 15, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [16, 17, 18, 19] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [20, 21, 22, 23] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_full.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_full.json new file mode 100644 index 000000000..adda001f5 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_full.json @@ -0,0 +1,220 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 4, -0.5], + "to": [13, 20, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10, -0.01562]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 4, 0.96875], + "to": [13, 20, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10, 0.48438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [12, 4, -0.5], + "to": [13, 4, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 10, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 20, -0.5], + "to": [13, 20, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 13, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, + "faces": { + "north": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 3.5, 3.25, 3.75], "texture": "#0"} + } + }, + { + "from": [13.43684, 1, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 8.5, 1.85247]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0"} + } + }, + { + "from": [13.43684, 16, 1.36028], + "to": [14.86028, 20, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 12.5, 1.85247]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 8], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 4, 3.5, 8], "texture": "#0"}, + "south": {"uv": [0, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4, 7, 8], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "base", + "from": [1, 16, 1], + "to": [14, 20, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 14]}, + "faces": { + "north": {"uv": [3.75, 8, 7, 9], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 8, 0.25, 9], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 16, 2], + "to": [15, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 1], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.75, 8, 0.25, 9], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 2, 7, 3], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0.25, 8, 3.75, 9], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [12, 21, -0.5], + "to": [13, 31, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 21, -0.01562]}, + "faces": { + "north": {"uv": [10.5, 0.25, 13, 0.5], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 31, -0.5], + "to": [13, 31, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 24, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [12, 21, -0.5], + "to": [13, 21, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 27, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [12, 21, 0.96875], + "to": [13, 31, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 21, 0.48438]}, + "faces": { + "north": {"uv": [10.5, 0.25, 13, 0.5], "rotation": 270, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 20, 1], + "to": [14, 32, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 5, 14]}, + "faces": { + "north": {"uv": [6.75, 12.5, 10, 15.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 12, 0.25, 15], "texture": "#0", "cullface": "up"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [13.43684, 20, 1.36028], + "to": [14.86028, 32, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 17.5, 1.85247]}, + "faces": { + "north": {"uv": [7, 8.5, 7.35586, 11.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [1, 20, 2], + "to": [15, 32, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 12.5, 3.5, 15.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.5, 9, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 0.75, 7, 3.75], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 9, 3.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [4, 5, 6, 7, 8, 9] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [10, 11, 12, 13] + }, + 14, + 15, + 16 + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle.json new file mode 100644 index 000000000..0bc2e3cff --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle.json @@ -0,0 +1,109 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 0, -0.5], + "to": [13, 16, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 0, 0.96875], + "to": [13, 16, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.4913, 0, -7.90129], + "to": [10.91474, 16, -6.9091], + "rotation": {"angle": -45, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "up": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [3.5, 10.5, 6.75, 14.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [0, 0, 3.25, 0.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 14.25], "texture": "#0"}, + "east": {"uv": [14, 1, 10.5, 4.75], "texture": "#0"}, + "south": {"uv": [10, 10.5, 13.5, 14.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 1, 14, 5], "texture": "#0"}, + "up": {"uv": [7.25, 7, 7, 3.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 3.5, 7, 7], "texture": "#0", "cullface": "down"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1] + }, + 2, + 3 + ] + }, + 4 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer.json new file mode 100644 index 000000000..28d8737f7 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer.json @@ -0,0 +1,224 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 0, -0.5], + "to": [13, 16, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 16, -0.5], + "to": [13, 20, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 11, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 11, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 11, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 16, 0.9688], + "to": [13, 20, 0.9688], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 11, 2.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 11, 0.25], "rotation": 270, "texture": "#0", "cullface": "up"}, + "south": {"uv": [10.5, 0, 11, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [13.43684, 20, 1.36028], + "to": [14.86028, 21, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 1.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0", "cullface": "up"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0", "cullface": "up"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [12, 0, 0.96875], + "to": [13, 16, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.4913, 0, -7.90129], + "to": [10.91474, 16, -6.9091], + "rotation": {"angle": -45, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [3.5, 10.5, 6.75, 14.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 14.25], "texture": "#0"}, + "east": {"uv": [14, 1, 10.5, 4.75], "texture": "#0"}, + "south": {"uv": [10, 10.5, 13.5, 14.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 1, 14, 5], "texture": "#0"}, + "down": {"uv": [7.25, 3.5, 7, 7], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "base", + "from": [1, 16, 2], + "to": [15, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 1], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.5, 9.25, 0, 10.25], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 1, 7, 2], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 9.25, 3.5, 10.25], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [13.43684, 16, 1.36028], + "to": [14.86028, 20, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 12.5, 1.85247]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 8], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 16, 1], + "to": [14, 20, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 14]}, + "faces": { + "north": {"uv": [3.75, 8, 7, 9], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 8, 0.25, 9], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [12, 20, -0.5], + "to": [13, 20, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 13, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 20, 1], + "to": [14, 21, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 4, 14]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0", "cullface": "up"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "west": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0", "cullface": "up"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [14, 20, 2], + "to": [15, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [1, 20, 2], + "to": [2, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 0, 15]}, + "faces": { + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3, 4] + }, + 5, + 6 + ] + }, + 7 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + 8, + 9, + 10, + 11, + 12, + 13, + 14 + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer_open.json new file mode 100644 index 000000000..881e4af0e --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_freezer_open.json @@ -0,0 +1,531 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [-0.5, 0, -10], + "to": [-0.5, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "east": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [-0.5, 16, -10], + "to": [-0.5, 20, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 1.98438]}, + "faces": { + "east": {"uv": [10.5, 0, 11, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 11, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [0.99, 16, -10], + "to": [0.99, 20, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 11, 1.98438]}, + "faces": { + "east": {"uv": [10.5, 0, 11, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"}, + "west": {"uv": [10.5, 0, 11, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [0.99, 0, -10], + "to": [0.99, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "west": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.47656, 0, -7.89349], + "to": [11.9, 20, -6.9013], + "rotation": {"angle": 45, "axis": "y", "origin": [1.97656, 10, 1.99219]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [7.75, 5.75, 8.10586, 5.99805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.5, 10.5, 6.75, 14.5], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "down"} + } + }, + { + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 14.25], "texture": "#0"}, + "east": {"uv": [14, 1, 10.75, 4.75], "texture": "#0"}, + "south": {"uv": [10, 10.5, 10.25, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.75, 0.75, 14, 4.5], "texture": "#0"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 20, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11, 10.925, 13, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8.3, 6.475, 8.475, 4.15], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [2, 1, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 10.75, 6.5, 14.5], "texture": "#0"}, + "south": {"uv": [10.25, 10.5, 13.25, 14.25], "texture": "#0", "cullface": "south"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [10, 10.5, 10.25, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 1, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 9.7, 4], + "to": [14.5, 10.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 4.7, 4], + "to": [14.5, 5.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 0, -12], + "to": [3, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.35, 10.95, 13.35, 14.74961], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "down"} + } + }, + { + "name": "bulk", + "from": [1.5, 15, 4], + "to": [14.5, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15.5, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [1, 0, 3], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [3.75, 2, 7, 2.25], "texture": "#0"}, + "east": {"uv": [14, 4.5, 10.75, 4.75], "texture": "#0"}, + "south": {"uv": [13.5, 14, 10, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.75, 4.5, 14, 4.75], "texture": "#0"}, + "up": {"uv": [5.5, 4, 5.25, 7], "texture": "#0"}, + "down": {"uv": [10.5, 3.5, 7, 6.75], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "base", + "from": [1.9, 7.5, 0.3], + "to": [3.9, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 7.5, -10.7], + "to": [3.9, 9.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 7.5, -10.7], + "to": [4.9, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 6.5, -10.7], + "to": [4.9, 7.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 2.5, 0.3], + "to": [3.9, 4.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 2.5, -10.7], + "to": [3.9, 4.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 2.5, -10.7], + "to": [4.9, 4.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 1.5, -10.7], + "to": [4.9, 2.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 12.2, 0.3], + "to": [3.9, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 12.2, -10.7], + "to": [3.9, 14.2, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 12.2, -10.7], + "to": [4.9, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 11.2, -10.7], + "to": [4.9, 12.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1, 16, -11], + "to": [2, 20, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.75, 8, 7, 9], "texture": "#0", "cullface": "up"}, + "up": {"uv": [8.5, 6.5, 8.75, 4], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [-0.48438, 20, -10.01562], + "to": [1.01562, 20, -9.01562], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [13.43684, 0, 2.36028], + "to": [14.86028, 21, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [13.43684, 20, 1.36028], + "to": [14.86028, 21, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 1.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "bulk", + "from": [1, 20, 1], + "to": [2, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [14, 20, 2], + "to": [15, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 11.75, 0.5, 12], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [2, 20, 1], + "to": [14, 21, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 4, 14]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 16, 2], + "to": [2, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 0, 15]}, + "faces": { + "east": {"uv": [3.75, 8, 0.25, 9], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 2, 3.75, 3], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 9.25, 3.5, 10.25], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 0.25, 3.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [14, 16, 3], + "to": [15, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.5, 9.25, 0.25, 10.25], "texture": "#0", "cullface": "up"}, + "south": {"uv": [6.75, 2, 7, 3], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0.5, 8, 3.75, 9], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 0.25, 3.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [2, 16, 15], + "to": [14, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [3.5, 0, 15]}, + "faces": { + "north": {"uv": [3.75, 2, 6.75, 3], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.75, 1, 6.75, 2], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 3, 0.25], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 1, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 2]}, + "faces": { + "west": {"uv": [2, 2.25, 2.25, 2.5], "texture": "#0"}, + "down": {"uv": [2, 2.25, 2.25, 2.5], "texture": "#0", "cullface": "down"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4, + 5 + ] + }, + 6, + 7, + 8, + 9 + ] + }, + 10, + 11, + 12, + 13, + 14, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [ + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [15, 16, 17, 18] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [19, 20, 21, 22] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [23, 24, 25, 26] + } + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + 27, + 28, + { + "name": "group", + "origin": [15.5, 4, 14], + "color": 0, + "children": [29, 30, 31, 32, 33] + }, + 34, + 35, + 36, + 37 + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_open.json new file mode 100644 index 000000000..c9a8e7b16 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_middle_open.json @@ -0,0 +1,399 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [-0.5, 0, -10], + "to": [-0.5, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "east": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [0.99, 0, -10], + "to": [0.99, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "west": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.47656, 0, -7.89349], + "to": [11.9, 16, -6.9013], + "rotation": {"angle": 45, "axis": "y", "origin": [1.97656, 10, 1.99219]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [10.75, 7.5, 11.10586, 7.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.5, 10.5, 6.75, 14.5], "texture": "#0"}, + "up": {"uv": [10.5, 5.25, 10.75, 8.5], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "down"} + } + }, + { + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 14.25], "texture": "#0"}, + "east": {"uv": [14, 1, 10.75, 4.75], "texture": "#0"}, + "south": {"uv": [10, 10.5, 10.25, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 0.75, 14, 4.5], "texture": "#0"}, + "up": {"uv": [7.25, 7, 7, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [2, 1, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 10.75, 6.5, 14.5], "texture": "#0"}, + "south": {"uv": [10.25, 10.5, 13.25, 14.25], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10.25, 3.75, 7.25, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [10, 10.5, 10.25, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 1, 14, 4.75], "texture": "#0"}, + "up": {"uv": [7.25, 7, 7, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1.9, 2.5, 0.3], + "to": [3.9, 4.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 2.5, -10.7], + "to": [3.9, 4.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 2.5, -10.7], + "to": [4.9, 4.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 1.5, -10.7], + "to": [4.9, 2.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -9, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 12.2, 0.3], + "to": [3.9, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 12.2, -10.7], + "to": [3.9, 14.2, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 12.2, -10.7], + "to": [4.9, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 11.2, -10.7], + "to": [4.9, 12.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 0.7, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 7.5, 0.3], + "to": [3.9, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 7.5, -10.7], + "to": [3.9, 9.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 7.5, -10.7], + "to": [4.9, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 6.5, -10.7], + "to": [4.9, 7.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 9.7, 4], + "to": [14.5, 10.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [5.25, 4.5, 4.75, 7], "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 4.7, 4], + "to": [14.5, 5.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [5.25, 4.5, 4.75, 7], "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 15, 4], + "to": [14.5, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15.5, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [7.25, 3.5, 7, 6.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [1, 0, 3], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [3.75, 2, 7, 2.25], "texture": "#0"}, + "east": {"uv": [14, 4.5, 10.75, 4.75], "texture": "#0"}, + "south": {"uv": [13.5, 14, 10, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.75, 4.5, 14, 4.75], "texture": "#0"}, + "up": {"uv": [5.25, 4.5, 4.75, 7], "texture": "#0"}, + "down": {"uv": [10.5, 3.5, 7, 6.75], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [2, 0, -12], + "to": [3, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.275, 10.925, 13.275, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 1, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 2]}, + "faces": { + "west": {"uv": [2, 2.25, 2.25, 2.5], "texture": "#0"}, + "down": {"uv": [2, 2.25, 2.25, 2.5], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [13.43684, 0, 2.36028], + "to": [14.86028, 16, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11.25, 10.925, 12.25, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [10.55, 8.975, 10.725, 6.65], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1] + }, + 2, + 3 + ] + }, + 4, + 5, + 6 + ] + }, + { + "name": "group", + "origin": [8, 10.2, 10], + "color": 0, + "children": [ + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [7, 8, 9, 10] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [11, 12, 13, 14] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [15, 16, 17, 18] + } + ] + }, + 19, + 20, + 21, + 22, + 23, + 24 + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + 25 + ] + }, + 26 + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_open.json new file mode 100644 index 000000000..9d64cd7e0 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_open.json @@ -0,0 +1,485 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [-0.5, 4, -10], + "to": [-0.5, 20, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "east": {"uv": [10.5, 0, 13.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [0.99, 4, -10], + "to": [0.99, 20, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "west": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [-0.5, 4, -10], + "to": [1, 4, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [-0.5, 20, -10], + "to": [1, 20, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.4757, 1, -7.8935], + "to": [11.89914, 16, -6.90131], + "rotation": {"angle": 45, "axis": "y", "origin": [1.98438, 10, 1.9922]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.47568, 16, -7.89348], + "to": [11.89912, 20, -6.90129], + "rotation": {"angle": 45, "axis": "y", "origin": [1.98438, 10, 1.99219]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 8], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 8], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7.5, 7, 7.74805, 8], "texture": "#0", "cullface": "north"}, + "up": {"uv": [7, 6.75, 7.35586, 6.99805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [1, 16, -11], + "to": [2, 20, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.75, 8, 7, 9], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "west": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [3, 0.25, 3.25, 4], "texture": "#0"}, + "east": {"uv": [7, 4, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [3.25, 4, 3.5, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.75, 4, 7, 7.75], "texture": "#0"} + } + }, + { + "name": "base", + "from": [14, 16, 3], + "to": [15, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.75, 8, 0.5, 9], "texture": "#0", "cullface": "up"}, + "south": {"uv": [6.75, 2, 7, 3], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0.5, 8, 3.75, 9], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 0.25, 3.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1, 16, 2], + "to": [2, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 0, 15]}, + "faces": { + "east": {"uv": [3.75, 8, 0.25, 9], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 2, 3.75, 3], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0.25, 8, 3.75, 9], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 0.25, 3.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [2, 16, 15], + "to": [14, 20, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [3.5, 0, 15]}, + "faces": { + "north": {"uv": [3.75, 2, 6.75, 3], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.75, 2, 6.75, 3], "texture": "#0", "cullface": "up"}, + "up": {"uv": [0, 0, 3, 0.25], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [2, 1, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 11.75, 6.5, 15.5], "texture": "#0"}, + "south": {"uv": [0.25, 4, 3.25, 7.75], "texture": "#0", "cullface": "south"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "east": {"uv": [7, 4, 3.5, 7.75], "texture": "#0"}, + "south": {"uv": [0, 4, 0.25, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4, 7, 7.75], "texture": "#0"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [0, 3.75, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 7.75, 3.5, 8], "texture": "#0"}, + "south": {"uv": [0, 7.75, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.75, 7, 8], "texture": "#0"}, + "up": {"uv": [10.5, 7, 7, 3.5], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "bulk", + "from": [1.5, 12.7, 4], + "to": [14.5, 13.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 0.7, 4], + "to": [14.5, 5.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.2, 9]}, + "faces": { + "north": {"uv": [10.5, 6.5, 13.75, 7.75], "texture": "#0"}, + "up": {"uv": [10.5, 7.75, 13.75, 10.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 8.7, 4], + "to": [14.5, 9.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2, 20, 1], + "to": [14, 21, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 4, 14]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0", "cullface": "up"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [2, 1, 2], + "to": [14, 2, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -15, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [14, 20, 2], + "to": [15, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 11.75, 0.5, 12], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "bulk", + "from": [1, 20, 1], + "to": [2, 21, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 0, 15]}, + "faces": { + "north": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0.5, 11.75, 0, 12], "texture": "#0", "cullface": "up"}, + "south": {"uv": [0, 11.75, 0.25, 12], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 11.75, 0.5, 12], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 11.25, 7.5, 11.5], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [13.43684, 1, 2.36028], + "to": [14.86028, 21, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 17.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"} + } + }, + { + "from": [13.43684, 20, 1.36028], + "to": [14.86028, 21, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 17.5, 1.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 7, 0.3], + "to": [3.9, 9, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4.5, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 7, -10.7], + "to": [3.9, 9, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4.5, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 7, -10.7], + "to": [4.9, 9, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4.5, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 6, -10.7], + "to": [4.9, 7, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, -4.5, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [1.9, 14.5, 0.3], + "to": [3.9, 16.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 3, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1.9, 14.5, -10.7], + "to": [3.9, 16.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 3, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [3.9, 14.5, -10.7], + "to": [4.9, 16.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 3, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [1.9, 13.5, -10.7], + "to": [4.9, 14.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 3, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 20, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11.25, 10.925, 13.25, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [13.25, 10.5, 13.5, 6.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [2, 1, -12], + "to": [3, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 4, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2.5], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11, 10.925, 13.5, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6, + 7 + ] + }, + 8, + 9, + 10, + 11, + 12, + 13, + 14 + ] + }, + { + "name": "group", + "origin": [8, 9.2, 10], + "color": 0, + "children": [15, 16, 17] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + 18, + 19, + 20, + 21, + 22, + 23, + { + "name": "group", + "origin": [8, 9.2, 10], + "color": 0, + "children": [ + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [24, 25, 26, 27] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [28, 29, 30, 31] + } + ] + } + ] + }, + 32, + 33 + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single.json new file mode 100644 index 000000000..e2801e4f5 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single.json @@ -0,0 +1,181 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 3, -0.5], + "to": [13, 14, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 6, 1.98438]}, + "faces": { + "north": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [11, 0, 13.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 3, -0.5], + "to": [13, 3, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 9, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 14, -0.5], + "to": [13, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 7, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 3, 0.96875], + "to": [13, 14, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 6, 1.98438]}, + "faces": { + "north": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.4913, 1, -7.90129], + "to": [10.91474, 16, -6.9091], + "rotation": {"angle": -45, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [14, 12, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [3.5, 12.75, 6.75, 15.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "texture": "#0"} + } + }, + { + "from": [1, 12, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 14, 1.98438]}, + "faces": { + "north": {"uv": [3.75, 8, 7, 9], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "north": {"uv": [0, 0.75, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 4.75, 3.5, 8], "texture": "#0"}, + "south": {"uv": [0, 4.75, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4.75, 7, 8], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 13, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 13]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0.75], "texture": "#0"}, + "east": {"uv": [7, 7.75, 3.5, 7], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 7, 1.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.75, 7, 7], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [59, 40, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.25, 0.25, 0.25] + }, + "thirdperson_lefthand": { + "rotation": [59, 40, 0], + "translation": [-0.5, 0.25, -1.5], + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_righthand": { + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_lefthand": { + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], + "scale": [0.25, 0.25, 0.25] + }, + "ground": { + "translation": [0, 1, 0], + "scale": [0.26, 0.26, 0.26] + }, + "gui": { + "rotation": [30, -135, 0], + "translation": [0.5, -3, 0], + "scale": [0.41, 0.41, 0.41] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6 + ] + }, + 7, + 8 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single_open.json new file mode 100644 index 000000000..f17dd0228 --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_single_open.json @@ -0,0 +1,415 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [-0.5, 3, -10], + "to": [-0.5, 14, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 6, 1.98438]}, + "faces": { + "east": {"uv": [11, 0, 13.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [-0.5, 3, -10], + "to": [1, 3, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 9, 1.9844]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [-0.5, 14, -10], + "to": [1, 14, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.9844]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [0.99, 3, -10], + "to": [0.99, 14, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 6, 1.98438]}, + "faces": { + "west": {"uv": [11, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.47568, 1, -7.88566], + "to": [11.89912, 16, -6.89347], + "rotation": {"angle": 45, "axis": "y", "origin": [1.98438, 10, 2]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [10.25, 5.75, 10.49805, 6.10586], "rotation": 90, "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "north"} + } + }, + { + "from": [1, 1, -11], + "to": [2, 12, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.5, 12.75, 6.75, 15.5], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1, 12, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.75, 8, 7, 9], "texture": "#0"}, + "up": {"uv": [10.25, 6.5, 10.5, 3.75], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 3.75], "texture": "#0"}, + "south": {"uv": [0, 4.75, 0.25, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4.5, 7, 7.75], "texture": "#0"} + } + }, + { + "from": [14, 1, 3], + "to": [15, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 13.5], "texture": "#0"}, + "east": {"uv": [7, 4.75, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [3.25, 4.75, 3.5, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 0.75, 14, 4.5], "texture": "#0"} + } + }, + { + "from": [2, 1, 15], + "to": [14, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-9, 0, 14]}, + "faces": { + "north": {"uv": [10.25, 11, 13.25, 14.5], "texture": "#0"}, + "south": {"uv": [0.25, 4.25, 3.25, 7.75], "texture": "#0", "cullface": "south"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 3.75, 6.75, 4], "texture": "#0"}, + "east": {"uv": [10.5, 3.25, 7, 3.5], "texture": "#0"}, + "south": {"uv": [7.25, 0.25, 7, 3.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.75, 7, 8], "texture": "#0"}, + "up": {"uv": [7.25, 3.5, 7, 6.5], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [2, 15, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 13]}, + "faces": { + "north": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#0"}, + "east": {"uv": [7, 7.75, 3.75, 7.5], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 7, 1], "texture": "#0", "cullface": "south"}, + "up": {"uv": [7, 3.5, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0"} + } + }, + { + "from": [1, 13, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 13]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 1.25], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 3.75, 1.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.75, 7, 7], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} + } + }, + { + "from": [14, 13, 3], + "to": [15, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 3, 13]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 0.5], "texture": "#0"}, + "east": {"uv": [7, 7.5, 3.75, 7], "texture": "#0"}, + "south": {"uv": [3.5, 0.75, 3.75, 1.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 7.5, 7, 7], "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 0.7, 4], + "to": [14.5, 4.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.2, 9]}, + "faces": { + "north": {"uv": [10.5, 6.5, 13.75, 7.5], "texture": "#0"}, + "up": {"uv": [10.5, 7.75, 13.75, 10.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2, 1, 2], + "to": [14, 2, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -15, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "base", + "from": [3, 15, 2], + "to": [13.99, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -1, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13.43684, 1, 2.36028], + "to": [14.86028, 15.99, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 7.7, 4], + "to": [14.5, 8.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 11.7, 4], + "to": [14.5, 12.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 11.2, 0.3], + "to": [4.4, 13.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -0.3, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 11.2, -10.7], + "to": [4.4, 13.2, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -0.3, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [4.4, 11.2, -10.7], + "to": [5.4, 13.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -0.3, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 10.2, -10.7], + "to": [5.4, 11.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -0.3, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.5, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 5.7, 0.3], + "to": [4.4, 7.7, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -5.8, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 5.7, -10.7], + "to": [4.4, 7.7, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -5.8, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [4.4, 5.7, -10.7], + "to": [5.4, 7.7, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -5.8, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 4.7, -10.7], + "to": [5.4, 5.7, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -5.8, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 0.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11.25, 10.925, 12.25, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [10.25, 3.68828, 10.5, 6.68828], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [2, 1, -12], + "to": [3, 12, 3.3], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.975, 10.925, 12.725, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6 + ] + }, + 7, + 8, + 9, + 10, + 11, + 12, + 13 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + } + ] + }, + 14, + 15, + 16, + 17, + 18, + 19, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [20, 21, 22, 23] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [24, 25, 26, 27] + }, + 28, + 29 + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top.json new file mode 100644 index 000000000..304b5ed4b --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top.json @@ -0,0 +1,118 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [12, 0, -0.5], + "to": [13, 15, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.25, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [12, 15, -0.5], + "to": [13, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8, 0.48438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 0, 0.96875], + "to": [13, 15, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.98438]}, + "faces": { + "north": {"uv": [10.5, 0, 14.25, 0.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.4913, 0, -7.90129], + "to": [10.91474, 16, -6.9091], + "rotation": {"angle": -45, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 1.98438]}, + "faces": { + "north": {"uv": [3.5, 15.5, 6.75, 11.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 13]}, + "faces": { + "north": {"uv": [13.25, 10.5, 13.5, 14.25], "texture": "#0"}, + "east": {"uv": [14, 0.5, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [10, 15, 13.5, 11], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 0.5, 14, 4.5], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 3.5, 7, 7], "texture": "#0", "cullface": "down"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1, 2] + }, + 3, + 4 + ] + }, + 5 + ] + } + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top_open.json b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top_open.json new file mode 100644 index 000000000..eaaba618f --- /dev/null +++ b/common/src/main/resources/assets/pfm/models/block/white_fridge/fridge_top_open.json @@ -0,0 +1,425 @@ +{ + "credit": "By UnlikePaladin", + "texture_size": [64, 64], + "textures": { + "0": "pfm:block/white_fridge", + "particle": "pfm:block/white_fridge" + }, + "elements": [ + { + "from": [-0.5, 0, -10], + "to": [-0.5, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "east": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14.25, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} + } + }, + { + "from": [0.99, 0, -10], + "to": [0.99, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 1.98438]}, + "faces": { + "west": {"uv": [10.5, 0, 14.25, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [10.47656, 0, -7.89349], + "to": [11.9, 16, -6.9013], + "rotation": {"angle": 45, "axis": "y", "origin": [1.97656, 10, 1.99219]}, + "faces": { + "north": {"uv": [7.5, 7, 7.85586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7.25, 7.25, 7.49805, 11], "texture": "#0", "cullface": "north"}, + "south": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [8.5, 4.75, 8.85586, 4.99805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [3.5, 10.75, 6.75, 14.5], "texture": "#0"}, + "west": {"uv": [3.5, 15.5, 6.75, 11.5], "texture": "#0"}, + "up": {"uv": [9.5, 6.5, 9.75, 3.75], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "down"} + } + }, + { + "from": [-0.5, 15, -10], + "to": [1, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 1.98438]}, + "faces": { + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [13.25, 11, 13.5, 14.75], "texture": "#0"}, + "east": {"uv": [14, 0.5, 10.75, 4.25], "texture": "#0"}, + "south": {"uv": [10, 11, 10.25, 14.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 0.75, 14, 4.5], "texture": "#0"}, + "up": {"uv": [7.25, 6.75, 7, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [2, 1, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 0, 14]}, + "faces": { + "north": {"uv": [3.5, 10.75, 6.5, 14.5], "texture": "#0"}, + "south": {"uv": [10.25, 15, 13.25, 11.25], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10.25, 3.75, 7.25, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "east": {"uv": [14, 0.75, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [10, 10.5, 10.25, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.5, 0.5, 14, 4.25], "texture": "#0"}, + "up": {"uv": [10.5, 7, 10.25, 3.5], "texture": "#0", "cullface": "up"} + } + }, + { + "name": "base", + "from": [2.4, 2.5, 0.3], + "to": [4.4, 4.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -9, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 2.5, -10.7], + "to": [4.4, 4.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -9, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [4.4, 2.5, -10.7], + "to": [5.4, 4.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -9, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 1.5, -10.7], + "to": [5.4, 2.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -9, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 12.2, 0.3], + "to": [4.4, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 0.7, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 12.2, -10.7], + "to": [4.4, 14.2, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [4.4, 12.2, -10.7], + "to": [5.4, 14.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 0.7, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 11.2, -10.7], + "to": [5.4, 12.2, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 0.7, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 7.5, 0.3], + "to": [4.4, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -4, -5.2]}, + "faces": { + "north": {"uv": [0.5, 2, 1, 2.5], "texture": "#0"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 7.5, -10.7], + "to": [4.4, 9.5, -9.7], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "south": {"uv": [0.25, 5.5, 0.75, 6], "texture": "#0", "cullface": "north"}, + "up": {"uv": [0.25, 5.5, 0.5, 6], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "name": "base", + "from": [4.4, 7.5, -10.7], + "to": [5.4, 9.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -4, -4.2]}, + "faces": { + "north": {"uv": [0.25, 5.25, 0.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.75, 13.75, 9.75, 14.25], "texture": "#0"}, + "south": {"uv": [0.25, 5, 0.5, 5.5], "texture": "#0"}, + "west": {"uv": [0.25, 4.75, 3.25, 5.25], "texture": "#0"}, + "up": {"uv": [0.25, 5.25, 3.25, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2.4, 6.5, -10.7], + "to": [5.4, 7.5, 1.3], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -4, -4.2]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3.5, 5.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 5.75, 3.25, 6], "texture": "#0"}, + "south": {"uv": [0, 5.75, 0.75, 6], "texture": "#0"}, + "up": {"uv": [3.5, 13.25, 6.5, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6.5, 15.25, 3.5, 14.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 9.7, 4], + "to": [14.5, 10.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [1.5, 4.7, 4], + "to": [14.5, 5.7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.2, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "bulk", + "from": [2, 15, 3], + "to": [14, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15.5, 9]}, + "faces": { + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [7.25, 3.75, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [1, 0, 3], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [3.75, 2, 7, 2.25], "texture": "#0"}, + "east": {"uv": [14, 4.5, 10.75, 4.75], "texture": "#0"}, + "south": {"uv": [13.5, 14.25, 10, 14.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.75, 4.5, 14, 4.75], "texture": "#0"}, + "up": {"uv": [7.25, 3.5, 7, 6.5], "texture": "#0"}, + "down": {"uv": [7.25, 3.5, 7, 6.75], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "base", + "from": [2, 14.99, 2], + "to": [14, 15.99, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -1, 15]}, + "faces": { + "north": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "east": {"uv": [7.25, 15.25, 8.25, 15.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6.75, 15.25, 10, 15.5], "texture": "#0"}, + "up": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.75, 15.25, 10, 15.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13.43684, 0, 2.36028], + "to": [14.86028, 15.99, 3.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 16.5, 2.85247]}, + "faces": { + "north": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "east": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "south": {"uv": [7, 11.25, 7.35586, 11.5], "texture": "#0"}, + "west": {"uv": [7, 11.25, 7.24805, 11.5], "texture": "#0"}, + "up": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0"}, + "down": {"uv": [7, 11.25, 7.35586, 11.49805], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [1, 0, 2], + "to": [2, 1, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 2]}, + "faces": { + "east": {"uv": [2, 2.25, 2.25, 2.5], "texture": "#0"}, + "west": {"uv": [2, 2.25, 2.25, 2.5], "texture": "#0"}, + "down": {"uv": [2, 2.25, 2.25, 2.5], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [2, 12, -12], + "to": [3, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [11.25, 10.925, 12.25, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8.35, 5.075, 8.48477, 6.6], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} + } + }, + { + "from": [2, 0, -12], + "to": [3, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 10, 1.98438]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.975, 10.925, 12.725, 14.75], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 0, 3.25, 0.25], "rotation": 90, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "bottom", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "group", + "origin": [15.5, 0, 16], + "color": 0, + "children": [ + { + "name": "door", + "origin": [0, 0, 14], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [0, 1] + }, + 2, + 3, + 4 + ] + }, + 5, + 6, + 7 + ] + }, + { + "name": "group", + "origin": [8, 10.2, 10], + "color": 0, + "children": [ + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [8, 9, 10, 11] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [12, 13, 14, 15] + }, + { + "name": "group", + "origin": [4.2, 5, -4.2], + "color": 0, + "children": [16, 17, 18, 19] + } + ] + }, + 20, + 21, + 22, + 23 + ] + }, + { + "name": "top", + "origin": [37, 11, 0], + "color": 0, + "children": [ + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [] + }, + 24, + 25 + ] + }, + 26, + 27, + 28 + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/white_stove_open.json b/common/src/main/resources/assets/pfm/models/block/white_stove_open.json index b0f123c3f..2871d3e02 100644 --- a/common/src/main/resources/assets/pfm/models/block/white_stove_open.json +++ b/common/src/main/resources/assets/pfm/models/block/white_stove_open.json @@ -8,8 +8,8 @@ "elements": [ { "name": "grill", - "from": [1, 16, 1], - "to": [15, 16, 15], + "from": [1, 16.01, 1], + "to": [15, 16.01, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]}, "faces": { "up": {"uv": [16, 3.5, 12.5, 0], "rotation": 180, "texture": "#0"} diff --git a/common/src/main/resources/assets/pfm/models/item/gray_freezer.json b/common/src/main/resources/assets/pfm/models/item/gray_freezer.json index d4f988ca5..00aee214c 100644 --- a/common/src/main/resources/assets/pfm/models/item/gray_freezer.json +++ b/common/src/main/resources/assets/pfm/models/item/gray_freezer.json @@ -1,4 +1,4 @@ { - "parent":"pfm:block/gray_fridge/gray_freezer_single" + "parent":"pfm:block/gray_fridge/freezer_single" } diff --git a/common/src/main/resources/assets/pfm/models/item/gray_fridge.json b/common/src/main/resources/assets/pfm/models/item/gray_fridge.json index 63c1e4d3c..102725a60 100644 --- a/common/src/main/resources/assets/pfm/models/item/gray_fridge.json +++ b/common/src/main/resources/assets/pfm/models/item/gray_fridge.json @@ -1,4 +1,4 @@ { - "parent":"pfm:block/gray_fridge/gray_fridge_single" + "parent":"pfm:block/gray_fridge/fridge_single" } diff --git a/common/src/main/resources/assets/pfm/models/item/white_freezer.json b/common/src/main/resources/assets/pfm/models/item/white_freezer.json index bc38e5e15..3804b51a1 100644 --- a/common/src/main/resources/assets/pfm/models/item/white_freezer.json +++ b/common/src/main/resources/assets/pfm/models/item/white_freezer.json @@ -1,4 +1,4 @@ { - "parent":"pfm:block/fridge/fridge_single" + "parent":"pfm:block/white_fridge/freezer_single" } diff --git a/common/src/main/resources/assets/pfm/models/item/white_fridge.json b/common/src/main/resources/assets/pfm/models/item/white_fridge.json index afab986ac..3b8b56564 100644 --- a/common/src/main/resources/assets/pfm/models/item/white_fridge.json +++ b/common/src/main/resources/assets/pfm/models/item/white_fridge.json @@ -1,4 +1,4 @@ { - "parent":"pfm:block/fridge/freezer_single" + "parent":"pfm:block/white_fridge/fridge_single" } diff --git a/common/src/main/resources/assets/pfm/textures/block/gray_fridge.png b/common/src/main/resources/assets/pfm/textures/block/gray_fridge.png new file mode 100644 index 0000000000000000000000000000000000000000..231009435ddc192b3ad2c76eb9b54c8ba4af6948 GIT binary patch literal 915 zcmV;E18n?>P)*gGNU~+^th8Fm@^=#Ut~4_m&CJejsnKjX!+{M7Up{{-ktTRJIX!b^ z=H1^<007l$)%~qfsmzU=PN(kmcszEmzg}G}l-U4)qvIFCg4jcvu~fm8=L&OW!xRm} zP$8TO9zS`C;lRd@Y59KN+GYTN9n&4>^RSN}-Y+$Xv;i8;mXs@B|G1HQ9%D5O2R0b1 z3C|ggZX?H#3~)D_%?U+8M4%`hZfppR3(6WsBA-B%P@=-BdG^&Z8I$;bQs3o{w^4+k!tMG=oXCC(Cc)Cm(qM5C+V7AmUSJVTL9e@-T=Aj z2=VxlbW1Kb28e2H$>JK|ZZ^wwW8>wk*K;kncW>XsHcH`3;aHX6DqsKr-x&Eb{pJ4Q z-E`o+_sz;90DxJyg7?WS27C&sQOx^k4F@);J5gRN&%VH-xByS45DAM~DYR z1IZnC&JQ+3L}P&}+)5YQQ zXTlTn{^mKpN>HXrA==$Z%3vZMLx~Zwmcx|R7PSqQ7KPs(HUOa4>B6jAB-fE$p2{Aq zP=%rDdm}OU%g%kv{e9%Fb!Z$^=8$kEDL+LblesSqgcas)nj;L(XXto^c z&Xvf0IodryH`?0bs@mLCQa3=Hc9;r$`vPeY=cKs`j9#Y;tXOqN!7%HV)c1IPaha)_ zUY2zhNb_M?TM0r(7D&5;6h*2A;L3|MP#CMFVuaLVK-P}e7d{BC4WL^9-4xycv9f^7 zxgy!KNUGKjIMKFHER%DJh1u8u&EW0}6%7~6#bS;AHp=?n~?RMK&p7#2E0KnnF p!P4KZ?Vsd_$#`4Vmd|TejsG3Ug$Qfb_N)K^002ovPDHLkV1iA1urUAt literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/pfm/textures/block/white_fridge.png b/common/src/main/resources/assets/pfm/textures/block/white_fridge.png new file mode 100644 index 0000000000000000000000000000000000000000..9db42a89aa27ad4f27c0441f0a311ff7add1d832 GIT binary patch literal 872 zcmV-u1DE`XP)myxcE(xtKF*2OhQd4N=>w3e%T23!V3SGdS)L~>o6Qc&%mCoW)s?UypF0oL30Iyg%$3bkG!IsVa8>a0;Q>Jq zz;T?S`@VVD-C%IkAkqey`@WPbFJ51z-e+4Dg8zR-33on+JV*xk+HUuRq97tr5f@BM zY*M zS#xxid6q6ZuGaO32t16gGZSJ~mB3skn42N1u=sXw~h*D#RaSYqC@UdJ9 zFQxf7PT4iREay5vw*b0ny#dT!re)yqqwJR4$rzxhwIxexfUoV==*Gt1_xHUP-0k(X zvQb)J3M*BDO@INw^yLKrVB2>3k8Zb{UPn;`00_en05G0R>Xx%II>?6kmih^f0u22*~LE8H>og#`NgkgwZPftS6%fe8C zOH+bp)&oS-8~4=D%_cS8<9NJxAGJ;>i~)HbKn}Wo>`TD6a)XyE|nWjFJXLP+AUCT3ggMSY5P!cbEad$8rhBaY(Ks zyF8VxJgb87lNXo0p72aHB>*D(37oPk%R&l*CLeT=rS(lw?FP_&?oisN-xiC6x|?(; za};Hhx$h^`ohy;&a Date: Sat, 1 Jun 2024 12:59:43 +0000 Subject: [PATCH 13/17] feat: Allow buckets in the input slot to be extracted from the bottom of the freezer. --- .../pfm/blocks/blockentities/FreezerBlockEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/FreezerBlockEntity.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/FreezerBlockEntity.java index 40b896cad..6825af317 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/FreezerBlockEntity.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/FreezerBlockEntity.java @@ -102,7 +102,7 @@ public void onClose(PlayerEntity player) { private static final int[] TOP_SLOTS = new int[]{0}; - private static final int[] BOTTOM_SLOTS = new int[]{2, 1}; + private static final int[] BOTTOM_SLOTS = new int[]{2, 1, 0}; private static final int[] SIDE_SLOTS = new int[]{1}; private DefaultedList inventory = DefaultedList.ofSize(size(), ItemStack.EMPTY); int fuelTime; @@ -223,7 +223,7 @@ public void provideRecipeInputs(RecipeMatcher finder) { @Override public boolean canExtract(int slot, ItemStack stack, Direction dir) { - if (dir == Direction.DOWN && slot == 1) { + if (dir == Direction.DOWN && slot != 2) { return stack.isOf(Items.BUCKET); } return true; From 0954b07f3b382adf473a1e1dc8b7daa65273539b Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Wed, 2 Oct 2024 01:44:39 -0600 Subject: [PATCH 14/17] Overhaul the Iron Fridge's Model and Collision --- .../pfm/blocks/IronFreezerBlock.java | 57 +- .../pfm/blocks/IronFridgeBlock.java | 20 +- .../assets/pfm/blockstates/iron_freezer.json | 16 +- .../assets/pfm/blockstates/iron_fridge.json | 8 +- .../block/iron_fridge/iron_freezer.json | 367 ++--------- .../block/iron_fridge/iron_freezer_open.json | 510 +++++---------- .../models/block/iron_fridge/iron_fridge.json | 332 ++-------- .../block/iron_fridge/iron_fridge_bottom.json | 387 ++---------- .../iron_fridge/iron_fridge_bottom_open.json | 579 ++++------------- .../block/iron_fridge/iron_fridge_full.json | 579 ++++------------- .../block/iron_fridge/iron_fridge_middle.json | 335 ++-------- .../iron_fridge/iron_fridge_middle_open.json | 508 +++------------ .../block/iron_fridge/iron_fridge_open.json | 593 +++++++----------- .../block/iron_fridge/iron_fridge_single.json | 323 ++-------- .../iron_fridge/iron_fridge_single_open.json | 574 ++++------------- .../block/iron_fridge/iron_fridge_top.json | 350 ++--------- .../iron_fridge/iron_fridge_top_open.json | 533 ++++------------ .../assets/pfm/textures/block/iron_fridge.png | Bin 0 -> 1580 bytes 18 files changed, 1299 insertions(+), 4772 deletions(-) create mode 100644 common/src/main/resources/assets/pfm/textures/block/iron_fridge.png diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFreezerBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFreezerBlock.java index d169346c8..691f3c93e 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFreezerBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFreezerBlock.java @@ -18,6 +18,8 @@ import net.minecraft.world.*; import org.jetbrains.annotations.Nullable; +import java.util.HashMap; +import java.util.Map; import java.util.function.Supplier; import static com.unlikepaladin.pfm.blocks.KitchenDrawerBlock.rotateShape; @@ -33,41 +35,34 @@ public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return super.canPlaceAt(state, world, pos); } - protected static final VoxelShape FREEZER = VoxelShapes.union(createCuboidShape(0.7, 1, 2,14.7, 16, 3),createCuboidShape(14.3, 1, 2.3,15.3, 16, 3.3),createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(1.7, 14, 1.06,2.7, 15, 2.06),createCuboidShape(1.7, 14, 0.06,14.2, 15, 1.06)); - protected static final VoxelShape FREEZER_OPEN = VoxelShapes.union(createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(13.7, 11, -1.4,14.7, 12.1, 3.6),createCuboidShape(0.7, 11, -1.4,1.7, 12.1, 3.6),createCuboidShape(14, 1, -1.6,15.5, 16, -0.6),createCuboidShape(0.7, 1, -2,14.6, 16, -1),createCuboidShape(1.7, 14, -2.9,2.7, 15, -0.9),createCuboidShape(1.7, 14, -3.9,14.2, 15, -2.9),createCuboidShape(13.2, 14, -3,14.2, 15, -1)); + protected static final Map FREEZER = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(3, 13, -0.5,13, 14, 1),createCuboidShape(1, 1, 1,15, 16, 2),createCuboidShape(1, 0, 2,15, 32, 16)));}}; + protected static final Map FREEZER_SINGLE = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(3, 13, -0.5,13, 14, 1),createCuboidShape(1, 1, 1,15, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FREEZER_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(3, 13, -3.5,13, 14, -2),createCuboidShape(1, 0, 2,15, 32, 16),createCuboidShape(1, 1, -2,15, 16, 3)));}}; + protected static final Map FREEZER_SINGLE_OPEN = new HashMap<>() {{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(3, 13, -3.5,13, 14, -2),createCuboidShape(1, 1, -2,15, 16, 3),createCuboidShape(1, 0, 3,15, 16, 16)));}}; - protected static final VoxelShape FREEZER_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, FREEZER); - protected static final VoxelShape FREEZER_SOUTH_OPEN = rotateShape(Direction.NORTH, Direction.SOUTH, FREEZER_OPEN); - protected static final VoxelShape FREEZER_EAST = rotateShape(Direction.NORTH, Direction.EAST, FREEZER); - protected static final VoxelShape FREEZER_EAST_OPEN = rotateShape(Direction.NORTH, Direction.EAST, FREEZER_OPEN); - protected static final VoxelShape FREEZER_WEST = rotateShape(Direction.NORTH, Direction.WEST, FREEZER); - protected static final VoxelShape FREEZER_WEST_OPEN = rotateShape(Direction.NORTH, Direction.WEST, FREEZER_OPEN); @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - Direction dir = state.get(FACING); + Direction dir = state.get(FACING).getOpposite(); Boolean open = state.get(OPEN); - switch (dir) { - case NORTH: - if (open) - return FREEZER_SOUTH_OPEN; - else - return FREEZER_SOUTH; - case SOUTH: - if (open) - return FREEZER_OPEN; - else - return FREEZER; - case EAST: - if (open) - return FREEZER_WEST_OPEN; - else - return FREEZER_WEST; - case WEST: - default: - if (open) - return FREEZER_EAST_OPEN; - else - return FREEZER_EAST; + boolean hasFridge = world.getBlockState(pos.up()).getBlock() instanceof IronFridgeBlock; + if (hasFridge) { + if (open) { + if (!FREEZER_OPEN.containsKey(dir)) + FREEZER_OPEN.put(dir, rotateShape(Direction.NORTH, dir, FREEZER_OPEN.get(Direction.NORTH))); + return FREEZER_OPEN.get(dir); + } + if (!FREEZER.containsKey(dir)) + FREEZER.put(dir, rotateShape(Direction.NORTH, dir, FREEZER.get(Direction.NORTH))); + return FREEZER.get(dir); + } else { + if (open) { + if (!FREEZER_SINGLE_OPEN.containsKey(dir)) + FREEZER_SINGLE_OPEN.put(dir, rotateShape(Direction.NORTH, dir, FREEZER_SINGLE_OPEN.get(Direction.NORTH))); + return FREEZER_SINGLE_OPEN.get(dir); + } + if (!FREEZER_SINGLE.containsKey(dir)) + FREEZER_SINGLE.put(dir, rotateShape(Direction.NORTH, dir, FREEZER_SINGLE.get(Direction.NORTH))); + return FREEZER_SINGLE.get(dir); } } @Override diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFridgeBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFridgeBlock.java index 74444e00c..db39ddf0f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFridgeBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/IronFridgeBlock.java @@ -26,17 +26,17 @@ public IronFridgeBlock(Settings settings, Supplier freezer) { this.freezer = freezer; } - protected static final Map FRIDGE_SINGLE = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 1, 3,15.7, 16, 16),createCuboidShape(13.71, 1, 2.609,14.69, 14.7, 3.609),createCuboidShape(13.2, 2.188, 0.094,14.2, 14.188, 1.094),createCuboidShape(13.2, 2.188, 0.984,14.2, 3.188, 2.984),createCuboidShape(13.2, 13.188, 1.063,14.2, 14.188, 3.063),createCuboidShape(14.247, 1.01, 2.137,15.247, 16, 3.557),createCuboidShape(0.7, 1, 2,14.6, 16, 3),createCuboidShape(0.71, 0.064, 2.609,14.69, 1.139, 15.909),createCuboidShape(14.71, 0.064, 3.509,15.69, 1.139, 15.909)));}}; - protected static final Map FRIDGE_TOP = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(13.2, -0.012, 0.094,14.2, 15.188, 1.094),createCuboidShape(13.2, 14.188, 1.063,14.2, 15.188, 3.063),createCuboidShape(14.247, 0, 2.137,15.247, 16, 3.557),createCuboidShape(0.7, 0, 2,14.6, 16, 3)));}}; - protected static final Map FRIDGE_MIDDLE = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(13.2, 0.188, 0.094,14.2, 16.188, 1.094),createCuboidShape(14.247, 0, 2.137,15.247, 16, 3.557),createCuboidShape(0.7, 0, 2,14.6, 16, 3)));}}; - protected static final Map FRIDGE_BOTTOM = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(13.2, 2.188, 0.094,14.2, 16.188, 1.094),createCuboidShape(13.2, 2.188, 1.063,14.2, 3.188, 3.063),createCuboidShape(14.247, 1, 2.137,15.247, 16, 3.557),createCuboidShape(0.7, 1, 2,14.6, 16, 3),createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(0.71, 0.025, 2.609,14.69, 1.1, 3.609)));}}; - protected static final Map FRIDGE = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 1, 3, 15.7, 16, 16), createCuboidShape(13.2, 1.2, 0.1,14.2, 15.2, 1.1),createCuboidShape(13.2, 1.2, 1,14.2, 2.2, 3),createCuboidShape(13.2, 14.2, 1.1,14.2, 15.2, 3.1),createCuboidShape(14, 1, 2.3,15.5, 16, 3.3),createCuboidShape(0.7, 1, 2,14.6, 16, 3)));}}; + protected static final Map FRIDGE_SINGLE = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 2, -0.5,13, 15, 1),createCuboidShape(1, 1, 1,15, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FRIDGE_TOP = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 0, -0.5,13, 15, 1),createCuboidShape(1, 0, 1,15, 16, 16)));}}; + protected static final Map FRIDGE_MIDDLE = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 0, -0.5,13, 16, 1),createCuboidShape(1, 0, 1,15, 16, 16)));}}; + protected static final Map FRIDGE_BOTTOM = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 2, -0.5,13, 16, 1),createCuboidShape(1, 1, 1,15, 16, 2),createCuboidShape(1, 0, 2,15, 16, 16)));}}; + protected static final Map FRIDGE = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(12, 1, -0.5, 13, 15, 1), createCuboidShape(1, 0, 1,15, 16, 2),createCuboidShape(1, -16, 2,15, 16, 16)));}}; - protected static final Map FRIDGE_SINGLE_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 1, 3,15.7, 16, 16),createCuboidShape(1.4, 2.5, -10.7,4.4, 5.5, 2.3),createCuboidShape(1.4, 9.5, -10.7,4.4, 12.5, 2.3),createCuboidShape(0.71, 0.1, 2.609,15.39, 15.8, 4.009),createCuboidShape(-1.228, 2.188, -10.481,-0.228, 14.188, -9.481),createCuboidShape(-0.338, 2.188, -10.481,1.662, 3.188, -9.481),createCuboidShape(-0.259, 13.188, -10.481,1.641, 14.188, -9.481),createCuboidShape(0.815, 1.01, -11.528,2.235, 16, -10.528),createCuboidShape(0.678, 1, -10.881,1.678, 16, 3.019),createCuboidShape(14.71, 0.064, 3.509,15.69, 1.139, 15.909),createCuboidShape(0.71, 0.064, 2.584,14.69, 1.139, 15.909)));}}; - protected static final Map FRIDGE_TOP_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(0.71, 0.1, 2.609,15.39, 15.8, 4.009),createCuboidShape(-1.228, 0.188, -10.481,-0.228, 15.188, -9.481),createCuboidShape(-0.259, 14.188, -10.481,1.641, 15.188, -9.481),createCuboidShape(0.815, 0, -11.528,2.235, 16, -10.528),createCuboidShape(0.678, 0, -10.881,1.678, 16, 3.019),createCuboidShape(1.4, 9.5, -10.7,4.4, 12.5, 2.3),createCuboidShape(1.4, 2.5, -10.7,4.4, 5.5, 2.3)));}}; - protected static final Map FRIDGE_MIDDLE_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(1.4, 9.5, -10.7,4.4, 12.5, 2.3),createCuboidShape(1.4, 2.5, -10.7,4.4, 5.5, 2.3),createCuboidShape(-1.228, 0.188, -10.481,-0.228, 16.188, -9.481),createCuboidShape(0.815, 0, -11.528,2.235, 16, -10.528),createCuboidShape(0.678, 0, -10.881,1.678, 16, 3.019),createCuboidShape(0.71, 0, 2.609,15.39, 16, 4.009),createCuboidShape(0.7, 0, 3,15.7, 16, 16)));}}; - protected static final Map FRIDGE_BOTTOM_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(-1.228, 2.188, -10.481,-0.228, 16.188, -9.481),createCuboidShape(-0.259, 2.188, -10.481,1.541, 3.188, -9.481),createCuboidShape(0.815, 1, -11.528,2.235, 16, -10.528),createCuboidShape(0.678, 1, -10.881,1.678, 16, 3.019),createCuboidShape(0.71, 0.1, 2.609,15.39, 15.988, 4.009),createCuboidShape(1.4, 9.5, -10.7,4.4, 12.5, 2.3),createCuboidShape(1.4, 2.5, -10.7,4.4, 5.5, 2.3)));}}; - protected static final Map FRIDGE_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(0.7, 0, 3,15.7, 16, 16),createCuboidShape(-1.2, 1.2, -10.5,-0.2, 15.2, -9.5),createCuboidShape(-0.3, 1.2, -10.5,1.7, 2.2, -9.5),createCuboidShape(-0.3, 14.2, -10.5,1.7, 15.2, -9.5),createCuboidShape(1, 1, -11.7,2, 16, -10.3),createCuboidShape(0.7, 1, -10.9,1.7, 16, 3)));}}; + protected static final Map FRIDGE_SINGLE_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 2, -10,1, 15, -9),createCuboidShape(1, 1, -12,3, 16, 3),createCuboidShape(1, 1, 3,15, 16, 16),createCuboidShape(1, 0, 2,15, 1, 16)));}}; + protected static final Map FRIDGE_TOP_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 0, -10,1, 15, -9),createCuboidShape(1, 0, -12,3, 16, 3),createCuboidShape(1, 0, 3,15, 16, 16)));}}; + protected static final Map FRIDGE_MIDDLE_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 0, -10,1, 16, -9),createCuboidShape(1, 0, -12,3, 16, 3),createCuboidShape(1, 0, 3,15, 16, 16)));}}; + protected static final Map FRIDGE_BOTTOM_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(-0.5, 2, -10, 1, 16, -9),createCuboidShape(1, 1, -12,3, 16, 3),createCuboidShape(1, 1, 3,15, 16, 16),createCuboidShape(1, 0, 2,15, 1, 16)));}}; + protected static final Map FRIDGE_OPEN = new HashMap<>(){{put(Direction.NORTH, VoxelShapes.union(createCuboidShape(1, 1, -12,3, 16, 2),createCuboidShape(-0.5, 1, -10,1, 15, -9),createCuboidShape(2, 0, 1,15, 1, 2),createCuboidShape(1, -16, 2,15, 16, 16)));}}; @Override diff --git a/common/src/main/resources/assets/pfm/blockstates/iron_freezer.json b/common/src/main/resources/assets/pfm/blockstates/iron_freezer.json index 60d1dc95e..d23a022f4 100644 --- a/common/src/main/resources/assets/pfm/blockstates/iron_freezer.json +++ b/common/src/main/resources/assets/pfm/blockstates/iron_freezer.json @@ -1,14 +1,14 @@ {"variants": { - "facing=north,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":180,"uvlock":"true"}, - "facing=east,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":270,"uvlock":"true"}, - "facing=south,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":0,"uvlock":"true"}, - "facing=west,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":90,"uvlock":"true"}, + "facing=north,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":180,"uvlock":"false"}, + "facing=east,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":270,"uvlock":"false"}, + "facing=south,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":0,"uvlock":"false"}, + "facing=west,open=false":{"model":"pfm:block/iron_fridge/iron_freezer","y":90,"uvlock":"false"}, - "facing=north,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":180,"uvlock":"true"}, - "facing=east,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":270,"uvlock":"true"}, - "facing=south,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":0,"uvlock":"true"}, - "facing=west,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":90,"uvlock":"true"} + "facing=north,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":180,"uvlock":"false"}, + "facing=east,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":270,"uvlock":"false"}, + "facing=south,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":0,"uvlock":"false"}, + "facing=west,open=true":{"model":"pfm:block/iron_fridge/iron_freezer_open","y":90,"uvlock":"false"} } } diff --git a/common/src/main/resources/assets/pfm/blockstates/iron_fridge.json b/common/src/main/resources/assets/pfm/blockstates/iron_fridge.json index 5517182cf..a79d38395 100644 --- a/common/src/main/resources/assets/pfm/blockstates/iron_fridge.json +++ b/common/src/main/resources/assets/pfm/blockstates/iron_fridge.json @@ -1,9 +1,9 @@ {"variants": { - "facing=north":{"model":"pfm:block/iron_fridge","y":180,"uvlock":"true"}, - "facing=east":{"model":"pfm:block/iron_fridge","y":270,"uvlock":"true"}, - "facing=south":{"model":"pfm:block/iron_fridge","y":0,"uvlock":"true"}, - "facing=west":{"model":"pfm:block/iron_fridge","y":90,"uvlock":"true"} + "facing=north":{"model":"pfm:block/iron_fridge","y":180,"uvlock":"false"}, + "facing=east":{"model":"pfm:block/iron_fridge","y":270,"uvlock":"false"}, + "facing=south":{"model":"pfm:block/iron_fridge","y":0,"uvlock":"false"}, + "facing=west":{"model":"pfm:block/iron_fridge","y":90,"uvlock":"false"} } } diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer.json index d8f43e1f8..ceac884cd 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer.json @@ -1,234 +1,81 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "base", - "from": [0.7, 0, 3], - "to": [15.7, 2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [3, 13, -0.5], + "to": [13, 14, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 15, 2], "texture": "#base"}, - "east": {"uv": [0, 14, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [3, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.7, 15, 3], - "to": [13.7, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [3, 13, 0.96875], + "to": [13, 14, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 15], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0"} } }, { - "name": "door", - "from": [1.7, 14, 0.09375], - "to": [14.7, 15, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13, 13, -0.5], + "to": [13, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13, 1], "rotation": 180, "texture": "#legs"} + "east": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"}, + "west": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"} } }, { - "name": "door", - "from": [13.7, 14, 0.98438], - "to": [14.7, 15, 2.98438], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [3, 13, -0.5], + "to": [3, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"} + "east": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"}, + "west": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"} } }, { - "name": "bulk", - "from": [0.7, 2, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [1, 1, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 3.5, 3.25, 3.75], "texture": "#0"} } }, { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13.43684, 1, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 8.5, 1.85247]}, "faces": { - "north": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0"} } }, { - "name": "bulk", - "from": [13.7, 2, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, "faces": { - "north": {"uv": [0, 1, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 15], "texture": "#base"}, - "south": {"uv": [2, 1, 0, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 0.975, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.95], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.95], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.95], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.95], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 0.95, 2.60938], - "to": [1.69, 15.949, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.71, 0.975, 2.60938], - "to": [14.69, 15.965, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "base", - "from": [0.71875, 0.01563, 2.98438], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, - "faces": { - "north": {"uv": [0, 0, 14.78125, 0.98438], "texture": "#legs"}, - "east": {"uv": [0, 0, 12.85938, 0.98438], "texture": "#legs"}, - "south": {"uv": [0, 0, 14.78125, 0.98438], "texture": "#legs"}, - "west": {"uv": [0, 15.01563, 12.85938, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 14.78125, 12.85938], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 14.78125, 12.85938], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.94375, 1, 5.03313], - "to": [24.94375, 15.99, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 1, 1.42, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.42, 15], "texture": "#base"}, - "up": {"uv": [4, 0, 5.42, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 1, 2], - "to": [14.6, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [2.1, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.9, 15], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.7, 14, 1.0625], - "to": [2.7, 15, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.60625, 0.025, 5.45938], - "to": [24.60625, 15.024, 6.64063], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.975], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.18125, 15.975], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.975], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.18125, 15.975], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.18125], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.18125], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.2, 0.99, 15.01563], - "to": [15.2, 15.99, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 4, 3.5, 8], "texture": "#0"}, + "south": {"uv": [0, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4, 7, 8], "texture": "#0"}, + "up": {"uv": [10.5, 7, 7, 3.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} } } ], @@ -244,137 +91,55 @@ "scale": [0.25, 0.25, 0.25] }, "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], "scale": [0.25, 0.25, 0.25] }, "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], "scale": [0.25, 0.25, 0.25] }, "ground": { - "translation": [0, -1.75, 0], + "translation": [0, 1, 0], "scale": [0.26, 0.26, 0.26] }, "gui": { "rotation": [30, -135, 0], - "translation": [0.5, -1, 0], + "translation": [0.5, -3, 0], "scale": [0.41, 0.41, 0.41] - }, - "head": { - "translation": [0, -15.25, 0] - }, - "fixed": { - "translation": [0, -0.25, -2.75], - "scale": [0.66, 0.66, 0.66] } }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, { - "name": "freezer", - "origin": [0, 0, 0], + "name": "bottom", + "origin": [15.5, 0, 16], "color": 0, "children": [ { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [ - 10, - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [ - 11, - 12, - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [13] - } - ] - }, - 14 - ] + "children": [0, 1, 2, 3] }, - 15 - ] - }, - { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "group", + "origin": [15.5, 0, 16], "color": 0, - "children": [] + "children": [4, 5, 6] } ] }, { - "name": "group", - "origin": [16.1, -16, 16], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - } - ] - }, - { - "name": "freezer", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - } - ] + "children": [] } ] } diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer_open.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer_open.json index d761f288a..e2c3d393b 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_freezer_open.json @@ -1,470 +1,284 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "base", - "from": [0.7, 0, 3], - "to": [15.7, 2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [3, 13, -3.5], + "to": [13, 14, -3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, -2.76562]}, "faces": { - "north": {"uv": [0, 0, 15, 2], "texture": "#base"}, - "east": {"uv": [0, 14, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [1, 14, 14, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.7, 15, 3], - "to": [13.7, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [3, 13, -2.03125], + "to": [13, 14, -2.03125], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, -2.76562]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 15], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [0.7, 2, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13, 13, -3.5], + "to": [13, 14, -2], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, -2.76562]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [1, 1, 14, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} + "east": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "west": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13.43684, 1, -1.63972], + "to": [14.86028, 16, -0.64753], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 8.5, -1.14753]}, "faces": { - "north": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [13.7, 2, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [1, 1, -2], + "to": [14, 16, -1], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 10]}, "faces": { - "north": {"uv": [0, 1, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 15], "texture": "#base"}, - "south": {"uv": [2, 0, 0, 14], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "north"}, + "down": {"uv": [0, 3.5, 3.25, 3.75], "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [1.2, 0.99, 15.01563], - "to": [15.2, 15.99, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [1, 1, -1], + "to": [15, 16, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 11]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "south": {"uv": [6.75, 11.75, 3.5, 15.5], "texture": "#0", "cullface": "north"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [8, 10.75, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "north"}, + "down": {"uv": [0, 3.5, 3.25, 3.75], "texture": "#0", "cullface": "north"} } }, { - "name": "door", - "from": [23.60625, 0.025, 5.45938], - "to": [24.60625, 15.024, 6.64063], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.975], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.18125, 15.975], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.975], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.18125, 15.975], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.18125], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.18125], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "base", - "from": [0.71875, 0.01563, 2.98438], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, + "from": [3, 13, -3.5], + "to": [3, 14, -2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 13.5, -2.76562]}, "faces": { - "north": {"uv": [0, 0, 14.78125, 0.98438], "texture": "#legs"}, - "east": {"uv": [0, 0, 12.85938, 0.98438], "texture": "#legs"}, - "south": {"uv": [0, 0, 14.78125, 0.98438], "texture": "#legs"}, - "west": {"uv": [0, 15.01563, 12.85938, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 14.78125, 12.85938], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 14.78125, 12.85938], "rotation": 180, "texture": "#legs"} + "east": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "west": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"} } }, { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 0.975, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 0.95], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.95], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.95], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.95], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 0.95, 2.60938], - "to": [1.69, 15.949, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [14, 0, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, "faces": { - "north": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 0.25, 4], "texture": "#0"}, + "east": {"uv": [7, 4, 3.75, 8], "texture": "#0"}, + "south": {"uv": [3.25, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.75, 4, 7, 8], "texture": "#0"}, + "up": {"uv": [10.5, 7, 10.25, 3.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.25, 3.5], "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [13.71, 0.975, 2.60938], - "to": [14.69, 15.965, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [2, 0, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, "faces": { - "north": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [3.75, 0, 6.75, 4], "texture": "#0"}, + "south": {"uv": [0.25, 4, 3.25, 8], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10.25, 3.75, 7.25, 3.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.25, 0, 7.25, 0.25], "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [11.6019, 1, 2.23888], - "to": [12.6019, 16, 3.65888], - "rotation": {"angle": 45, "axis": "y", "origin": [8.47361, 11.5, -2.29506]}, + "from": [2, 15, 3], + "to": [14, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 1, 1.42, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.42, 15], "texture": "#base"}, - "up": {"uv": [4, 0, 5.42, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 3, 0.25], "texture": "#0"}, + "up": {"uv": [10.25, 6.75, 7.25, 3.75], "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.25, 3.75, 7.25, 6.75], "texture": "#0"} } }, { - "name": "door", - "from": [0.7, 1, -2], - "to": [14.6, 16, -1], - "rotation": {"angle": 0, "axis": "y", "origin": [8.47361, 11.5, -2.29506]}, + "from": [2, 0, 3], + "to": [14, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -15, 14]}, "faces": { - "north": {"uv": [2.1, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.9, 15], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0.25, 7.75, 3.25, 8], "texture": "#0"}, + "up": {"uv": [10.25, 6.75, 7.25, 3.75], "texture": "#0"}, + "down": {"uv": [10.25, 0.25, 7.25, 3.5], "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [1.7, 14, -2.9375], - "to": [2.7, 15, -0.9375], - "rotation": {"angle": 0, "axis": "y", "origin": [8.47361, 11.5, -2.29506]}, + "from": [1, 0, 3], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [3, 0, 3.25, 4], "texture": "#0"}, + "east": {"uv": [7, 4, 3.75, 8], "texture": "#0"}, + "south": {"uv": [3.25, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.75, 4, 7, 8], "texture": "#0"}, + "up": {"uv": [7.25, 7, 7, 3.5], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 0, 7, 3.5], "texture": "#0", "cullface": "down"} } }, { "name": "door", - "from": [1.71875, 14, -3.9375], - "to": [14.21875, 15, -2.9375], - "rotation": {"angle": 0, "axis": "y", "origin": [8.47361, 11.5, -2.29506]}, + "from": [13.99, 10.975, -0.09062], + "to": [13.99, 12.075, 14.90938], + "rotation": {"angle": 0, "axis": "y", "origin": [27.9, 0, 17.3]}, "faces": { - "north": {"uv": [0, 0, 12.5, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 12.5, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 12.5, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 12.5, 1], "rotation": 180, "texture": "#legs"} + "east": {"uv": [7.25, 2, 10.25, 2.275], "texture": "#0"}, + "west": {"uv": [7.25, 2, 10.25, 2.275], "texture": "#0"} } }, { "name": "door", - "from": [13.2, 14, -2.96875], - "to": [14.2, 15, -0.96875], - "rotation": {"angle": 0, "axis": "y", "origin": [8.47361, 11.5, -2.29506]}, + "from": [2.09, 10.975, -0.09062], + "to": [2.09, 12.075, 14.90938], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 17.3]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} + "east": {"uv": [7.25, 2, 10.25, 2.275], "texture": "#0"}, + "west": {"uv": [7.25, 2, 10.25, 2.275], "texture": "#0"} } }, { "name": "door", - "from": [13.21, 10.975, -1.39062], - "to": [14.19, 12.075, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [2.1, 1, 3], + "to": [13.9, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [27.9, -23, 20]}, "faces": { - "north": {"uv": [0, 0, 0.98, 1.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 5, 1.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 1.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 5, 1.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 5], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 5], "rotation": 180, "texture": "#legs"} + "north": {"uv": [3.75, 1.25, 6.75, 2], "texture": "#0"}, + "east": {"uv": [0.75, 0.5, 2.25, 1.25], "texture": "#0"}, + "south": {"uv": [0, 0.25, 0.25, 1], "texture": "#0"}, + "west": {"uv": [0.75, 0.5, 2.25, 1.25], "texture": "#0"} } }, { "name": "door", - "from": [1.21, 10.975, -1.39062], - "to": [2.19, 12.075, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13.9, 5, 0.5], + "to": [2.1, 8, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [39.7, -19, 17.5]}, "faces": { - "north": {"uv": [0, 0, 0.98, 1.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 5, 1.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 1.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 5, 1.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 5], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 5], "rotation": 180, "texture": "#legs"} + "north": {"uv": [3.75, 1.25, 6.75, 2], "texture": "#0"}, + "south": {"uv": [0, 0.25, 0.25, 1], "texture": "#0"}, + "down": {"uv": [3.75, 0.75, 6.75, 2.25], "rotation": 180, "texture": "#0"} } }, { "name": "door", - "from": [1.2, 8, -1], - "to": [2.2, 11, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2.1, 5, 0.5], + "to": [13.9, 8, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [27.9, -19, 17.5]}, "faces": { - "north": {"uv": [1, 1, 2, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 6, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 1, 6, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 1.1, 6], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 7], "rotation": 180, "texture": "#base"} + "north": {"uv": [3.75, 1.25, 6.75, 2], "texture": "#0"}, + "east": {"uv": [0.75, 0.5, 2.25, 1.25], "texture": "#0"}, + "south": {"uv": [0, 0.25, 0.25, 1], "texture": "#0"}, + "west": {"uv": [0.75, 0.5, 2.25, 1.25], "texture": "#0"}, + "down": {"uv": [3.75, 0.75, 6.75, 2.25], "rotation": 180, "texture": "#0"} } }, { "name": "door", - "from": [2.2, 8, 4], - "to": [13.2, 11, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [13.9, 5, 0.5], + "to": [2.1, 8, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [39.7, -19, 17.5]}, "faces": { - "north": {"uv": [1, 1, 12, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 11, 4], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 11.1, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 11, 2], "rotation": 180, "texture": "#base"} + "north": {"uv": [3.75, 1.25, 6.75, 2], "texture": "#0"}, + "south": {"uv": [0, 0.25, 0.25, 1], "texture": "#0"}, + "down": {"uv": [3.75, 0.75, 6.75, 2.25], "rotation": 180, "texture": "#0"} } }, { "name": "door", - "from": [13.2, 8, -1], - "to": [14.2, 11, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2.1, 8, 3.5], + "to": [13.9, 11, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [27.9, -16, 20.5]}, "faces": { - "north": {"uv": [1, 1, 2, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 6, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "west": {"uv": [0, 1, 6, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 1.1, 6], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 7], "rotation": 180, "texture": "#base"} + "north": {"uv": [3.75, 1.25, 6.75, 2], "texture": "#0"}, + "east": {"uv": [0.75, 0.5, 2.25, 1.25], "texture": "#0"}, + "south": {"uv": [0, 0.25, 0.25, 1], "texture": "#0"}, + "west": {"uv": [0.75, 0.5, 2.25, 1.25], "texture": "#0"}, + "down": {"uv": [3.75, 0.75, 6.75, 2.25], "rotation": 180, "texture": "#0"} } }, { "name": "door", - "from": [2.2, 7, -1], - "to": [13.2, 8, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [13.9, 8, 3.5], + "to": [2.1, 11, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [39.7, -16, 20.5]}, "faces": { - "north": {"uv": [1, 1, 12, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 6, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 6, 2], "texture": "#base"}, - "up": {"uv": [0.1, 0, 11.1, 6], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 11, 7], "rotation": 180, "texture": "#base"} + "north": {"uv": [3.75, 1.25, 6.75, 2], "texture": "#0"}, + "south": {"uv": [0, 0.25, 0.25, 1], "texture": "#0"}, + "down": {"uv": [3.75, 0.75, 6.75, 2.25], "rotation": 180, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, -15.25, 0] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, { - "name": "freezer", - "origin": [0, 0, 0], + "name": "bottom", + "origin": [15.5, 0, 16], "color": 0, "children": [ { - "name": "top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [] + "children": [0, 1, 2, 3, 4, 5, 6] }, { - "name": "bottom", - "origin": [0, 0, 0], + "name": "group", + "origin": [15.5, 0, 16], "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [ - 11, - 12, - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [13, 14, 15] - } - ] - }, - 16, - 17, - 18, - 19, - 20, - 21 - ] + "children": [7, 8, 9, 10, 11] } ] }, { - "name": "door_refrigerator", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, "children": [] } ] }, + 12, + 13, { "name": "group", "origin": [16.1, -16, 16], "color": 0, - "children": [ - { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - } - ] - }, - { - "name": "freezer", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - } - ] - } - ] + "children": [14, 15] + }, + { + "name": "group", + "origin": [16.1, -16, 16], + "color": 0, + "children": [16, 17] + }, + { + "name": "group", + "origin": [16.1, -16, 16], + "color": 0, + "children": [18, 19] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge.json index 88f8ebb42..d1a9700a3 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge.json @@ -1,326 +1,98 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 1, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 1, -0.5], + "to": [13, 15, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, -0.01562]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [3, 0, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 15, -0.5], + "to": [13, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} } }, { - "name": "bulk", - "from": [13.7, 1, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 1, -0.5], + "to": [13, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 7, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} } }, { - "name": "base", - "from": [0.7, 0, 3], - "to": [15.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 1, 0.96875], + "to": [13, 15, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "east": {"uv": [0, 4, 13, 5], "texture": "#base"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "west": {"uv": [3, 4, 16, 5], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0"} } }, { "name": "base", - "from": [1.7, 15, 3], - "to": [13.7, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.71, 14.7, 2.60938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -11, 14]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [6.75, 12, 10, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "west": {"uv": [7, 7.25, 7.25, 11.25], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"} } }, { - "name": "door", - "from": [23.60625, 0, 5.45938], - "to": [24.60625, 15.7, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [13.43684, 0, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 1.5, 1.85247]}, "faces": { - "north": {"uv": [0, 0, 1, 15.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7, 7.25, 7.35586, 11.25], "texture": "#0"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"} } }, { "name": "bulk", - "from": [1.2, 0, 15.01563], - "to": [15.2, 15, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [13.2, 1.1875, 0.09375], - "to": [14.2, 15.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 1.1875, 0.98438], - "to": [14.2, 2.1875, 2.98438], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 14.1875, 1.0625], - "to": [14.2, 15.1875, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.94375, 1, 5.03313], - "to": [24.94375, 15.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 1, 14.999], "texture": "#base"}, - "east": {"uv": [0, 0, 1.42, 14.999], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 14.999], "texture": "#base"}, - "west": {"uv": [0, 0, 1.42, 14.999], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 1, 2], - "to": [14.6, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 0, 14.9, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.9, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 12.5, 3.5, 15.5], "texture": "#0"}, + "east": {"uv": [3.5, 9, 0, 13], "texture": "#0"}, + "south": {"uv": [3.5, 0, 7, 4], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0, 9, 3.5, 13], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - { - "name": "freezer", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - }, - 9 - ] - }, - 10 - ] - }, { - "name": "door_refrigerator", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [11, 12, 13] + "children": [0, 1, 2, 3] }, - 14, - 15 + 4, + 5, + 6 ] } ] diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom.json index bd1cee7cd..eaa4e7f54 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom.json @@ -1,379 +1,92 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "door", - "from": [13.2, 2.1875, 0.09375], - "to": [14.2, 16.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 2, -0.5], + "to": [13, 16, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, -0.01562]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} + "north": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} } }, { - "name": "door", - "from": [13.2, 2.1875, 1.0625], - "to": [14.2, 3.1875, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 2, -0.5], + "to": [13, 2, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} } }, { - "name": "door", - "from": [23.94375, 1, 5.03313], - "to": [24.94375, 12.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 2, 0.96875], + "to": [13, 16, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, 0.48438]}, "faces": { - "north": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "east": {"uv": [0, 4.001, 1.42, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.94375, 13, 5.03313], - "to": [24.94375, 15.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "east": {"uv": [0, 3, 1.42, 5.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "up": {"uv": [1.5, 0, 2.92, 1], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 13, 2], - "to": [14.6, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 1, 14.9, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 13.9, 4], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 14, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 13.9, 2], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 1, 2], - "to": [14.6, 13, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 4, 14.9, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 13], "texture": "#base"}, - "south": {"uv": [0, 1, 13.9, 13], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 13], "texture": "#base"}, - "up": {"uv": [0, 1, 13.9, 2], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 0, 14.9, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.2, 1, 15.01563], - "to": [15.2, 1.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 14, 14, 14.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.7, 0, 3], - "to": [1.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "west": {"uv": [3, 3, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 1, 16], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 1, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [13.7, 0, 3], - "to": [15.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 3, 2, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [14, 3, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0"} } }, { "name": "base", - "from": [0.7, 13, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 4, 15, 7], "texture": "#base"}, - "east": {"uv": [0, 4, 13, 7], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#base"}, - "west": {"uv": [3, 3, 16, 6], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 16, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 0, 3], - "to": [13.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.71, 14.7, 2.60938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 1, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -11, 14]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [6.75, 12, 10, 15.75], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [7, 7.25, 7.25, 11], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [3.5, 0, 6.75, 0.25], "rotation": 180, "texture": "#0"} } }, { - "name": "door", - "from": [23.60625, 0.001, 5.45938], - "to": [24.60625, 15.7, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [13.43684, 1, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 1.5, 1.85247]}, "faces": { - "north": {"uv": [0, 0, 1, 15.699], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.699], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.699], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.699], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7, 7.25, 7.35586, 11], "texture": "#0"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 10.75, 7.35586, 10.99805], "texture": "#0"} } }, { "name": "bulk", - "from": [1.2, 2.001, 15.01563], - "to": [15.2, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 13.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1.2, 14, 15.01563], - "to": [15.2, 15.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [0, 12.5, 3.5, 15.5], "texture": "#0"}, + "east": {"uv": [13.5, 11.25, 10, 15.25], "texture": "#0"}, + "south": {"uv": [0, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 11.25, 13.5, 15.25], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 0, 10.5, 3.5], "rotation": 180, "texture": "#0", "cullface": "down"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ { - "name": "group", - "origin": [16.1, -16, 16], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1] - }, - 2, - 3, - 4, - 5 - ] - }, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - { - "name": "freezer", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - } - ] + "children": [0, 1, 2] }, - 17, - 18 + 3, + 4, + 5 ] } ] diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom_open.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom_open.json index 25750f33b..328fe9ee7 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_bottom_open.json @@ -1,547 +1,180 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 0, 3], - "to": [1.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "west": {"uv": [3, 3, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 1, 16], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 1, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [-0.5, 2, -10], + "to": [-0.5, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} + "east": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} } }, { - "name": "bulk", - "from": [13.7, 0, 3], - "to": [15.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [-0.5, 2, -10], + "to": [1, 2, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 1.48438]}, "faces": { - "north": {"uv": [0, 3, 2, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [14, 3, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} } }, { "name": "base", - "from": [1.7, 15, 3], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 1, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [2, 4, 14, 5], "texture": "#base"}, - "east": {"uv": [0, 4, 13, 7], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#base"}, - "west": {"uv": [3, 3, 16, 6], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 16, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [6.75, 12, 10, 15.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 3.5, 10.5, 3.75], "rotation": 270, "texture": "#0"} } }, { "name": "base", - "from": [13.7, 13, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 4, 2, 7], "texture": "#base"}, - "east": {"uv": [0, 4, 13, 7], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#base"}, - "west": {"uv": [3, 3, 16, 6], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 16, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.7, 13, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 4, 1, 7], "texture": "#base"}, - "east": {"uv": [0, 4, 13, 7], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "west": {"uv": [3, 3, 16, 6], "texture": "#base"}, - "up": {"uv": [15, 2, 16, 15], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 0, 3], - "to": [13.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 16, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2, 1, -12], + "to": [3, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7, 7.25, 7.35586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.5, 12, 10, 15.75], "texture": "#0"}, + "south": {"uv": [7, 7.25, 7.25, 11.25], "texture": "#0"}, + "west": {"uv": [6.75, 12, 10.25, 15.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [7, 6.75, 10.75, 7], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 3.5, 10.5, 3.75], "rotation": 270, "texture": "#0"} } }, { - "name": "door", - "from": [-1.2282, 2.1875, -10.48083], - "to": [-0.2282, 16.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.59375, 2.52056]}, + "from": [9.84485, 1, -7.34063], + "to": [11.26829, 16, -6.34844], + "rotation": {"angle": 45, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7, 7.25, 7.35586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7.25, 3.5, 7.60586, 3.74805], "texture": "#0", "cullface": "north"} } }, { - "name": "door", - "from": [-0.25945, 2.1875, -10.48083], - "to": [1.54055, 3.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.59375, 2.52056]}, + "from": [0.99, 2, -10], + "to": [0.99, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 1, 1.8], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1.8], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1.8, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1.8, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [10.0657, 1, -6.76298], - "to": [11.4857, 12.999, -5.76298], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 8.59375, 2.52056]}, - "faces": { - "north": {"uv": [0, 4.001, 1.42, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [10.0657, 13, -6.76298], - "to": [11.4857, 15.999, -5.76298], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 8.59375, 2.52056]}, - "faces": { - "north": {"uv": [0, 3, 1.42, 5.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "up": {"uv": [1.5, 0, 2.92, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.67805, 13, -10.88083], - "to": [1.67805, 16, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.59375, 2.52056]}, - "faces": { - "north": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 13.9, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "west": {"uv": [1, 1, 14.9, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 14, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 13.9, 2], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.67805, 1, -10.88083], - "to": [1.67805, 13, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.59375, 2.52056]}, - "faces": { - "north": {"uv": [0, 1, 1, 13], "texture": "#base"}, - "east": {"uv": [0, 1, 13.9, 13], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 13], "texture": "#base"}, - "west": {"uv": [1, 4, 14.9, 16], "texture": "#base"}, - "up": {"uv": [0, 1, 13.9, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 0, 14.9, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.60625, 0.001, 5.45938], - "to": [24.60625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.999], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.999], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.999], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.999], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} } }, { "name": "bulk", - "from": [1.2, 2.001, 15.01563], - "to": [15.2, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 13.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [0.25, 9, 0.5, 12.75], "texture": "#0"}, + "east": {"uv": [13.5, 11.25, 10.25, 15], "texture": "#0"}, + "south": {"uv": [13.75, 1.25, 14, 5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.25, 11.25, 13.5, 15], "texture": "#0"}, + "up": {"uv": [7, 3.5, 7.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"} } }, { "name": "bulk", - "from": [1.2, 14, 15.01563], - "to": [15.2, 15.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2, 15, 3], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [0.5, 9, 3.5, 9.25], "texture": "#0"}, + "south": {"uv": [10.75, 0.5, 13.75, 0.75], "texture": "#0", "cullface": "south"}, + "up": {"uv": [7.25, 3.5, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.75, 1.5, 13.75, 5], "rotation": 180, "texture": "#0"} } }, { "name": "bulk", - "from": [1.2, 1, 15.01563], - "to": [15.2, 1.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 14, 14, 14.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "base", - "from": [1.7, 9.5, 3.6], - "to": [13.7, 10.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 4.5, 3.6], - "to": [13.7, 5.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [2, 1, 15], + "to": [14, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -17, 15]}, "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} + "north": {"uv": [10.75, 1.5, 13.75, 5], "texture": "#0"}, + "south": {"uv": [10.75, 1.5, 13.75, 5], "texture": "#0", "cullface": "south"} } }, { - "name": "base", - "from": [1, 2.5, -10.7], - "to": [4.4, 3.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3.5, -10.7], - "to": [4.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3.5, -10.7], - "to": [3.4, 5.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 3.5, 1.3], - "to": [3.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [2, 0, 2], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0.25, 15.25, 3.25, 15.5], "texture": "#0"}, + "east": {"uv": [13.5, 15, 10, 15.25], "texture": "#0"}, + "south": {"uv": [10.75, 5, 13.75, 5.25], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10.5, 1.75, 13.75, 5.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 0, 10, 3.25], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1, 0, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "north": {"uv": [6.75, 4, 7, 8], "texture": "#0"}, + "east": {"uv": [13.5, 11.25, 10, 15.25], "texture": "#0"}, + "south": {"uv": [13.75, 1.25, 14, 5.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 11.25, 13.5, 15.25], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 0, 10.5, 3.5], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1.5, 5, 4], + "to": [14.5, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 9]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 2, 3.25, 2.25], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } }, { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1.5, 10, 4], + "to": [14.5, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.5, 9]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - { - "name": "freezer", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - } - ] - }, { - "name": "door_refrigerator", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [10, 11] + "children": [0, 1, 2, 3, 4, 5] }, - 12, - 13, - 14, - 15 + 6, + 7, + 8, + 9, + 10 ] }, - 16, - 17, - 18, - 19, - 20, - 21, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [ - 22, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [23, 24, 25, 26] - }, - 27, - 28, - 29 - ] - } + 11, + 12 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_full.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_full.json index e397b25fd..b68e235db 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_full.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_full.json @@ -1,472 +1,149 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "base", - "from": [0.7, 0, 3], - "to": [15.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.7, 14, 0.09375], - "to": [14.7, 15, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.7, 14, 0.98438], - "to": [14.7, 15, 2.98438], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [0.7, 17, 3], - "to": [1.7, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [3, 0, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [0.7, 1, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.7, 17, 15], - "to": [13.7, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [13.7, 1, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [3, 13, -0.5], + "to": [13, 14, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [14, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [2, 1, 15, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [13.7, 17, 3], - "to": [15.7, 32, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [3, 13, 0.96875], + "to": [13, 14, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0.25, 13, 0.5], "texture": "#0"} } }, { - "name": "base", - "from": [0.7, 16, 3], - "to": [15.7, 17, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13, 13, -0.5], + "to": [13, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "east": {"uv": [0, 9, 13, 10], "texture": "#base"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "west": {"uv": [3, 3, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"} + "east": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"}, + "west": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"} } }, { - "name": "base", - "from": [1.7, 31, 3], - "to": [13.7, 32, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [3, 13, -0.5], + "to": [3, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 13.5, 0.23438]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [3, 1, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#base"} + "east": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"}, + "west": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0"} } }, { - "name": "door", - "from": [0.71, 30.7, 2.60938], - "to": [14.69, 31.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [1, 1, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [3.5, 11.75, 6.75, 15.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "down": {"uv": [0, 3.5, 3.25, 3.75], "texture": "#0"} } }, { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 0.975, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13.43684, 1, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 8.5, 1.85247]}, "faces": { - "north": {"uv": [0, 0, 13.98, 0.95], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 0.95], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 0.95], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 0.95], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7.5, 7, 7.85586, 10.75], "texture": "#0"}, + "east": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "west": {"uv": [7, 7, 7.24805, 10.75], "texture": "#0"}, + "down": {"uv": [7, 7, 7.35586, 7.24805], "texture": "#0"} } }, { - "name": "door", - "from": [0.71, 16.025, 2.60938], - "to": [14.69, 17.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 3.5, 4], "texture": "#0"}, + "east": {"uv": [7, 4, 3.5, 8], "texture": "#0"}, + "south": {"uv": [0, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [3.5, 4, 7, 8], "texture": "#0"}, + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [13.71, 17, 2.60938], - "to": [14.69, 30.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [12, 17, -0.5], + "to": [13, 31, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 21, -0.01562]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} } }, { - "name": "door", - "from": [0.71, 17, 2.60938], - "to": [1.69, 30.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [12, 31, -0.5], + "to": [13, 31, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 24, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} } }, { - "name": "door", - "from": [0.71, 0.95, 2.60938], - "to": [1.69, 16.05, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [12, 17, -0.5], + "to": [13, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 23, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0", "cullface": "up"} } }, { - "name": "door", - "from": [13.71, 0.975, 2.60938], - "to": [14.69, 16.075, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [12, 17, 0.96875], + "to": [13, 31, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 21, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 15.1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15.1], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "up"} } }, { "name": "base", - "from": [0.71875, 0.01563, 2.98438], - "to": [15.5, 1, 15.84375], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 2, 29.42188]}, + "from": [1, 16, 1], + "to": [14, 32, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 5, 14]}, "faces": { - "north": {"uv": [0, 0, 14.78125, 0.98438], "texture": "#legs"}, - "east": {"uv": [0, 0, 12.85938, 0.98438], "texture": "#legs"}, - "south": {"uv": [0, 0, 14.78125, 0.98438], "texture": "#legs"}, - "west": {"uv": [0, 0, 12.85938, 0.98438], "texture": "#legs"}, - "up": {"uv": [0, 0, 14.78125, 12.85938], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 14.78125, 12.85938], "rotation": 180, "texture": "#legs"} + "north": {"uv": [6.75, 12, 10, 16], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [7, 7.25, 7.25, 11.25], "texture": "#0", "cullface": "up"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"} } }, { - "name": "door", - "from": [23.94375, 1, 5.03313], - "to": [24.94375, 16, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [13.43684, 16, 1.36028], + "to": [14.86028, 32, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 17.5, 1.85247]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 1, 1.42, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.42, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 1, 2], - "to": [14.6, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [2.1, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.9, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [1.7, 14, 1.0625], - "to": [2.7, 15, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 2], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [1.71875, 14, 0.0625], - "to": [14.21875, 15, 1.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [19.35938, 3, 31]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 12.5, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 12.5, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 12.5, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 14, 1.03125], - "to": [14.2, 15, 3.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.60625, 16, 5.45938], - "to": [24.60625, 31.7, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.60625, 0.025, 5.45938], - "to": [24.60625, 16, 6.64063], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.975], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.18125, 15.975], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.975], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.18125, 15.975], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.18125], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.18125], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "bulk", - "from": [1.2, 1, 15.01563], - "to": [15.2, 16, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 15], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 1, 14, 15], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [7, 7.25, 7.35586, 11.25], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "up"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"} } }, { "name": "bulk", - "from": [1.2, 16, 15.01563], - "to": [15.2, 31, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, + "from": [1, 16, 2], + "to": [15, 32, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 0, 15]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [13.2, 17.1875, 0.09375], - "to": [14.2, 31.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 17.1875, 0.98438], - "to": [14.2, 18.1875, 2.98438], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 30.1875, 1.0625], - "to": [14.2, 31.1875, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.94375, 17, 5.03313], - "to": [24.94375, 31.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1.42, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1.42, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 17, 2], - "to": [14.6, 32, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, 0, 16]}, - "faces": { - "north": {"uv": [2.1, 0, 16, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 13.9, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 12.5, 3.5, 15.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [3.5, 9, 0, 13], "texture": "#0", "cullface": "up"}, + "south": {"uv": [3.5, 0, 7, 4], "texture": "#0", "cullface": "up"}, + "west": {"uv": [0, 9, 3.5, 13], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} } } ], @@ -482,17 +159,17 @@ "scale": [0.25, 0.25, 0.25] }, "firstperson_righthand": { - "rotation": [1, 19, 0], + "rotation": [1, 135, 0], "translation": [0.25, 0.25, 1], "scale": [0.25, 0.25, 0.25] }, "firstperson_lefthand": { - "rotation": [1, 19, 0], + "rotation": [1, 135, 0], "translation": [0.25, 0.25, 1], "scale": [0.25, 0.25, 0.25] }, "ground": { - "translation": [0, -1.75, 0], + "translation": [0, 0.75, 0], "scale": [0.26, 0.26, 0.26] }, "gui": { @@ -501,85 +178,49 @@ "scale": [0.41, 0.41, 0.41] }, "head": { - "translation": [0, -15.25, 0] + "rotation": [-1, 0, 0], + "translation": [0, 4.5, 0], + "scale": [0.93, 0.95, 0.92] }, "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] + "translation": [0, -4.75, -0.25], + "scale": [0.6, 0.6, 0.6] } }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, { - "name": "freezer", - "origin": [0, 0, 0], + "name": "bottom", + "origin": [15.5, 0, 16], "color": 0, "children": [ { - "name": "top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [] + "children": [0, 1, 2, 3] }, { - "name": "bottom", - "origin": [0, 0, 0], + "name": "group", + "origin": [15.5, 0, 16], "color": 0, - "children": [ - 18, - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [ - 19, - 20, - { - "name": "handle_bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [21, 22, 23] - } - ] - }, - 24, - 25 - ] - }, - 26, - 27 + "children": [4, 5, 6] + } ] }, { - "name": "door_refrigerator", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [28, 29, 30] + "children": [7, 8, 9, 10] }, - 31, - 32 + 11, + 12, + 13 ] } ] diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle.json index 0afab21b3..6e3b38a44 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle.json @@ -1,328 +1,83 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 0, 3], - "to": [1.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [13.7, 0, 3], - "to": [15.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 0, -0.5], + "to": [13, 16, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, -0.01562]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 2, 14], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [0.7, 13, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 0, 0.96875], + "to": [13, 16, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 15, 3], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 4], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 16, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0, 14.5, 0.25], "rotation": 270, "texture": "#0"} } }, { "name": "base", - "from": [1.7, 0, 3], - "to": [13.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -11, 14]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.75, 1, 14, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [7, 7.25, 7.25, 11], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [3.5, 0, 6.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [0.71, 14.7, 2.60938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [13.43684, 0, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 1.5, 1.85247]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7, 7, 7.35586, 11], "texture": "#0"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 10.75, 7.35586, 10.99805], "texture": "#0", "cullface": "down"} } }, { "name": "bulk", - "from": [1.2, 0.001, 15.01563], - "to": [15.2, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 14], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1.2, 14, 15.01563], - "to": [15.2, 15.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [13.2, 0.1875, 0.09375], - "to": [14.2, 16.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.94375, 0, 5.03313], - "to": [24.94375, 12.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.94375, 13, 5.03313], - "to": [24.94375, 15.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 13, 2], - "to": [14.6, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 1, 14.9, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 13.9, 4], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 14, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 13.9, 2], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 0, 2], - "to": [14.6, 13, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 1, 14.9, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 13.9, 14], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 13.9, 2], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 0, 14.9, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 12.5, 3.5, 15.5], "texture": "#0"}, + "east": {"uv": [13.5, 11, 10, 15], "texture": "#0"}, + "south": {"uv": [10.5, 1, 14, 5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 11, 13.5, 15], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 10.5, 3.5], "rotation": 180, "texture": "#0", "cullface": "down"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - { - "name": "freezer", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - }, - 9, - 10 - ] - }, { - "name": "door_refrigerator", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [11] + "children": [0, 1] }, - 12, - 13, - 14, - 15 + 2, + 3, + 4 ] } ] diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle_open.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle_open.json index 397d07d9a..e7c2d0cd5 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_middle_open.json @@ -1,480 +1,170 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 4.5, 3.6], - "to": [13.7, 5.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 9.5, 3.6], - "to": [13.7, 10.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 2.5, -10.7], - "to": [4.4, 3.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [-0.5, 0, -10], + "to": [-0.5, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6.4], "rotation": 270, "texture": "#base"} + "east": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} } }, { "name": "base", - "from": [3.4, 3.5, -10.7], - "to": [4.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [1, 0, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [10.75, 1, 14, 5], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 3.5, 10.5, 3.75], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { "name": "base", - "from": [1.4, 3.5, -10.7], - "to": [3.4, 5.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [2, 0, -12], + "to": [3, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 9, 1.48438]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [7, 7, 7.35586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.75, 0.5, 14, 4.5], "texture": "#0"}, + "south": {"uv": [7, 7.25, 7.25, 11.25], "texture": "#0"}, + "west": {"uv": [6.75, 12, 10.25, 15.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [7, 6.75, 10.75, 7], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 3.5, 10.5, 3.75], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [1.4, 3.5, 1.3], - "to": [3.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [9.84485, 0, -7.34063], + "to": [11.26829, 16, -6.34844], + "rotation": {"angle": 45, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [7, 7, 7.35586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7.25, 3.5, 7.60586, 3.74805], "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [0.99, 0, -10], + "to": [0.99, 16, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} } }, { "name": "bulk", - "from": [0.7, 0, 3], - "to": [1.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"} + "north": {"uv": [0.25, 9, 0.5, 12.75], "texture": "#0"}, + "east": {"uv": [13.5, 11.25, 10.25, 15], "texture": "#0"}, + "south": {"uv": [13.75, 1, 14, 4.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.25, 11.25, 13.5, 15], "texture": "#0"}, + "up": {"uv": [7, 3.5, 7.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"} } }, { "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2, 15, 3], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0.5, 9, 3.5, 9.25], "texture": "#0"}, + "south": {"uv": [10.75, 1, 13.75, 1.25], "texture": "#0", "cullface": "south"}, + "up": {"uv": [7.25, 3.5, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.75, 1.5, 13.75, 5], "rotation": 180, "texture": "#0"} } }, { "name": "bulk", - "from": [13.7, 0, 3], - "to": [15.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2, 1, 15], + "to": [14, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -17, 15]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 2, 14], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [0.7, 13, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 15, 3], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 4], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 16, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.75, 1.5, 13.75, 5], "texture": "#0"}, + "south": {"uv": [10.75, 1.25, 13.75, 4.75], "texture": "#0", "cullface": "south"} } }, { "name": "bulk", - "from": [1.2, 0.001, 15.01563], - "to": [15.2, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2, 0, 3], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 14], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [0.5, 12.75, 3.5, 13], "texture": "#0"}, + "east": {"uv": [13.5, 14.75, 10.25, 15], "texture": "#0"}, + "south": {"uv": [10.75, 4.75, 14, 5], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10.75, 1.5, 14, 5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 3.5, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { "name": "bulk", - "from": [1.2, 14, 15.01563], - "to": [15.2, 15.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 2, 14, 3.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [-1.2282, 0.1875, -10.48083], - "to": [-0.2282, 16.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 10.49975, 1.52056]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 15, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [9.35859, 0, -7.05587], - "to": [10.77859, 12.999, -6.05587], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 10.49975, 1.52056]}, - "faces": { - "north": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [9.35859, 13, -7.05587], - "to": [10.77859, 15.999, -6.05587], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 10.49975, 1.52056]}, - "faces": { - "north": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.67805, 13, -10.88083], - "to": [1.67805, 16, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 10.49975, 1.52056]}, + "from": [1, 0, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 13.9, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "west": {"uv": [1, 1, 14.9, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 14, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 13.9, 2], "rotation": 270, "texture": "#base"} + "east": {"uv": [13.5, 11.25, 10, 15.25], "texture": "#0"}, + "south": {"uv": [10.5, 1, 10.75, 5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 11, 13.5, 15], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [0.67805, 0, -10.88083], - "to": [1.67805, 13, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 10.49975, 1.52056]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13.9, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "west": {"uv": [1, 1, 14.9, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 13.9, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 0, 14.9, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 0, 3], - "to": [13.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [13.71, 0, 2.60938], - "to": [14.69, 15.95313, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "bulk", + "from": [1.5, 5, 4], + "to": [14.5, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 9]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 2, 3.25, 2.25], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } }, { - "name": "door", - "from": [23.60625, 0.001, 5.45938], - "to": [24.60625, 16, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -32, 16]}, + "name": "bulk", + "from": [1.5, 10, 4], + "to": [14.5, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.5, 9]}, "faces": { - "north": {"uv": [0, 0, 1, 15.999], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.999], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.999], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.999], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ { - "name": "group", - "origin": [16.1, -16, 16], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "group", - "origin": [4.2, 5, -4.2], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [ - 0, - 1, - 2, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [3, 4, 5, 6] - }, - 7, - 8, - 9 - ] + "children": [0, 1, 2, 3, 4] }, - 10, - 11, - 12, - 13, - { - "name": "freezer", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - }, - 14, - 15, - { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [16] - }, - 17, - 18, - 19, - 20 - ] - } - ] - }, - 21, - 22, - 23, - 24 + 5, + 6, + 7, + 8, + 9 ] - } + }, + 10, + 11 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_open.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_open.json index 5bd1da634..600b15170 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_open.json @@ -1,504 +1,363 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "particle": "block/iron_block", - "base": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 1, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [9.51842, 1, -7.20215], + "to": [10.94186, 16, -6.20996], + "rotation": {"angle": 45, "axis": "y", "origin": [0.68441, 8, 1.17623]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [7, 7.25, 7.35586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [7, 7.25, 7.24805, 11], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [1, 1, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0.68441, 8, 1.17623]}, "faces": { - "north": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [6.75, 12, 10, 15.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0"} } }, { - "name": "bulk", - "from": [13.7, 1, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [2, 1, -12], + "to": [3, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 0.25, 3.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.5, 12, 10, 15.75], "texture": "#0"}, + "south": {"uv": [7, 7.25, 7.25, 11.25], "texture": "#0"}, + "west": {"uv": [6.75, 12, 10.25, 15.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [7, 6.75, 10.75, 7], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 3.5, 10.5, 3.75], "rotation": 270, "texture": "#0"} } }, { - "name": "base", - "from": [0.7, 0, 3], - "to": [15.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [-0.5, 1, -10], + "to": [-0.5, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [0.68441, 8, 1.17623]}, "faces": { - "north": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 15, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"} + "east": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} } }, { - "name": "base", - "from": [1.7, 15, 3], - "to": [13.7, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [-0.5, 15, -10], + "to": [1, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [0.68441, 8, 1.17623]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.7, 9.5, 3.6], - "to": [13.7, 10.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [-0.5, 1, -10], + "to": [1, 1, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [0.68441, 8, 1.17623]}, "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.7, 4.5, 3.6], - "to": [13.7, 5.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [0.99, 1, -10], + "to": [0.99, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [0.68441, 8, 1.17623]}, "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [14, 0, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} + "north": {"uv": [0.25, 9, 0.5, 13], "texture": "#0"}, + "east": {"uv": [3.5, 9, 0.25, 13], "texture": "#0"}, + "south": {"uv": [6.75, 0, 7, 4], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0.25, 9, 3.5, 13], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [3.5, 12.75, 0.25, 13], "rotation": 90, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [1, 2.5, -10.7], - "to": [4.4, 3.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1, 0, 1], + "to": [2, 1, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, -20, 15]}, "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6.4], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 12.75, 0.25, 13], "texture": "#0"}, + "west": {"uv": [0, 12.75, 0.5, 13], "texture": "#0"}, + "down": {"uv": [0, 12.75, 0.5, 13], "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [3.4, 3.5, -10.7], - "to": [4.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [14, 0, 2], + "to": [15, 1, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -20, 15]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 12.75, 0.25, 13], "texture": "#0"}, + "east": {"uv": [0.5, 12.75, 0, 13], "texture": "#0"}, + "up": {"uv": [7, 11, 7.5, 11.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 12.75, 0.5, 13], "rotation": 90, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [1.4, 3.5, -10.7], - "to": [3.4, 5.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [13.43684, 0, 1.36028], + "to": [14.86028, 1, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, -3.5, 1.85247]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [7, 11, 7.35586, 11.25], "texture": "#0"}, + "east": {"uv": [7, 11, 7.24805, 11.25], "texture": "#0"}, + "west": {"uv": [7, 11, 7.24805, 11.25], "texture": "#0"}, + "up": {"uv": [7, 11, 7.35586, 11.24805], "texture": "#0"}, + "down": {"uv": [7, 11, 7.35586, 11.24805], "texture": "#0", "cullface": "down"} } }, { "name": "base", - "from": [1.4, 3.5, 1.3], - "to": [3.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [2, 0, 1], + "to": [14, 1, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 14]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [6.75, 15.75, 10, 16], "texture": "#0"}, + "up": {"uv": [6.75, 15.75, 10, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.75, 15.75, 10, 16], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [2, 0, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "north": {"uv": [3.5, 11.5, 6.5, 15.5], "texture": "#0"}, + "south": {"uv": [3.75, 0, 6.75, 4], "texture": "#0", "cullface": "south"}, + "up": {"uv": [7.25, 3.5, 10.25, 3.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 3.5, 10.25, 3.75], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1, 0, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "east": {"uv": [3.5, 9, 0, 13], "texture": "#0"}, + "south": {"uv": [3.5, 0, 3.75, 4], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0, 9, 3.5, 13], "texture": "#0"}, + "up": {"uv": [7, 3.5, 7.25, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [3.5, 12.75, 0, 13], "rotation": 90, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [2, 15, 3], + "to": [14, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [3.75, 3.75, 6.75, 4], "texture": "#0"}, + "up": {"uv": [7.25, 3.75, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [3.75, 4, 6.75, 1], "rotation": 180, "texture": "#0"} } }, { - "name": "door", - "from": [0.71, 14.7, 2.60938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "bulk", + "from": [2, 0, 2], + "to": [14, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -31, 15]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "up": {"uv": [3.75, 1, 6.75, 4.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.75, 0.25, 6.75, 3.25], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [4.4, 9.5, -10.1], + "to": [5.4, 11.5, 2.9], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 4, -3.6]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0.25, 12, 0.5, 12.5], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 12, 3.5, 12.5], "texture": "#0"}, + "south": {"uv": [0.5, 12.5, 1.35, 12.75], "texture": "#0"}, + "west": {"uv": [0.25, 12.5, 3.5, 12.75], "texture": "#0"}, + "up": {"uv": [0.25, 12, 3.5, 12.25], "rotation": 90, "texture": "#0"} } }, { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [2.4, 9.5, -10.1], + "to": [4.4, 11.5, -9.1], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 4, -3.6]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [1.25, 12, 1.75, 12.5], "texture": "#0", "cullface": "north"}, + "south": {"uv": [1.25, 12.25, 1.75, 12.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [1.25, 12.5, 1.75, 12.75], "texture": "#0", "cullface": "north"} } }, { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [2.4, 9.5, 1.9], + "to": [4.4, 11.5, 2.9], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 4, -3.6]}, "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [1.25, 12, 1.75, 12.5], "texture": "#0"}, + "south": {"uv": [1.25, 12, 1.75, 12.5], "texture": "#0"}, + "up": {"uv": [1.25, 12.5, 1.75, 12.75], "texture": "#0"} } }, { - "name": "door", - "from": [23.60625, 0, 5.45938], - "to": [24.60625, 15.7, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [2.4, 8.5, -10.1], + "to": [5.4, 9.5, 2.9], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, 4, -3.6]}, "faces": { - "north": {"uv": [0, 0, 1, 15.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0.25, 12.5, 1, 12.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 12, 3.5, 12.25], "texture": "#0"}, + "south": {"uv": [0.5, 12.5, 1.25, 12.75], "texture": "#0"}, + "up": {"uv": [0.25, 12, 3.5, 12.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3.5, 12, 0.25, 12.75], "rotation": 270, "texture": "#0"} } }, { - "name": "bulk", - "from": [1.2, 0, 15.01563], - "to": [15.2, 15, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [4.4, 3, -10.1], + "to": [5.4, 5, 2.9], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -2.5, -3.6]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [0.25, 12, 0.5, 12.5], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 12, 3.5, 12.5], "texture": "#0"}, + "south": {"uv": [0.5, 12.5, 1.35, 12.75], "texture": "#0"}, + "west": {"uv": [0.25, 12.5, 3.5, 12.75], "texture": "#0"}, + "up": {"uv": [0.25, 12, 3.5, 12.25], "rotation": 90, "texture": "#0"} } }, { - "name": "door", - "from": [-1.2282, 1.1875, -10.48083], - "to": [-0.2282, 15.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, + "name": "base", + "from": [2.4, 3, -10.1], + "to": [4.4, 5, -9.1], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -2.5, -3.6]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 14, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [1.25, 12, 1.75, 12.5], "texture": "#0", "cullface": "north"}, + "south": {"uv": [1.25, 12.25, 1.75, 12.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [1.25, 12.5, 1.75, 12.75], "texture": "#0", "cullface": "north"} } }, { - "name": "door", - "from": [-0.33758, 1.1875, -10.48083], - "to": [1.66242, 2.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, + "name": "base", + "from": [2.4, 3, 1.9], + "to": [4.4, 5, 2.9], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -2.5, -3.6]}, "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [1.25, 12, 1.75, 12.5], "texture": "#0"}, + "south": {"uv": [1.25, 12, 1.75, 12.5], "texture": "#0"}, + "up": {"uv": [1.25, 12.5, 1.75, 12.75], "texture": "#0"} } }, { - "name": "door", - "from": [-0.25945, 14.1875, -10.48083], - "to": [1.66243, 15.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, + "name": "base", + "from": [2.4, 2, -10.1], + "to": [5.4, 3, 2.9], + "rotation": {"angle": 0, "axis": "y", "origin": [5.2, -2.5, -3.6]}, "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0.25, 12.5, 1, 12.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.25, 12, 3.5, 12.25], "texture": "#0"}, + "south": {"uv": [0.5, 12.5, 1.25, 12.75], "texture": "#0"}, + "up": {"uv": [0.25, 12, 3.5, 12.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3.5, 12, 0.25, 12.75], "rotation": 270, "texture": "#0"} } }, { - "name": "door", - "from": [10.0657, 1, -6.76298], - "to": [11.4857, 15.999, -5.76298], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, + "name": "bulk", + "from": [1.5, 10, 4], + "to": [14.5, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.5, 9]}, "faces": { - "north": {"uv": [0, 0, 1.42, 14.999], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 14.999], "texture": "#base"}, - "south": {"uv": [0, 0, 1.42, 14.999], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 14.999], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 1.42], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } }, { - "name": "door", - "from": [0.67805, 1, -10.88083], - "to": [1.67805, 16, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, + "name": "bulk", + "from": [1.5, 5, 4], + "to": [14.5, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 9]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13.9, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [2.1, 0, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 13.9, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 2, 3.25, 2.25], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, { - "name": "group", - "origin": [4.2, 5, -4.2], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ + { + "name": "group", + "origin": [15.5, -11, 14], + "color": 0, + "children": [ + 0, + 1, + 2, + { + "name": "handletop", + "origin": [37, 11, 0], + "color": 0, + "children": [3, 4, 5, 6] + } + ] + }, 7, { "name": "group", - "origin": [4.2, 5, -4.2], + "origin": [15.5, -16, 15], "color": 0, "children": [8, 9, 10, 11] }, 12, 13, - 14 + 14, + 15 ] }, - 15, - 16, - 17, - 18, { - "name": "freezer", - "origin": [0, 0, 0], + "name": "group", + "origin": [4.2, 5, -4.2], "color": 0, "children": [ { - "name": "top", - "origin": [0, 0, 0], + "name": "group", + "origin": [5.2, 5, -4.2], "color": 0, - "children": [] + "children": [16, 17, 18, 19] }, { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - }, - 19 - ] - }, - 20 - ] - }, - { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "group", + "origin": [5.2, 5, -4.2], "color": 0, - "children": [21, 22, 23] - }, - 24, - 25 + "children": [20, 21, 22, 23] + } ] }, - { - "name": "group", - "origin": [5.14063, 13.84688, 9.6], - "color": 0, - "children": [] - }, - { - "name": "group", - "origin": [5.14063, 13.84688, 9.6], - "color": 0, - "children": [] - }, - { - "name": "group", - "origin": [5.14063, 13.84688, 9.6], - "color": 0, - "children": [] - } + 24, + 25 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single.json index f09b67a21..17cb741c6 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single.json @@ -1,237 +1,83 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 1, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base", "cullface": "south"}, - "west": {"uv": [3, 0, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base", "cullface": "up"} - } - }, - { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 2, -0.5], + "to": [13, 15, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, -0.01562]}, "faces": { - "north": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 15], "texture": "#base", "cullface": "south"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base", "cullface": "up"} + "north": {"uv": [10.5, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [13.7, 1, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 15, -0.5], + "to": [13, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base", "cullface": "south"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base", "cullface": "up"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} } }, { - "name": "base", - "from": [1.7, 15, 3], - "to": [13.7, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 2, -0.5], + "to": [13, 2, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8, 0.48438]}, "faces": { - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} } }, { - "name": "door", - "from": [0.71, 14.7, 2.60938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 2, 0.96875], + "to": [13, 15, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, 0.48438]}, "faces": { - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [10.5, 0, 13.75, 0.25], "rotation": 270, "texture": "#0"} } }, { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "name": "base", + "from": [1, 1, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -11, 14]}, "faces": { - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [6.75, 12, 10, 15.75], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "west": {"uv": [7, 7.25, 7.25, 11], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 12, 10, 12.25], "texture": "#0"} } }, { - "name": "bulk", - "from": [1.2, 4, 15.01563], - "to": [15.2, 15, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [13.43684, 1, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 1.5, 1.85247]}, "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "south": {"uv": [0, 3, 14, 15], "rotation": 180, "texture": "#2", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2", "cullface": "south"} + "north": {"uv": [7, 7.25, 7.35586, 11], "texture": "#0"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0"} } }, { "name": "bulk", - "from": [1.2, 1, 15.01563], - "to": [15.2, 4, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "south": {"uv": [0, 15, 14, 12], "rotation": 180, "texture": "#2", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2", "cullface": "south"} - } - }, - { - "name": "door", - "from": [13.2, 2.1875, 0.09375], - "to": [14.2, 14.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 2.1875, 0.98438], - "to": [14.2, 3.1875, 2.98438], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 13.1875, 1.0625], - "to": [14.2, 14.1875, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.94375, 3.01, 5.03313], - "to": [24.94375, 15.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 12.989], "texture": "#base"}, - "east": {"uv": [0, 0, 1.42, 12.989], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 12.989], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 1.42, 0, 0], "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.94375, 1.01, 5.03313], - "to": [24.94375, 2.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 1, 1.989], "texture": "#base"}, - "east": {"uv": [0, 14.011, 1.42, 16], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 1.989], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 1.42, 0, 0], "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 3, 2], - "to": [14.6, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 0, 14.9, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 13.9, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 13], "texture": "#base"}, - "up": {"uv": [1, 0, 14.9, 1], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base", "cullface": "down"} - } - }, - { - "name": "door", - "from": [0.7, 1, 2], - "to": [14.6, 3, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 14, 14.9, 16], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 2], "texture": "#base"}, - "south": {"uv": [0, 0, 13.9, 2], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 2], "texture": "#base"}, - "up": {"uv": [1, 0, 14.9, 1], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 180, "texture": "#base", "cullface": "down"} - } - }, - { - "name": "door", - "from": [0.71, 0.06406, 2.60938], - "to": [14.69, 1.13906, 15.90938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -15.96094, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 13.3, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 13.3, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 13.3], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 13.3], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [14.71, 0.06406, 3.50938], - "to": [15.69, 1.13906, 15.90938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -15.96094, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 12.4, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 12.4, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 12.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 12.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.60625, 0.03906, 5.45938], - "to": [24.65313, 15.73906, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -15.96094, 16]}, - "faces": { - "north": {"uv": [0, 0, 1.04688, 15.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 1.04688, 15.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 1.04688, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1.04688, 1.4], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 12.5, 3.5, 15.5], "texture": "#0"}, + "east": {"uv": [13.5, 11.25, 10, 15.25], "texture": "#0"}, + "south": {"uv": [0, 4, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 11.25, 13.5, 15.25], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 0, 10.5, 3.5], "rotation": 180, "texture": "#0", "cullface": "down"} } } ], @@ -247,85 +93,40 @@ "scale": [0.25, 0.25, 0.25] }, "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], "scale": [0.25, 0.25, 0.25] }, "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], + "rotation": [1, 135, 0], + "translation": [0.25, 1.25, 1], "scale": [0.25, 0.25, 0.25] }, "ground": { - "translation": [0, -1.75, 0], + "translation": [0, 1, 0], "scale": [0.26, 0.26, 0.26] }, "gui": { "rotation": [30, -135, 0], - "translation": [0.5, -1, 0], + "translation": [0.5, -3, 0], "scale": [0.41, 0.41, 0.41] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -0.25, -2.75], - "scale": [0.66, 0.66, 0.66] } }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - { - "name": "freezer", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - }, - 6, - 7 - ] - }, { - "name": "door_refrigerator", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [8, 9, 10] + "children": [0, 1, 2, 3] }, - 11, - 12, - 13, - 14, - 15, - 16, - 17 + 4, + 5, + 6 ] } ] diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single_open.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single_open.json index eb47bbc7c..834dcd37a 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_single_open.json @@ -1,537 +1,199 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 1, 3], - "to": [1.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [3, 0, 16, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [2, 0, 14, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [13.7, 1, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 15], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 13], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 9.5, 3.6], - "to": [13.7, 10.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 4.5, 3.6], - "to": [13.7, 5.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 1.2, 3.6], - "to": [13.7, 1.2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 2.5, -10.7], - "to": [4.4, 3.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3.5, -10.7], - "to": [4.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [-0.5, 2, -10], + "to": [-0.5, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 1.48438]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "east": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} } }, { - "name": "base", - "from": [1.4, 3.5, -10.7], - "to": [3.4, 5.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [-0.5, 15, -10], + "to": [1, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 1.48438]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.4, 3.5, 1.3], - "to": [3.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [-0.5, 2, -10], + "to": [1, 2, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 1.48438]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [0.99, 2, -10], + "to": [0.99, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 1.48438]}, "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} + "west": {"uv": [10.5, 0, 13.75, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} } }, { "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [2, 1, -12], + "to": [3, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 1.48438]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "east": {"uv": [6.5, 12, 10, 15.75], "texture": "#0"}, + "south": {"uv": [7, 7.25, 7.25, 11], "texture": "#0"}, + "west": {"uv": [6.75, 12, 10, 15.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [10.5, 6.75, 7, 7], "rotation": 270, "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 12, 10, 12.25], "rotation": 90, "texture": "#0"} } }, { "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [1.01562, 1, -11], + "to": [2.01562, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 1.48438]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [6.75, 12, 10, 15.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [6.75, 12, 10, 12.25], "rotation": 90, "texture": "#0"} } }, { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [10.13774, 1, -8.04773], + "to": [11.56118, 16, -7.05554], + "rotation": {"angle": 45, "axis": "y", "origin": [2, 5, 1.48438]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [7, 7.25, 7.35586, 11], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"} } }, { - "name": "base", - "from": [1.7, 15, 3], - "to": [13.7, 16, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 0, 13, 12], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.71, 14.7, 2.50938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1.1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1.1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.74906, 1, 2.60938], - "to": [1.72906, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-1.2282, 2.1875, -10.48083], - "to": [-0.2282, 14.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 12, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.33758, 2.1875, -10.48083], - "to": [1.66242, 3.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.25945, 13.1875, -10.48083], - "to": [1.64055, 14.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, - "faces": { - "north": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1.9], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1.9, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1.9, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [10.0657, 3.01, -6.76298], - "to": [11.4857, 15.999, -5.76298], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, - "faces": { - "north": {"uv": [0, 0, 1.42, 12.989], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 12.989], "texture": "#base"}, - "south": {"uv": [2, 0, 3.42, 12.989], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 12.989], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 1.42, 0, 0], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "door", - "from": [10.0657, 1.01, -6.76298], - "to": [11.4857, 3.01, -5.76298], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, - "faces": { - "north": {"uv": [0, 14, 1.42, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "south": {"uv": [2, 14, 3.42, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [0, 14, 1, 15.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 15.42, 0, 14], "rotation": 90, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.67805, 3, -10.88083], - "to": [1.67805, 16, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, + "name": "bulk", + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 1, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 13.9, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 1, 13], "texture": "#base"}, - "west": {"uv": [1, 0, 14.9, 13], "texture": "#base"}, - "up": {"uv": [1, 0, 14.9, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 0, 13.9, 1], "rotation": 270, "texture": "#base"} + "north": {"uv": [3.25, 9, 3.5, 12.75], "texture": "#0"}, + "east": {"uv": [13.5, 11.25, 10.25, 15], "texture": "#0"}, + "south": {"uv": [3.25, 4, 3.5, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.25, 11.25, 13.5, 15], "texture": "#0"}, + "up": {"uv": [7, 3.5, 7.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"} } }, { - "name": "door", - "from": [0.67805, 1, -10.88083], - "to": [1.67805, 3, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 8.1875, 2.52056]}, + "name": "bulk", + "from": [1, 1, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 13.9, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "west": {"uv": [1, 14, 14.9, 16], "texture": "#base"}, - "up": {"uv": [1, 14, 14.9, 15], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 14, 13.9, 15], "rotation": 270, "texture": "#base"} + "north": {"uv": [3.25, 9, 3.5, 12.75], "texture": "#0"}, + "east": {"uv": [13.5, 11.25, 10.25, 15], "texture": "#0"}, + "south": {"uv": [0, 4, 0.25, 7.75], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 11.25, 13.5, 15], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"} } }, { - "name": "door", - "from": [14.71, 0.06406, 3.50938], - "to": [15.69, 1.13906, 15.90938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -15.96094, 16]}, + "name": "bulk", + "from": [2, 1, 15], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [16.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 0.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 12.4, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 12.4, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 12.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 12.4], "rotation": 180, "texture": "#legs"} + "north": {"uv": [3.75, 0, 6.75, 3.75], "texture": "#0"}, + "south": {"uv": [0.25, 4, 3.25, 7.75], "texture": "#0", "cullface": "south"}, + "up": {"uv": [7.25, 3.5, 10.25, 3.75], "rotation": 180, "texture": "#0", "cullface": "up"} } }, { - "name": "door", - "from": [23.60625, 0.03906, 5.45938], - "to": [24.65313, 15.73906, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -15.96094, 16]}, + "name": "bulk", + "from": [2, 15, 3], + "to": [14, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [16.5, -16, 14]}, "faces": { - "north": {"uv": [0, 0, 1.04688, 15.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 1.04688, 15.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 1.04688, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1.04688, 1.4], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0.25, 9, 3.25, 9.25], "texture": "#0"}, + "up": {"uv": [7.25, 3.75, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 3.75, 10.25, 6.75], "rotation": 180, "texture": "#0"} } }, { - "name": "door", - "from": [0.71, 0.06406, 2.48438], - "to": [14.69, 1.13906, 15.90938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -15.96094, 16]}, + "name": "bulk", + "from": [1, 0, 2], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 13.3, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 13.3, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 13.3], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 13.3], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 15.25, 3.5, 15.5], "texture": "#0"}, + "east": {"uv": [13.5, 15, 10, 15.25], "texture": "#0"}, + "south": {"uv": [0, 7.75, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 15, 13.5, 15.25], "texture": "#0"}, + "up": {"uv": [10.5, 1.75, 14, 5.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 0, 10.5, 3.5], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { "name": "bulk", - "from": [1.2, 1, 15.01563], - "to": [15.2, 4, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1.5, 10, 4], + "to": [14.5, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.5, 9]}, "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "south": {"uv": [0, 15, 14, 12], "rotation": 180, "texture": "#2", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2", "cullface": "south"} + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } }, { "name": "bulk", - "from": [1.2, 4, 15.01563], - "to": [15.2, 15, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1.5, 5, 4], + "to": [14.5, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 9]}, "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "south": {"uv": [0, 3, 14, 15], "rotation": 180, "texture": "#2", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2", "cullface": "south"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2", "cullface": "south"} + "north": {"uv": [0, 2, 3.25, 2.25], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [6, 7, 8, 9] - }, { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [10, 11, 12, 13] - }, - 14, - 15, - 16, - 17, - { - "name": "freezer", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], + "name": "group", + "origin": [15.5, -11, 14], "color": 0, "children": [ { - "name": "doorbottom", - "origin": [0.1, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [] - } + "children": [0, 1, 2, 3] + }, + 4, + 5, + 6 ] - } - ] - }, - { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [18, 19, 20] }, - 21, - 22, - 23, - 24 + 7, + 8, + 9, + 10, + 11 ] }, - 25, - 26, - 27, - 28, - 29 + 12, + 13 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top.json index 84b7f54be..4de7e220c 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top.json @@ -1,342 +1,92 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 0, 3], - "to": [1.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 0, -0.5], + "to": [13, 15, -0.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, -0.01562]}, "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0, 14.25, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"}, + "south": {"uv": [10.5, 0, 14.25, 0.25], "rotation": 90, "texture": "#0", "cullface": "north"} } }, { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 0, 0.96875], + "to": [13, 15, 0.96875], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 5, 0.48438]}, "faces": { - "north": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [10.5, 0, 14.25, 0.25], "rotation": 270, "texture": "#0"} } }, { - "name": "bulk", - "from": [13.7, 0, 3], - "to": [15.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [12, 15, -0.5], + "to": [13, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 8, 0.48438]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [2, 1, 0, 14], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 90, "texture": "#0"} } }, { "name": "base", - "from": [0.7, 13, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 15, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#base"}, - "west": {"uv": [3, 0, 16, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 16, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 0, 3], - "to": [13.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.71, 14.7, 2.60938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 1], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -11, 14]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [3.5, 10.5, 6.75, 14.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 3.75], "texture": "#0"}, + "west": {"uv": [7, 6.75, 7.25, 10.75], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [3.5, 0, 6.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [0.71, 0.025, 2.60938], - "to": [14.69, 1.1, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [13.43684, 0, 1.36028], + "to": [14.86028, 16, 2.35247], + "rotation": {"angle": -45, "axis": "y", "origin": [14.15247, 1.5, 1.85247]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1.075], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1.075], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.71, 1, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7, 6.75, 7.35586, 10.75], "texture": "#0"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 10.75, 7.35586, 10.99805], "texture": "#0", "cullface": "down"} } }, { "name": "bulk", - "from": [1.2, 0.001, 15.01563], - "to": [15.2, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, 2], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 14], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "bulk", - "from": [1.2, 14, 15.01563], - "to": [15.2, 14.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 14, 14, 14.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [13.2, -0.0125, 0.09375], - "to": [14.2, 15.1875, 1.09375], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [13.2, 14.1875, 1.0625], - "to": [14.2, 15.1875, 3.0625], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [23.94375, 0, 5.03313], - "to": [24.94375, 12.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.94375, 13, 5.03313], - "to": [24.94375, 15.999, 6.45313], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "east": {"uv": [0, 0, 1.42, 2.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 13, 2], - "to": [14.6, 16, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 0, 14.9, 3], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 13.9, 4], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "up": {"uv": [0.1, 0, 14, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 13.9, 2], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.7, 0, 2], - "to": [14.6, 13, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [1, 1, 14.9, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 13.9, 14], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 13.9, 2], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 0, 14.9, 1], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 12.5, 3.5, 15.5], "texture": "#0"}, + "east": {"uv": [13.5, 10.25, 10, 14.25], "texture": "#0"}, + "south": {"uv": [3.25, 10.5, 6.75, 14.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 10.25, 13.5, 14.25], "texture": "#0"}, + "up": {"uv": [7, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 7, 10.5, 3.5], "rotation": 180, "texture": "#0", "cullface": "down"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - { - "name": "freezer", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "top", - "origin": [0, 0, 0], - "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] - }, - 9, - 10 - ] - }, { - "name": "door_refrigerator", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "handle_top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [11, 12] + "children": [0, 1, 2] }, - 13, - 14, - 15, - 16 + 3, + 4, + 5 ] } ] diff --git a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top_open.json b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top_open.json index 34cc68e1f..27fcd0f13 100644 --- a/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top_open.json +++ b/common/src/main/resources/assets/pfm/models/block/iron_fridge/iron_fridge_top_open.json @@ -1,502 +1,179 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "pfm:block/fridge/fridge_back", - "legs": "block/light_gray_concrete", - "base": "block/iron_block", - "particle": "block/iron_block" + "0": "pfm:block/iron_fridge", + "particle": "pfm:block/iron_fridge" }, "elements": [ { - "name": "bulk", - "from": [0.7, 0, 3], - "to": [1.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [-0.5, 0, -10], + "to": [-0.5, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.48438]}, "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "west": {"uv": [3, 1, 16, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 14], "rotation": 180, "texture": "#base"} + "east": {"uv": [10.5, 0, 14, 0.25], "rotation": 90, "texture": "#0", "cullface": "west"}, + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "west"} } }, { - "name": "bulk", - "from": [1.7, 1, 15], - "to": [13.7, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 14], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "bulk", - "from": [13.7, 0, 3], - "to": [15.7, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [-0.5, 15, -10], + "to": [1, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 23, 1.48438]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "south": {"uv": [2, 1, 0, 14], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "rotation": 180, "texture": "#base"} + "up": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#0", "cullface": "north"}, + "down": {"uv": [10.5, 0, 10.75, 0.25], "rotation": 180, "texture": "#0", "cullface": "north"} } }, { "name": "base", - "from": [0.7, 13, 3], - "to": [15.7, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [1, 0, -11], + "to": [2, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 15, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#base"}, - "west": {"uv": [3, 0, 16, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 15, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [1, 3, 16, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 0.25, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [3.5, 10.5, 6.75, 14.5], "texture": "#0"}, + "up": {"uv": [8, 10.5, 8.25, 7.25], "texture": "#0", "cullface": "up"}, + "down": {"uv": [7.25, 3.5, 10.5, 3.75], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { "name": "base", - "from": [1.7, 0, 3], - "to": [13.7, 1, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [2, 0, -12], + "to": [3, 16, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 13, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [2, 3, 14, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [7, 6.75, 7.35586, 10.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [10.75, 0.5, 14, 4.5], "texture": "#0"}, + "south": {"uv": [7, 7.25, 7.25, 11.25], "texture": "#0"}, + "west": {"uv": [6.75, 12, 10.25, 15.75], "texture": "#0", "cullface": "north"}, + "up": {"uv": [7, 6.75, 10.75, 7], "rotation": 90, "texture": "#0", "cullface": "up"}, + "down": {"uv": [7, 3.5, 10.5, 3.75], "rotation": 270, "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [0.71, 14.7, 2.60938], - "to": [14.69, 15.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [9.84485, 0, -7.34063], + "to": [11.26829, 16, -6.34844], + "rotation": {"angle": 45, "axis": "y", "origin": [1, 9, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 13.98, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 13.98, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [7, 6.75, 7.35586, 10.75], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "west": {"uv": [0, 0, 0.24805, 1], "texture": "#0", "cullface": "north"}, + "up": {"uv": [6.75, 5.5, 7.10586, 5.74805], "texture": "#0", "cullface": "north"}, + "down": {"uv": [7.25, 3.5, 7.60586, 3.74805], "texture": "#0", "cullface": "down"} } }, { - "name": "door", - "from": [13.71, 0, 2.60938], - "to": [14.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [0.99, 0, -10], + "to": [0.99, 15, -9], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 7, 1.48438]}, "faces": { - "north": {"uv": [0, 0, 0.98, 14.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 14.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 14.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 14.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [0.71, 1, 2.60938], - "to": [1.69, 14.7, 3.60938], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "south": {"uv": [0, 0, 0.98, 13.7], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13.7], "texture": "#legs"}, - "up": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 0.98, 1], "rotation": 180, "texture": "#legs"} + "west": {"uv": [10.5, 0, 14, 0.25], "rotation": 270, "texture": "#0", "cullface": "north"} } }, { "name": "bulk", - "from": [1.2, 0.001, 15.01563], - "to": [15.2, 14, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, + "from": [14, 1, 3], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [0, 0, 14, 15], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 14], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [0.25, 9, 0.5, 12.75], "texture": "#0"}, + "east": {"uv": [13.5, 10.25, 10.25, 14], "texture": "#0"}, + "south": {"uv": [6.5, 10.5, 6.75, 14.25], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10.25, 11.25, 13.5, 15], "texture": "#0"}, + "up": {"uv": [7, 3.5, 7.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"} } }, { "name": "bulk", - "from": [1.2, 14, 15.01563], - "to": [15.2, 14.999, 16.01563], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.999, 14], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "south": {"uv": [0, 14, 14, 14.999], "rotation": 180, "texture": "#2"}, - "west": {"uv": [0, 0, 1, 0.999], "texture": "#2"}, - "up": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 14, 1], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "door", - "from": [-1.2282, 0.1875, -10.48083], - "to": [-0.2282, 15.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 10.5935, 2.52056]}, - "faces": { - "north": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 15, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [-0.25945, 14.1875, -10.48083], - "to": [1.74055, 15.1875, -9.48083], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 10.5935, 2.52056]}, - "faces": { - "north": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "door", - "from": [10.0657, 0, -6.76298], - "to": [11.4857, 12.999, -5.76298], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 10.5935, 2.52056]}, - "faces": { - "north": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1.42, 13.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 13.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [10.0657, 13, -6.76298], - "to": [11.4857, 15.999, -5.76298], - "rotation": {"angle": 45, "axis": "y", "origin": [0.39861, 10.5935, 2.52056]}, - "faces": { - "north": {"uv": [0, 0, 1.42, 2.999], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "south": {"uv": [0, 1, 1.42, 3.999], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 3.999], "texture": "#base"}, - "up": {"uv": [0, 1, 1, 2.42], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 2.42], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.67805, 13, -10.88083], - "to": [1.67805, 16, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 10.5935, 2.52056]}, - "faces": { - "north": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 1, 13.9, 4], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 4], "texture": "#base"}, - "west": {"uv": [1, 0, 14.9, 3], "texture": "#base"}, - "up": {"uv": [0.1, 0, 14, 1], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 13.9, 2], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [0.67805, 0, -10.88083], - "to": [1.67805, 13, 3.01917], - "rotation": {"angle": 0, "axis": "y", "origin": [0.39861, 10.5935, 2.52056]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "east": {"uv": [0, 1, 13.9, 14], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#base"}, - "west": {"uv": [1, 1, 14.9, 14], "texture": "#base"}, - "up": {"uv": [0, 1, 13.9, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 0, 14.9, 1], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "door", - "from": [23.60625, 0.001, 5.45938], - "to": [24.60625, 15.7, 6.85938], - "rotation": {"angle": 45, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 0, 1, 15.699], "texture": "#legs"}, - "east": {"uv": [0, 0, 1.4, 15.699], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15.699], "texture": "#legs"}, - "west": {"uv": [0, 0, 1.4, 15.699], "texture": "#legs"}, - "up": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 1.4], "rotation": 180, "texture": "#legs"} - } - }, - { - "name": "base", - "from": [1.7, 4.5, 3.6], - "to": [13.7, 5.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.7, 9.5, 3.6], - "to": [13.7, 10.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16.1, -16, 16]}, - "faces": { - "north": {"uv": [0, 15, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [1, 15, 14, 16], "texture": "#base"}, - "up": {"uv": [2, 0, 14, 13], "rotation": 180, "texture": "#base"}, - "down": {"uv": [14, 3, 2, 16], "rotation": 180, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1.4, 9.5, -10.7], - "to": [4.4, 10.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [1, 2.5, -10.7], - "to": [4.4, 3.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, - "faces": { - "north": {"uv": [0, 15, 3.4, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 4.4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 6.4], "rotation": 270, "texture": "#base"} - } - }, - { - "name": "base", - "from": [3.4, 3.5, -10.7], - "to": [4.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "from": [2, 15, 3], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "north": {"uv": [0.5, 9, 3.5, 9.25], "texture": "#0"}, + "south": {"uv": [10.75, 0.5, 13.75, 0.75], "texture": "#0", "cullface": "south"}, + "up": {"uv": [7.25, 3.5, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.75, 1.5, 13.75, 5], "rotation": 180, "texture": "#0"} } }, { - "name": "base", - "from": [1.4, 3.5, -10.7], - "to": [3.4, 5.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [2, 1, 15], + "to": [14, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -17, 15]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [10.75, 1.5, 13.75, 5], "texture": "#0"}, + "south": {"uv": [3.5, 10.75, 6.5, 14.25], "texture": "#0", "cullface": "south"} } }, { - "name": "base", - "from": [1.4, 3.5, 1.3], - "to": [3.4, 5.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [2, 0, 3], + "to": [15, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0.5, 12.75, 3.5, 13], "texture": "#0"}, + "east": {"uv": [13.5, 14, 10.25, 14.25], "texture": "#0"}, + "south": {"uv": [10.75, 4.25, 14, 4.5], "texture": "#0", "cullface": "south"}, + "up": {"uv": [10.75, 1.5, 14, 4.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 3.5, 10.25, 6.75], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [3.4, 10.5, -10.7], - "to": [4.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1, 0, 2], + "to": [2, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [15.5, -16, 15]}, "faces": { - "north": {"uv": [3, 14, 6.4, 15], "texture": "#base"}, - "east": {"uv": [1, 10, 14, 12], "texture": "#base"}, - "south": {"uv": [1, 15, 4.4, 16], "texture": "#base"}, - "west": {"uv": [0, 15, 13, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 15, 2], "rotation": 90, "texture": "#base"}, - "down": {"uv": [15, 3, 2, 4], "rotation": 270, "texture": "#base"} + "east": {"uv": [13.5, 11.25, 10, 15.25], "texture": "#0"}, + "south": {"uv": [3.25, 10.5, 3.5, 14.5], "texture": "#0", "cullface": "south"}, + "west": {"uv": [10, 10.25, 13.5, 14.25], "texture": "#0"}, + "up": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "up"}, + "down": {"uv": [10.25, 3.5, 10.5, 7], "rotation": 180, "texture": "#0", "cullface": "down"} } }, { - "name": "base", - "from": [1.4, 10.5, -10.7], - "to": [3.4, 12.5, -9.7], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1.5, 5, 4], + "to": [14.5, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 9]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 2, 3.25, 2.25], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } }, { - "name": "base", - "from": [1.4, 10.5, 1.3], - "to": [3.4, 12.5, 2.3], - "rotation": {"angle": 0, "axis": "y", "origin": [4.2, 5, -4.2]}, + "name": "bulk", + "from": [1.5, 10, 4], + "to": [14.5, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.5, 9]}, "faces": { - "north": {"uv": [1, 13, 3, 15], "texture": "#base"}, - "east": {"uv": [2, 0, 3, 2], "texture": "#base"}, - "south": {"uv": [1, 14, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#base"}, - "up": {"uv": [2, 1, 3, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [3, 3, 2, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0.25, 3.25, 0.5], "texture": "#0"}, + "up": {"uv": [0.75, 0.25, 2.25, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0.25, 3.25, 3], "rotation": 180, "texture": "#0"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [59, 40, 0], - "translation": [-0.5, 0.25, -1.5], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [1, 19, 0], - "translation": [0.25, 0.25, 1], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "translation": [0, -1.75, 0], - "scale": [0.26, 0.26, 0.26] - }, - "gui": { - "rotation": [13, -144, 0], - "translation": [0.5, -3.5, 0], - "scale": [0.43, 0.43, 0.43] - }, - "head": { - "translation": [0, 0.75, -1.5] - }, - "fixed": { - "translation": [0, -5.5, -2.75], - "scale": [0.66, 0.66, 0.66] - } - }, "groups": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, { - "name": "freezer", - "origin": [0, 0, 0], + "name": "top", + "origin": [37, 11, 0], "color": 0, "children": [ { - "name": "top", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [37, 11, 0], "color": 0, - "children": [] - }, - { - "name": "bottom", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "doorbottom", - "origin": [0.1, 0, 0], - "color": 0, - "children": [] - } - ] + "children": [0, 1, 2, 3, 4, 5] }, + 6, + 7, 8, - 9 + 9, + 10 ] }, - { - "name": "door_refrigerator", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "handle_top", - "origin": [0, 0, 0], - "color": 0, - "children": [10, 11] - }, - 12, - 13, - 14, - 15 - ] - }, - 16, - 17, - 18, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [ - 19, - { - "name": "group", - "origin": [4.2, 5, -4.2], - "color": 0, - "children": [20, 21, 22, 23] - }, - 24, - 25, - 26 - ] - } + 11, + 12 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/textures/block/iron_fridge.png b/common/src/main/resources/assets/pfm/textures/block/iron_fridge.png new file mode 100644 index 0000000000000000000000000000000000000000..a7b68c587720ebe02b04b679292815b9472fbb9f GIT binary patch literal 1580 zcmV+{2GjY8P)$U(`~Y{A zfDRt=7n;q6gG4A=2q6X0lA{jNV;&#h$K@p%yFH5~nU8$;zQcRZyYDu}qwxv_(d+jb zoN)l~^0$|qVZheW_nM>yLdHOkuqRjt>!(l^rThDL#=ytogfB3$?zQFS` zzn`CO6HT zzq7MreZCH!%aAe*NGHFE17#SXW2%5)g317j!<`I(!U9_i5HJPQDj6W|n!>7&ihp}Kx6 zwUjL_Hrv{u6JYXog59q^8si!-w!>iG^A)KZLFl3JmI1oe2ZI5yl*H5;Kc&7uLw2oxJvqT_HbWf8 z`02?Lm#tb<#sKconCs+5;P=reou`cj@1-+AHUl8BfWrV&1`#m;8)XLoX0I7kb+VUpc*f(jpy_K9|Hj3GtGWM#s^6r zmt{cJ@Y-k~`s;6e)BOV11ymX($Lhe<9d*GAIsxJ+F4XT+rq}1zF@P&*xVUM9Rd}|- zhO1GEgZ~r*1gh-yxoLw{zGRk)NM3!J4X|o3@{yVa63$k zI*%KqsaZ-J13)+!(Vg$fP^&wl5F!}x&qf)#Cd#cnQo+swuG+phuoNw=;u=xkrgF)6Vd96leCCRlfxCT9UP2DloQR3o^pa<(8{MVi)T z0T7P3Y?WPIRhOGNZVdyV=m1j;5G^Yz6PC+mCUa1;NZmrsm<8a_0h}0M${eQifH;cT zr_fZ8bbu=hfEWWft*&(oHSg)qPXVBC^Ae|Nk<;qh{kqE%YE*a+4)$@s-)~UU5&)c? zovmyP(5Ll`GV!U{!>;tI1)FjRBQp0rHjdg9!~wDhpHwP+MKOLXC=A7@*Sv z+*Vgt3_!`I?8+DbNBgRd0hCtPGQCI?+=>`rYjveE09+kFzEVQ3-)mf4T%<})eg8p- z0g&EdTdONqs8QjaJbOmIScd6+hM~iQ+v-Zu0j09Q>FFt}zAtxrfzaz?Q-bn6)ka4l z)artF_~?*zQ1SZD*M-M$T3zev4-}~N<}${k@k-Ygqs9*TdlW_3+uN&kj+LAZQqb%7 e8eF#3iGKkz^Cc_f`75db0000 Date: Wed, 2 Oct 2024 02:35:25 -0600 Subject: [PATCH 15/17] Update Kitchen Counter Ovens to match the new style and their collision --- .../pfm/blocks/KitchenCounterOvenBlock.java | 18 +- .../kitchen_counter_oven.json | 802 +++------------- .../kitchen_counter_oven_middle.json | 851 +++-------------- .../kitchen_counter_oven_middle_open.json | 853 +++--------------- .../kitchen_counter_oven_open.json | 825 +++-------------- 5 files changed, 494 insertions(+), 2855 deletions(-) diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenCounterOvenBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenCounterOvenBlock.java index c6541e6f9..a6817fbba 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenCounterOvenBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenCounterOvenBlock.java @@ -111,15 +111,11 @@ public void openScreen(World world, BlockPos pos, PlayerEntity player) { } } - protected static final VoxelShape COUNTER_OVEN = VoxelShapes.union(createCuboidShape(0, 1, 0, 16, 14, 14),createCuboidShape(0, 0, 0, 16, 1, 12),createCuboidShape(0, 14, 0, 16, 16, 16),createCuboidShape(1.8, 11.2, 14.54, 14.3, 11.8, 15.14),createCuboidShape(2.5, 11.2, 13.07, 3.1, 11.8, 14.57),createCuboidShape(12.6, 11.2, 13.07, 13.2, 11.8, 14.57),createCuboidShape(1.8, 1.9, 14.44, 14.3, 2.5, 15.04),createCuboidShape(2.5, 1.9, 12.47, 3.1, 2.5, 14.47),createCuboidShape(12.6, 1.9, 12.47, 13.2, 2.5, 14.47)); + protected static final VoxelShape COUNTER_OVEN = VoxelShapes.union(createCuboidShape(0, 1, 0, 16, 14, 14),createCuboidShape(0, 0, 0, 16, 1, 12),createCuboidShape(0, 14, 0, 16, 16, 16),createCuboidShape(2, 10, 14.1, 14, 11, 15.1),createCuboidShape(4, 2, 14.1, 12, 3, 15.1)); protected static final VoxelShape COUNTER_OVEN_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, COUNTER_OVEN); protected static final VoxelShape COUNTER_OVEN_EAST = rotateShape(Direction.NORTH, Direction.EAST, COUNTER_OVEN); protected static final VoxelShape COUNTER_OVEN_WEST = rotateShape(Direction.NORTH, Direction.WEST, COUNTER_OVEN); - protected static final VoxelShape COUNTER_OVEN_BOTTOM = VoxelShapes.union(createCuboidShape(0, 1, 0,16, 16, 13),createCuboidShape(0, 0, 0,16, 1, 12),createCuboidShape(0, 1, 13,16, 15, 14),createCuboidShape(1.8, 11.2, 14.54,14.3, 11.8, 15.14),createCuboidShape(2.5, 11.2, 13.07,3.1, 11.8, 14.57),createCuboidShape(12.6, 11.2, 13.07,13.2, 11.8, 14.57),createCuboidShape(1.8, 1.9, 14.44,14.3, 2.5, 15.04),createCuboidShape(2.5, 1.9, 12.47,3.1, 2.5, 14.47),createCuboidShape(12.6, 1.9, 12.47,13.2, 2.5, 14.47)); - protected static final VoxelShape COUNTER_OVEN_MIDDLE = VoxelShapes.union(createCuboidShape(0, 0, 0,16, 16, 13),createCuboidShape(0, 1, 13,16, 15, 14),createCuboidShape(1.8, 11.2, 14.54,14.3, 11.8, 15.14),createCuboidShape(2.5, 11.2, 13.07,3.1, 11.8, 14.57),createCuboidShape(12.6, 11.2, 13.07,13.2, 11.8, 14.57),createCuboidShape(1.8, 1.9, 14.44,14.3, 2.5, 15.04),createCuboidShape(2.5, 1.9, 12.47,3.1, 2.5, 14.47),createCuboidShape(12.6, 1.9, 12.47,13.2, 2.5, 14.47)); - protected static final VoxelShape COUNTER_OVEN_BOTTOM_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, COUNTER_OVEN_BOTTOM); - protected static final VoxelShape COUNTER_OVEN_BOTTOM_EAST = rotateShape(Direction.NORTH, Direction.EAST, COUNTER_OVEN_BOTTOM); - protected static final VoxelShape COUNTER_OVEN_BOTTOM_WEST = rotateShape(Direction.NORTH, Direction.WEST, COUNTER_OVEN_BOTTOM); + protected static final VoxelShape COUNTER_OVEN_MIDDLE = VoxelShapes.union(createCuboidShape(0, 0, 0,16, 16, 13),createCuboidShape(0, 1, 13,16, 15, 14),createCuboidShape(2, 10, 14.1,14, 11, 15.1),createCuboidShape(4, 2, 14.1,12, 3, 15.1)); protected static final VoxelShape COUNTER_OVEN_MIDDLE_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, COUNTER_OVEN_MIDDLE); protected static final VoxelShape COUNTER_OVEN_MIDDLE_EAST = rotateShape(Direction.NORTH, Direction.EAST, COUNTER_OVEN_MIDDLE); protected static final VoxelShape COUNTER_OVEN_MIDDLE_WEST = rotateShape(Direction.NORTH, Direction.WEST, COUNTER_OVEN_MIDDLE); @@ -128,15 +124,7 @@ public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos Direction dir = state.get(FACING); boolean up = connectsVertical(view.getBlockState(pos.up()).getBlock()); boolean down = connectsVertical(view.getBlockState(pos.down()).getBlock()); - if(up){ - return switch (dir){ - case NORTH -> COUNTER_OVEN_BOTTOM_SOUTH; - case SOUTH -> COUNTER_OVEN_BOTTOM; - case EAST -> COUNTER_OVEN_BOTTOM_WEST; - default -> COUNTER_OVEN_BOTTOM_EAST; - }; - } - else if(down) { + if(up || down) { return switch (dir){ case NORTH -> COUNTER_OVEN_MIDDLE_SOUTH; case SOUTH -> COUNTER_OVEN_MIDDLE; diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven.json index c7d097af1..466bd3547 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven.json @@ -1,35 +1,22 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", "4": "block/iron_block", - "5": "block/gray_concrete", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "6": "pfm:block/iron_stove", + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ - { - "from": [1, 1, 0], - "to": [15, 14, 0.5], - "faces": { - "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, - "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} - } - }, { "from": [15, 1, 0], "to": [16, 14, 13], "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, "east": {"uv": [3, 3, 16, 16], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base"}, "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, "down": {"uv": [15, 1, 16, 14], "texture": "#base"} } @@ -40,8 +27,8 @@ "rotation": {"angle": 0, "axis": "x", "origin": [15, 0, 0]}, "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, "down": {"uv": [14, 1, 15, 14], "texture": "#base"} @@ -59,13 +46,25 @@ "down": {"uv": [0, 0, 16, 12], "texture": "#base"} } }, + { + "from": [1, 1, 0], + "to": [15, 14, 0.5], + "faces": { + "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, + "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} + } + }, { "from": [1, 1, 1], "to": [15, 2, 13], "faces": { "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base"}, "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, "down": {"uv": [0, 0, 16, 12], "texture": "#base"} @@ -85,635 +84,104 @@ } }, { - "from": [0, 1, 13], - "to": [16, 3, 14], - "faces": { - "north": {"uv": [0, 11, 16, 15], "texture": "#4"}, - "east": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "south": {"uv": [0, 11, 16, 13], "texture": "#4"}, - "west": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#4"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#4"} - } - }, - { - "from": [0, 12.4, 13], + "from": [0, 12, 13], "to": [16, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 0]}, "faces": { "north": {"uv": [0, 1, 16, 2.6], "texture": "#4"}, - "east": {"uv": [15, 2, 16, 3.6], "texture": "#4"}, - "south": {"uv": [0, 8, 16, 9.6], "texture": "#4"}, - "west": {"uv": [0, 2, 1, 3.5], "texture": "#4"}, + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#6"}, + "south": {"uv": [0, 8.25, 4, 8.75], "texture": "#6"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#6"}, "up": {"uv": [0, 0, 16, 1], "texture": "#4"}, "down": {"uv": [0, 14, 16, 15], "texture": "#4"} } }, { - "from": [13, 3.5, 13], + "from": [0, 1, 13], "to": [16, 12, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [8, 3, 11, 11.5], "texture": "#4"}, - "east": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "south": {"uv": [13, 3, 16, 11.5], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#4"}, - "up": {"uv": [13, 1, 16, 2], "texture": "#4"}, - "down": {"uv": [13, 14, 16, 15], "texture": "#4"} - } - }, - { - "from": [0.025, 12, 12.7], - "to": [15.985, 12.5, 13.2], - "faces": { - "north": {"uv": [0, 7, 15.96, 7.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 15.96, 3.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 15.96, 0.5], "texture": "#5"}, - "down": {"uv": [0, 14, 15.96, 14.5], "texture": "#5"} - } - }, - { - "from": [3, 4.5, 13.5], - "to": [13, 10.8, 13.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "texture": "#2"}, - "south": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 9.5], "texture": "#2"}, - "up": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "down": {"uv": [3, 1.4, 13, 1.5], "texture": "#2"} - } - }, - { - "from": [0.025, 4.075, 12.7], - "to": [2.005, 11.975, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "from": [0.025, 2.975, 12.7], - "to": [15.985, 4.075, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "from": [3, 3.5, 13], - "to": [13, 4.8, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 9, 13, 10.5], "texture": "#4"}, - "east": {"uv": [1, 9, 2, 10.5], "texture": "#4"}, - "south": {"uv": [2, 8.2, 12, 9.5], "texture": "#4"}, - "west": {"uv": [14, 9, 15, 10.5], "texture": "#4"}, - "up": {"uv": [3, 14, 13, 15], "texture": "#4"}, - "down": {"uv": [3, 1, 13, 2], "texture": "#4"} - } - }, - { - "from": [3, 10.7, 13], - "to": [13, 12, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#4"}, - "south": {"uv": [2, 3, 12, 4.3], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#4"}, - "up": {"uv": [3, 0, 13, 1], "texture": "#4"}, - "down": {"uv": [1, 14, 11, 15], "texture": "#4"} - } - }, - { - "name": "door", - "from": [1.8, 11.2, 14.5375], - "to": [14.3, 11.8, 15.1375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 11.2, 13.06875], - "to": [3.1, 11.8, 14.56875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 11.2, 13.06875], - "to": [13.2, 11.8, 14.56875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 13.5]}, "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} + "north": {"uv": [3, 3, 6, 11.5], "texture": "#6"}, + "east": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "south": {"uv": [0, 9, 4, 11.75], "texture": "#6"}, + "west": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "up": {"uv": [0, 1, 3, 2], "texture": "#6"}, + "down": {"uv": [0, 3.5, 4, 3.75], "texture": "#6"} } }, { - "from": [0, 3.5, 13], - "to": [3, 12, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 14]}, + "from": [2, 10, 14.1], + "to": [14, 11, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 10, 15.1]}, "faces": { - "north": {"uv": [3, 3, 6, 11.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#4"}, - "south": {"uv": [0, 3, 3, 11.5], "texture": "#4"}, - "west": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "up": {"uv": [0, 1, 3, 2], "texture": "#4"}, - "down": {"uv": [0, 14, 3, 15], "texture": "#4"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [2, 7.4, 1.9], - "to": [14, 7.6, 2.1], + "from": [14, 11, 15.1], + "to": [2, 10, 14.1], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 11, 16.1]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [7.7, 4.9, 1.9], - "to": [7.9, 5.1, 11.9], + "from": [4, 2, 14.1], + "to": [12, 3, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, 15.1]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [12.2, 4.9, 1.9], - "to": [12.4, 5.1, 11.9], + "from": [12, 3, 15.1], + "to": [4, 2, 14.1], + "rotation": {"angle": 0, "axis": "y", "origin": [27, 3, 16.1]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [10.7, 4.9, 1.9], - "to": [10.9, 5.1, 11.9], + "name": "inside", + "from": [14.9072, 13.91406, 13.4], + "to": [1.0072, 2.11406, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9572, 8.01406, 7.95]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "east": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "south": {"uv": [7.75, 13.25, 11, 16], "texture": "#6"}, + "west": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "up": {"uv": [0, 13, 3.475, 15.725], "texture": "#6"}, + "down": {"uv": [4, 12.75, 7.475, 15.475], "texture": "#6"} } }, { - "from": [9.2, 4.9, 1.9], - "to": [9.4, 5.1, 11.9], + "from": [1, 7, 2], + "to": [15, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 12]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } }, { - "from": [13.7, 4.9, 1.9], - "to": [13.9, 5.1, 11.9], + "from": [1, 3, 2], + "to": [15, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 6.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 11.9], - "to": [14, 5.1, 12.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 1.9], - "to": [2.2, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 7], - "to": [14, 5.1, 7.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.975, 4.075, 12.7], - "to": [15.975, 11.975, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 2.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 7], - "to": [14, 7.6, 7.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 11.9], - "to": [14, 7.6, 12.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 7.4, 1.9], - "to": [6.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 7.4, 1.9], - "to": [4.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 4.9, 1.9], - "to": [3.6, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 7.4, 1.9], - "to": [3.6, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 4.9, 1.9], - "to": [4.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 4.9, 1.9], - "to": [6.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 1.9], - "to": [2.2, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 7.4, 1.9], - "to": [13.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 7.4, 1.9], - "to": [12.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 7.4, 1.9], - "to": [10.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 7.4, 1.9], - "to": [9.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 7.4, 1.9], - "to": [7.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "name": "door", - "from": [13, 12.6, 12.26875], - "to": [14.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [4, 12.6, 12.26875], - "to": [5.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2, 12.6, 12.26875], - "to": [3.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [11, 12.6, 12.26875], - "to": [12.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [7.3, 12.5, 12.26875], - "to": [8.8, 13.9, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.8, 1.9, 14.4375], - "to": [14.3, 2.5, 15.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 1.9, 12.46875], - "to": [3.1, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 1.9, 12.46875], - "to": [13.2, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [2, 4, 1], - "to": [14, 13, 1.2], - "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "texture": "#5"} - } - }, - { - "from": [2, 3.9, 0.9], - "to": [14, 4.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} - } - }, - { - "from": [13.9, 4, 0.9], - "to": [14.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [1.9, 4, 0.9], - "to": [2.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [2, 12.2, 1], - "to": [14, 13, 13], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } } ], @@ -759,7 +227,6 @@ } }, "groups": [ - 0, { "name": "Counter", "origin": [0, 0, 0], @@ -769,7 +236,7 @@ "name": "Base", "origin": [0, 0, 0], "color": 0, - "children": [1, 2, 3, 4] + "children": [0, 1, 2, 3, 4] }, 5 ] @@ -779,88 +246,37 @@ "origin": [8, 4, 14], "color": 0, "children": [ - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, { - "name": "oven_handle", - "origin": [8, 4, 14], + "name": "frontpanel", + "origin": [8, 3.4, 14], "color": 0, - "children": [15, 16, 17] + "children": [6, 7] }, - 18, { - "name": "griddle", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], + "color": 0, + "children": [8, 9] + }, + { + "name": "handlebottom", + "origin": [5, 11, 0], + "color": 0, + "children": [10, 11] + } + ] + }, + { + "name": "inside", + "origin": [7.9572, 8.01406, 7.45], + "color": 0, + "children": [ + 12, + { + "name": "rack", + "origin": [7.9572, 8.01406, 7.45], "color": 0, - "children": [ - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - { - "name": "cooktop", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "stovecontrols", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 44, - 45, - 46, - 47, - 48, - { - "name": "bottom_handle", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 49, - 50, - 51, - { - "name": "ovenInside", - "origin": [0, 0, 0], - "color": 0, - "children": [52, 53, 54, 55, 56] - } - ] - } - ] - } - ] - } - ] + "children": [13, 14] } ] } diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle.json index 5328e6fda..e97a63554 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle.json @@ -1,49 +1,46 @@ { "credit": "By UnlikePaladin", "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", "4": "block/iron_block", - "5": "block/gray_concrete", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "6": "pfm:block/iron_stove", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ - { - "from": [1, 1, 0], - "to": [15, 14, 0.5], - "faces": { - "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, - "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} - } - }, { "from": [15, 1, 0], "to": [16, 14, 13], "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, "east": {"uv": [3, 3, 16, 16], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#4"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#4"}, - "up": {"uv": [14, 0, 16, 15], "texture": "#4"}, - "down": {"uv": [15, 1, 16, 14], "texture": "#4"} + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base"}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "down": {"uv": [15, 1, 16, 14], "texture": "#base"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 13], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#base"}, + "east": {"uv": [3, 1, 16, 3], "texture": "#base"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#base"}, + "west": {"uv": [0, 1, 13, 3], "texture": "#base"}, + "up": {"uv": [0, 0, 16, 13], "texture": "#base"} } }, { "from": [0, 1, 0], "to": [1, 14, 13], - "rotation": {"angle": 0, "axis": "x", "origin": [15, 0, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#4"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#4"}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 15], "texture": "#4"}, - "down": {"uv": [14, 1, 15, 14], "texture": "#4"} + "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "down": {"uv": [14, 1, 15, 14], "texture": "#base"} } }, { @@ -52,666 +49,135 @@ "faces": { "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 15], "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base"} } }, { - "from": [0, 14, 0], - "to": [16, 16, 13], + "from": [1, 1, 0], + "to": [15, 14, 0.5], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, + "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} } }, { "from": [1, 1, 1], "to": [15, 2, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#4"} - } - }, - { - "from": [0, 1, 13], - "to": [16, 3, 14], - "faces": { - "north": {"uv": [0, 11, 16, 15], "texture": "#4"}, - "east": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "south": {"uv": [0, 11, 16, 13], "texture": "#4"}, - "west": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#4"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#4"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base"}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base"} } }, { - "from": [0, 12.4, 13], + "from": [0, 12, 13], "to": [16, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 0]}, "faces": { - "north": {"uv": [0, 1, 16, 3.6], "texture": "#4"}, - "east": {"uv": [15, 2, 16, 4.6], "texture": "#4"}, - "south": {"uv": [0, 8, 16, 10.6], "texture": "#4"}, - "west": {"uv": [0, 1, 1, 3.6], "texture": "#4"}, - "up": {"uv": [0, 1, 16, 2], "texture": "#4"}, + "north": {"uv": [0, 1, 16, 2.6], "texture": "#4"}, + "east": {"uv": [0, 0, 0.25, 0.75], "texture": "#6"}, + "south": {"uv": [0, 8, 4, 8.75], "texture": "#6"}, + "west": {"uv": [0, 0, 0.25, 0.75], "texture": "#6"}, + "up": {"uv": [0, 0, 16, 1.25], "texture": "#4"}, "down": {"uv": [0, 14, 16, 15], "texture": "#4"} } }, { - "from": [0.025, 12, 12.7], - "to": [15.985, 12.5, 13.2], - "faces": { - "north": {"uv": [0, 7, 15.96, 7.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 15.96, 3.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 15.96, 0.5], "texture": "#5"}, - "down": {"uv": [0, 14, 15.96, 14.5], "texture": "#5"} - } - }, - { - "from": [0.025, 4.075, 12.7], - "to": [2.005, 11.975, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "from": [0.025, 2.975, 12.7], - "to": [15.985, 4.075, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.8, 11.2, 14.5375], - "to": [14.3, 11.8, 15.1375], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 11.2, 13.06875], - "to": [3.1, 11.8, 14.56875], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 11.2, 13.06875], - "to": [13.2, 11.8, 14.56875], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [13, 3.5, 13], + "from": [0, 1, 13], "to": [16, 12, 14], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [8, 3, 11, 11.5], "texture": "#4"}, - "east": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "south": {"uv": [13, 3, 16, 11.5], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#4"}, - "up": {"uv": [13, 1, 16, 2], "texture": "#4"}, - "down": {"uv": [13, 14, 16, 15], "texture": "#4"} - } - }, - { - "from": [3, 3.5, 13], - "to": [13, 4.8, 14], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 9, 13, 10.5], "texture": "#4"}, - "east": {"uv": [1, 9, 2, 10.5], "texture": "#4"}, - "south": {"uv": [2, 8.2, 12, 9.5], "texture": "#4"}, - "west": {"uv": [14, 9, 15, 10.5], "texture": "#4"}, - "up": {"uv": [3, 14, 13, 15], "texture": "#4"}, - "down": {"uv": [3, 1, 13, 2], "texture": "#4"} - } - }, - { - "from": [3, 4.5, 13.5], - "to": [13, 10.8, 13.6], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "texture": "#2"}, - "south": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 9.5], "texture": "#2"}, - "up": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "down": {"uv": [3, 1.4, 13, 1.5], "texture": "#2"} - } - }, - { - "from": [3, 10.7, 13], - "to": [13, 12, 14], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#4"}, - "south": {"uv": [2, 3, 12, 4.3], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#4"}, - "up": {"uv": [3, 0, 13, 1], "texture": "#4"}, - "down": {"uv": [2, 14, 12, 15], "texture": "#4"} - } - }, - { - "from": [0, 3.5, 13], - "to": [3, 12, 14], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 3, 6, 11.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#4"}, - "south": {"uv": [0, 3, 3, 11.5], "texture": "#4"}, - "west": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "up": {"uv": [0, 1, 3, 2], "texture": "#4"}, - "down": {"uv": [0, 14, 3, 15], "texture": "#4"} - } - }, - { - "from": [2, 7.4, 1.9], - "to": [14, 7.6, 2.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 4.9, 1.9], - "to": [7.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 4.9, 1.9], - "to": [12.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 4.9, 1.9], - "to": [10.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 4.9, 1.9], - "to": [9.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 4.9, 1.9], - "to": [13.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 11.9], - "to": [14, 5.1, 12.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 1.9], - "to": [2.2, 5.1, 11.9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 13.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [3, 3, 6, 11.5], "texture": "#6"}, + "east": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "south": {"uv": [0, 9, 4, 11.75], "texture": "#6"}, + "west": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "up": {"uv": [0, 1, 3, 2], "texture": "#6"}, + "down": {"uv": [0, 3.5, 4, 3.75], "texture": "#6"} } }, { - "from": [2, 4.9, 7], - "to": [14, 5.1, 7.2], + "from": [2, 10, 14.1], + "to": [14, 11, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 10, 15.1]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [13.975, 4.075, 12.7], - "to": [15.975, 11.975, 13.2], + "from": [14, 11, 15.1], + "to": [2, 10, 14.1], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 11, 16.1]}, "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 2.1], + "from": [4, 2, 14.1], + "to": [12, 3, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, 15.1]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [2, 7.4, 7], - "to": [14, 7.6, 7.2], + "from": [12, 3, 15.1], + "to": [4, 2, 14.1], + "rotation": {"angle": 0, "axis": "y", "origin": [27, 3, 16.1]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [2, 7.4, 11.9], - "to": [14, 7.6, 12.1], + "name": "inside", + "from": [14.9072, 13.91406, 13.6], + "to": [1.0072, 2.11406, 2.7], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9572, 8.01406, 8.15]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "east": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "south": {"uv": [7.75, 13.25, 11, 16], "texture": "#6"}, + "west": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "up": {"uv": [0, 13, 3.475, 15.725], "texture": "#6"}, + "down": {"uv": [4, 12.75, 7.475, 15.475], "texture": "#6"} } }, { - "from": [6.2, 7.4, 1.9], - "to": [6.4, 7.6, 11.9], + "from": [1, 3, 2], + "to": [15, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 6.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } }, { - "from": [4.7, 7.4, 1.9], - "to": [4.9, 7.6, 11.9], + "from": [1, 7, 2], + "to": [15, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 6.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 4.9, 1.9], - "to": [3.6, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 7.4, 1.9], - "to": [3.6, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 4.9, 1.9], - "to": [4.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 4.9, 1.9], - "to": [6.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 1.9], - "to": [2.2, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 7.4, 1.9], - "to": [13.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 7.4, 1.9], - "to": [12.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 7.4, 1.9], - "to": [10.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 7.4, 1.9], - "to": [9.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 7.4, 1.9], - "to": [7.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "name": "door", - "from": [13, 12.9, 12.26875], - "to": [14.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [4, 12.9, 12.26875], - "to": [5.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2, 12.9, 12.26875], - "to": [3.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [11, 12.9, 12.26875], - "to": [12.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [7.3, 12.8, 12.26875], - "to": [8.8, 14.2, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.8, 1.9, 14.4375], - "to": [14.3, 2.5, 15.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 1.9, 12.46875], - "to": [3.1, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 1.9, 12.46875], - "to": [13.2, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [2, 4, 1], - "to": [14, 13, 1.2], - "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "texture": "#5"} - } - }, - { - "from": [2, 3.9, 0.9], - "to": [14, 4.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} - } - }, - { - "from": [13.9, 4, 0.9], - "to": [14.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [1.9, 4, 0.9], - "to": [2.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [2, 12.2, 1], - "to": [14, 13, 13], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } } ], @@ -757,7 +223,6 @@ } }, "groups": [ - 0, { "name": "Counter", "origin": [0, 0, 0], @@ -767,7 +232,7 @@ "name": "Base", "origin": [0, 0, 0], "color": 0, - "children": [1, 2, 3, 4, 5] + "children": [0, 1, 2, 3, 4, 5] } ] }, @@ -776,95 +241,37 @@ "origin": [8, 4, 14], "color": 0, "children": [ - 6, - 7, - 8, - 9, - 10, { - "name": "group", - "origin": [8, 4, 14], + "name": "frontpanel", + "origin": [8, 3.4, 14], "color": 0, - "children": [ - { - "name": "oven_handle", - "origin": [8, 4, 14], - "color": 0, - "children": [11, 12, 13] - }, - 14, - 15, - 16, - 17, - 18 - ] + "children": [6, 7] }, { - "name": "griddle", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], + "color": 0, + "children": [8, 9] + }, + { + "name": "handlebottom", + "origin": [5, 11, 0], + "color": 0, + "children": [10, 11] + } + ] + }, + { + "name": "inside", + "origin": [7.9572, 8.01406, 7.45], + "color": 0, + "children": [ + 12, + { + "name": "rack", + "origin": [7.9572, 8.01406, 7.45], "color": 0, - "children": [ - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - { - "name": "cooktop", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "stovecontrols", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 44, - 45, - 46, - 47, - 48, - { - "name": "bottom_handle", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 49, - 50, - 51, - { - "name": "ovenInside", - "origin": [0, 0, 0], - "color": 0, - "children": [52, 53, 54, 55, 56] - } - ] - } - ] - } - ] - } - ] + "children": [13, 14] } ] } diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle_open.json index 002cc39ee..9d85a11e1 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_middle_open.json @@ -1,49 +1,46 @@ { "credit": "By UnlikePaladin", "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", "4": "block/iron_block", - "5": "block/gray_concrete", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "6": "pfm:block/iron_stove", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ - { - "from": [1, 1, 0], - "to": [15, 14, 0.5], - "faces": { - "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, - "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} - } - }, { "from": [15, 1, 0], "to": [16, 14, 13], "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, "east": {"uv": [3, 3, 16, 16], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#4"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#4"}, - "up": {"uv": [14, 0, 16, 15], "texture": "#4"}, - "down": {"uv": [15, 1, 16, 14], "texture": "#4"} + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base"}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "down": {"uv": [15, 1, 16, 14], "texture": "#base"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 13], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#base"}, + "east": {"uv": [3, 1, 16, 3], "texture": "#base"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#base"}, + "west": {"uv": [0, 1, 13, 3], "texture": "#base"}, + "up": {"uv": [0, 0, 16, 13], "texture": "#base"} } }, { "from": [0, 1, 0], "to": [1, 14, 13], - "rotation": {"angle": 0, "axis": "x", "origin": [15, 0, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#4"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#4"}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 15], "texture": "#4"}, - "down": {"uv": [14, 1, 15, 14], "texture": "#4"} + "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "down": {"uv": [14, 1, 15, 14], "texture": "#base"} } }, { @@ -52,666 +49,135 @@ "faces": { "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 15], "texture": "#base"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base"} } }, { - "from": [0, 14, 0], - "to": [16, 16, 13], + "from": [1, 1, 0], + "to": [15, 14, 0.5], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 2], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, + "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} } }, { "from": [1, 1, 1], "to": [15, 2, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#4"} - } - }, - { - "from": [0, 1, 13], - "to": [16, 3, 14], - "faces": { - "north": {"uv": [0, 11, 16, 15], "texture": "#4"}, - "east": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "south": {"uv": [0, 11, 16, 13], "texture": "#4"}, - "west": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#4"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#4"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base"}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base"} } }, { - "from": [0, 12.4, 13], + "from": [0, 12, 13], "to": [16, 15, 14], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 1, 14.05]}, "faces": { - "north": {"uv": [0, 1, 16, 3.6], "texture": "#4"}, - "east": {"uv": [15, 2, 16, 4.6], "texture": "#4"}, - "south": {"uv": [0, 8, 16, 10.6], "texture": "#4"}, - "west": {"uv": [0, 1, 1, 3.6], "texture": "#4"}, - "up": {"uv": [0, 1, 16, 2], "texture": "#4"}, + "north": {"uv": [0, 1, 16, 2.6], "texture": "#4"}, + "east": {"uv": [0, 0, 0.25, 0.75], "texture": "#6"}, + "south": {"uv": [0, 8, 4, 8.75], "texture": "#6"}, + "west": {"uv": [0, 0, 0.25, 0.75], "texture": "#6"}, + "up": {"uv": [0, 0, 16, 1.25], "texture": "#4"}, "down": {"uv": [0, 14, 16, 15], "texture": "#4"} } }, { - "from": [0.025, 12, 12.7], - "to": [15.985, 12.5, 13.2], - "faces": { - "north": {"uv": [0, 7, 15.96, 7.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 15.96, 3.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 15.96, 0.5], "texture": "#5"}, - "down": {"uv": [0, 14, 15.96, 14.5], "texture": "#5"} - } - }, - { - "from": [0.025, 4.075, 12.7], - "to": [2.005, 11.975, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "from": [0.025, 2.975, 12.7], - "to": [15.985, 4.075, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.8, 11.2, 14.5375], - "to": [14.3, 11.8, 15.1375], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 11.2, 13.06875], - "to": [3.1, 11.8, 14.56875], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 11.2, 13.06875], - "to": [13.2, 11.8, 14.56875], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [13, 3.5, 13], - "to": [16, 12, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [8, 3, 11, 11.5], "texture": "#4"}, - "east": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "south": {"uv": [13, 3, 16, 11.5], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#4"}, - "up": {"uv": [13, 1, 16, 2], "texture": "#4"}, - "down": {"uv": [13, 14, 16, 15], "texture": "#4"} - } - }, - { - "from": [3, 3.5, 13], - "to": [13, 4.8, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 9, 13, 10.5], "texture": "#4"}, - "east": {"uv": [1, 9, 2, 10.5], "texture": "#4"}, - "south": {"uv": [2, 8.2, 12, 9.5], "texture": "#4"}, - "west": {"uv": [14, 9, 15, 10.5], "texture": "#4"}, - "up": {"uv": [3, 14, 13, 15], "texture": "#4"}, - "down": {"uv": [3, 1, 13, 2], "texture": "#4"} - } - }, - { - "from": [3, 4.5, 13.5], - "to": [13, 10.8, 13.6], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "texture": "#2"}, - "south": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 9.5], "texture": "#2"}, - "up": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "down": {"uv": [3, 1.4, 13, 1.5], "texture": "#2"} - } - }, - { - "from": [3, 10.7, 13], - "to": [13, 12, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#4"}, - "south": {"uv": [2, 3, 12, 4.3], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#4"}, - "up": {"uv": [3, 0, 13, 1], "texture": "#4"}, - "down": {"uv": [2, 14, 12, 15], "texture": "#4"} - } - }, - { - "from": [0, 3.5, 13], - "to": [3, 12, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 3, 6, 11.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#4"}, - "south": {"uv": [0, 3, 3, 11.5], "texture": "#4"}, - "west": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "up": {"uv": [0, 1, 3, 2], "texture": "#4"}, - "down": {"uv": [0, 14, 3, 15], "texture": "#4"} - } - }, - { - "from": [2, 7.4, 1.9], - "to": [14, 7.6, 2.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 4.9, 1.9], - "to": [7.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 4.9, 1.9], - "to": [12.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 4.9, 1.9], - "to": [10.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 4.9, 1.9], - "to": [9.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 4.9, 1.9], - "to": [13.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 11.9], - "to": [14, 5.1, 12.1], + "from": [0, 1, 12.1], + "to": [16, 12, 13.1], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 1, 13.15]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [0, 9, 4, 11.75], "texture": "#6"}, + "east": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "south": {"uv": [0, 9, 4, 11.75], "texture": "#6"}, + "west": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "up": {"uv": [0, 1, 3, 2], "texture": "#6"}, + "down": {"uv": [0, 3.5, 4, 3.75], "texture": "#6"} } }, { - "from": [2, 4.9, 1.9], - "to": [2.2, 5.1, 11.9], + "from": [2, 10, 13.2], + "to": [14, 11, 14.2], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 1, 13.15]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [2, 4.9, 7], - "to": [14, 5.1, 7.2], + "from": [14, 11, 14.2], + "to": [2, 10, 13.2], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 1, 13.15]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [13.975, 4.075, 12.7], - "to": [15.975, 11.975, 13.2], + "from": [4, 2, 13.2], + "to": [12, 3, 14.2], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 1, 13.15]}, "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 2.1], + "from": [12, 3, 14.2], + "to": [4, 2, 13.2], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 1, 13.15]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [2, 7.4, 7], - "to": [14, 7.6, 7.2], + "name": "inside", + "from": [1, 7, 2], + "to": [15, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 6.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } }, { - "from": [2, 7.4, 11.9], - "to": [14, 7.6, 12.1], + "from": [1, 3, 2], + "to": [15, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 6.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } }, { - "from": [6.2, 7.4, 1.9], - "to": [6.4, 7.6, 11.9], + "from": [14.9072, 13.91406, 12.9], + "to": [1.0072, 2.11406, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9572, 8.01406, 7.45]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 7.4, 1.9], - "to": [4.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 4.9, 1.9], - "to": [3.6, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 7.4, 1.9], - "to": [3.6, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 4.9, 1.9], - "to": [4.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 4.9, 1.9], - "to": [6.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 1.9], - "to": [2.2, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 7.4, 1.9], - "to": [13.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 7.4, 1.9], - "to": [12.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 7.4, 1.9], - "to": [10.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 7.4, 1.9], - "to": [9.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 7.4, 1.9], - "to": [7.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "name": "door", - "from": [13, 12.9, 12.26875], - "to": [14.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [4, 12.9, 12.26875], - "to": [5.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2, 12.9, 12.26875], - "to": [3.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [11, 12.9, 12.26875], - "to": [12.2, 14.1, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [7.3, 12.8, 12.26875], - "to": [8.8, 14.2, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.8, 1.9, 14.4375], - "to": [14.3, 2.5, 15.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 1.9, 12.46875], - "to": [3.1, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 1.9, 12.46875], - "to": [13.2, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [2, 4, 1], - "to": [14, 13, 1.2], - "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "texture": "#5"} - } - }, - { - "from": [2, 3.9, 0.9], - "to": [14, 4.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} - } - }, - { - "from": [13.9, 4, 0.9], - "to": [14.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [1.9, 4, 0.9], - "to": [2.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [2, 12.2, 1], - "to": [14, 13, 13], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} + "east": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "south": {"uv": [7.75, 13.25, 11, 16], "texture": "#6"}, + "west": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "up": {"uv": [0, 13, 3.475, 15.725], "texture": "#6"}, + "down": {"uv": [4, 12.75, 7.475, 15.475], "texture": "#6"} } } ], @@ -757,7 +223,6 @@ } }, "groups": [ - 0, { "name": "Counter", "origin": [0, 0, 0], @@ -767,7 +232,7 @@ "name": "Base", "origin": [0, 0, 0], "color": 0, - "children": [1, 2, 3, 4, 5] + "children": [0, 1, 2, 3, 4, 5] } ] }, @@ -776,95 +241,37 @@ "origin": [8, 4, 14], "color": 0, "children": [ - 6, - 7, - 8, - 9, - 10, { - "name": "group", - "origin": [8, 4, 14], + "name": "frontpanel", + "origin": [8, 3.4, 14], "color": 0, - "children": [ - { - "name": "oven_handle", - "origin": [8, 4, 14], - "color": 0, - "children": [11, 12, 13] - }, - 14, - 15, - 16, - 17, - 18 - ] + "children": [6, 7] }, { - "name": "griddle", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], + "color": 0, + "children": [8, 9] + }, + { + "name": "handlebottom", + "origin": [5, 11, 0], + "color": 0, + "children": [10, 11] + } + ] + }, + { + "name": "inside", + "origin": [7.9572, 8.01406, 7.45], + "color": 0, + "children": [ + 12, + { + "name": "rack", + "origin": [7.9572, 8.01406, 7.45], "color": 0, - "children": [ - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - { - "name": "cooktop", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "stovecontrols", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 44, - 45, - 46, - 47, - 48, - { - "name": "bottom_handle", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 49, - 50, - 51, - { - "name": "ovenInside", - "origin": [0, 0, 0], - "color": 0, - "children": [52, 53, 54, 55, 56] - } - ] - } - ] - } - ] - } - ] + "children": [13, 14] } ] } diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_open.json index 4c506628a..94648d4dc 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter_oven/kitchen_counter_oven_open.json @@ -1,35 +1,21 @@ { "credit": "By UnlikePaladin", "textures": { - "2": "block/black_stained_glass", - "3": "block/light_gray_concrete", "4": "block/iron_block", - "5": "block/gray_concrete", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "6": "pfm:block/iron_stove", + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ - { - "from": [1, 1, 0], - "to": [15, 14, 0.5], - "faces": { - "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, - "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, - "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, - "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} - } - }, { "from": [15, 1, 0], "to": [16, 14, 13], "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, "east": {"uv": [3, 3, 16, 16], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 15], "texture": "#base"}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base"}, "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, "down": {"uv": [15, 1, 16, 14], "texture": "#base"} } @@ -37,11 +23,11 @@ { "from": [0, 1, 0], "to": [1, 14, 13], - "rotation": {"angle": 0, "axis": "x", "origin": [15, 0, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "east": {"uv": [2, 0, 16, 15], "texture": "#base"}, - "south": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base"}, "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, "up": {"uv": [14, 0, 16, 15], "texture": "#base"}, "down": {"uv": [14, 1, 15, 14], "texture": "#base"} @@ -59,13 +45,25 @@ "down": {"uv": [0, 0, 16, 12], "texture": "#base"} } }, + { + "from": [1, 1, 0], + "to": [15, 14, 0.5], + "faces": { + "north": {"uv": [1, 3, 15, 16], "texture": "#base"}, + "east": {"uv": [14, 0, 16, 15], "texture": "#base"}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base"}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base"}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base"} + } + }, { "from": [1, 1, 1], "to": [15, 2, 13], "faces": { "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base"}, "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, "down": {"uv": [0, 0, 16, 12], "texture": "#base"} @@ -85,635 +83,104 @@ } }, { - "from": [0, 1, 13], - "to": [16, 3, 14], - "faces": { - "north": {"uv": [0, 11, 16, 15], "texture": "#4"}, - "east": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "south": {"uv": [0, 11, 16, 13], "texture": "#4"}, - "west": {"uv": [15, 11, 16, 13], "texture": "#4"}, - "up": {"uv": [0, 14, 16, 15], "texture": "#4"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#4"} - } - }, - { - "from": [0, 12.4, 13], + "from": [0, 12, 13], "to": [16, 14, 14], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.75, 14.05]}, "faces": { "north": {"uv": [0, 1, 16, 2.6], "texture": "#4"}, - "east": {"uv": [15, 2, 16, 3.6], "texture": "#4"}, - "south": {"uv": [0, 8, 16, 9.6], "texture": "#4"}, - "west": {"uv": [0, 2, 1, 3.5], "texture": "#4"}, + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#6"}, + "south": {"uv": [0, 8.25, 4, 8.75], "texture": "#6"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#6"}, "up": {"uv": [0, 0, 16, 1], "texture": "#4"}, "down": {"uv": [0, 14, 16, 15], "texture": "#4"} } }, { - "from": [0.025, 12, 12.7], - "to": [15.985, 12.5, 13.2], - "faces": { - "north": {"uv": [0, 7, 15.96, 7.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 15.96, 3.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 15.96, 0.5], "texture": "#5"}, - "down": {"uv": [0, 14, 15.96, 14.5], "texture": "#5"} - } - }, - { - "from": [0.025, 4.075, 12.7], - "to": [2.005, 11.975, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "from": [0.025, 2.975, 12.7], - "to": [15.985, 4.075, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.8, 11.2, 14.5375], - "to": [14.3, 11.8, 15.1375], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 11.2, 13.06875], - "to": [3.1, 11.8, 14.56875], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 11.2, 13.06875], - "to": [13.2, 11.8, 14.56875], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 1.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 1.5, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [0, 3.5, 13], - "to": [3, 12, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 3, 6, 11.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 11.5], "texture": "#4"}, - "south": {"uv": [0, 3, 3, 11.5], "texture": "#4"}, - "west": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "up": {"uv": [0, 1, 3, 2], "texture": "#4"}, - "down": {"uv": [0, 14, 3, 15], "texture": "#4"} - } - }, - { - "from": [3, 4.5, 13.5], - "to": [13, 10.8, 13.6], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, - "faces": { - "north": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "east": {"uv": [1.4, 4.2, 1.5, 9.5], "texture": "#2"}, - "south": {"uv": [3, 4.2, 13, 9.5], "texture": "#2"}, - "west": {"uv": [14.5, 4.2, 14.6, 9.5], "texture": "#2"}, - "up": {"uv": [3, 14.5, 13, 14.6], "texture": "#2"}, - "down": {"uv": [3, 1.4, 13, 1.5], "texture": "#2"} - } - }, - { - "from": [3, 3.5, 13], - "to": [13, 4.8, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, + "from": [0, 1.42426, 11.62426], + "to": [16, 12.42426, 12.62426], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.75, 12.25]}, "faces": { - "north": {"uv": [3, 9, 13, 10.5], "texture": "#4"}, - "east": {"uv": [1, 9, 2, 10.5], "texture": "#4"}, - "south": {"uv": [2, 8.2, 12, 9.5], "texture": "#4"}, - "west": {"uv": [14, 9, 15, 10.5], "texture": "#4"}, - "up": {"uv": [3, 14, 13, 15], "texture": "#4"}, - "down": {"uv": [3, 1, 13, 2], "texture": "#4"} + "north": {"uv": [0, 9, 4, 11.75], "texture": "#6"}, + "east": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "south": {"uv": [0, 9, 4, 11.75], "texture": "#6"}, + "west": {"uv": [0, 0.5, 0.25, 3], "texture": "#6"}, + "up": {"uv": [0, 1, 3, 2], "texture": "#6"}, + "down": {"uv": [0, 3.5, 4, 3.75], "texture": "#6"} } }, { - "from": [3, 10.7, 13], - "to": [13, 12, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, + "from": [2, 10.42426, 12.72426], + "to": [14, 11.42426, 13.72426], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.75, 12.25]}, "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#4"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#4"}, - "south": {"uv": [2, 3, 12, 4.3], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#4"}, - "up": {"uv": [3, 0, 13, 1], "texture": "#4"}, - "down": {"uv": [3, 14, 13, 15], "texture": "#4"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [13, 3.5, 13], - "to": [16, 12, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 4, 14]}, + "from": [14, 11.42426, 13.72426], + "to": [2, 10.42426, 12.72426], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.75, 12.25]}, "faces": { - "north": {"uv": [8, 3, 11, 11.5], "texture": "#4"}, - "east": {"uv": [15, 3, 16, 11.5], "texture": "#4"}, - "south": {"uv": [13, 3, 16, 11.5], "texture": "#4"}, - "west": {"uv": [2, 3, 3, 11.5], "texture": "#4"}, - "up": {"uv": [13, 1, 16, 2], "texture": "#4"}, - "down": {"uv": [13, 14, 16, 15], "texture": "#4"} + "north": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "east": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"}, + "south": {"uv": [8.5, 4, 11.5, 4.25], "texture": "#6"}, + "west": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#6"} } }, { - "from": [2, 7.4, 1.9], - "to": [14, 7.6, 2.1], + "from": [4, 2.42426, 12.72426], + "to": [12, 3.42426, 13.72426], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.75, 12.25]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [7.7, 4.9, 1.9], - "to": [7.9, 5.1, 11.9], + "from": [12, 3.42426, 13.72426], + "to": [4, 2.42426, 12.72426], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.75, 12.25]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "north": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "east": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"}, + "south": {"uv": [8.5, 4.25, 10.5, 4.5], "texture": "#6"}, + "west": {"uv": [8.5, 4.25, 8.75, 4.5], "texture": "#6"} } }, { - "from": [12.2, 4.9, 1.9], - "to": [12.4, 5.1, 11.9], + "name": "inside", + "from": [1, 7, 2], + "to": [15, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 6.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } }, { - "from": [10.7, 4.9, 1.9], - "to": [10.9, 5.1, 11.9], + "from": [1, 3, 2], + "to": [15, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 6.5]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + "south": {"uv": [8.75, 8.25, 12.25, 8.5], "texture": "#6"}, + "up": {"uv": [11.25, 8.25, 8.75, 4.75], "rotation": 90, "texture": "#6"} } }, { - "from": [9.2, 4.9, 1.9], - "to": [9.4, 5.1, 11.9], + "from": [14.9072, 13.91406, 12.9], + "to": [1.0072, 2.11406, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9572, 8.01406, 7.45]}, "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 4.9, 1.9], - "to": [13.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 11.9], - "to": [14, 5.1, 12.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 1.9], - "to": [2.2, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 4.9, 7], - "to": [14, 5.1, 7.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.975, 4.075, 12.7], - "to": [15.975, 11.975, 13.2], - "faces": { - "north": {"uv": [1, 7, 14, 8.5], "texture": "#5"}, - "east": {"uv": [5, 3, 6, 10.5], "texture": "#5"}, - "south": {"uv": [0, 3, 13, 4.5], "texture": "#5"}, - "west": {"uv": [2, 3, 3, 10.5], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#5"}, - "down": {"uv": [0, 14, 16, 15], "texture": "#5"} - } - }, - { - "from": [2, 4.9, 1.9], - "to": [14, 5.1, 2.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 7], - "to": [14, 7.6, 7.2], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 11.9], - "to": [14, 7.6, 12.1], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 7.4, 1.9], - "to": [6.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 7.4, 1.9], - "to": [4.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 4.9, 1.9], - "to": [3.6, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [3.4, 7.4, 1.9], - "to": [3.6, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [4.7, 4.9, 1.9], - "to": [4.9, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [6.2, 4.9, 1.9], - "to": [6.4, 5.1, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [2, 7.4, 1.9], - "to": [2.2, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [13.7, 7.4, 1.9], - "to": [13.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [12.2, 7.4, 1.9], - "to": [12.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [10.7, 7.4, 1.9], - "to": [10.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [9.2, 7.4, 1.9], - "to": [9.4, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "from": [7.7, 7.4, 1.9], - "to": [7.9, 7.6, 11.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#3"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#3"} - } - }, - { - "name": "door", - "from": [13, 12.6, 12.26875], - "to": [14.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [4, 12.6, 12.26875], - "to": [5.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2, 12.6, 12.26875], - "to": [3.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [11, 12.6, 12.26875], - "to": [12.2, 13.8, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [7.3, 12.5, 12.26875], - "to": [8.8, 13.9, 14.26875], - "faces": { - "north": {"uv": [0, 0, 1.5, 1.5], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.5, 1.5], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.5, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.5], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.8, 1.9, 14.4375], - "to": [14.3, 2.5, 15.0375], - "rotation": {"angle": 0, "axis": "y", "origin": [3.35938, 3, 15]}, - "faces": { - "north": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "south": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 0.6], "texture": "#3"}, - "up": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"}, - "down": {"uv": [0, 0, 12.5, 0.6], "texture": "#3"} - } - }, - { - "name": "door", - "from": [2.5, 1.9, 12.46875], - "to": [3.1, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "door", - "from": [12.6, 1.9, 12.46875], - "to": [13.2, 2.5, 14.46875], - "faces": { - "north": {"uv": [0, 0, 0.6, 0.6], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 0, 0.6, 0.6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [0, 0, 0.6, 2], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2, 0.6], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [2, 4, 1], - "to": [14, 13, 1.2], - "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 180, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "texture": "#5"} - } - }, - { - "from": [2, 3.9, 0.9], - "to": [14, 4.1, 12.9], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} - } - }, - { - "from": [13.9, 4, 0.9], - "to": [14.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [1.9, 4, 0.9], - "to": [2.1, 13, 12.9], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 1, 4], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 14, 1, 16], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [2, 12.2, 1], - "to": [14, 13, 13], - "faces": { - "north": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "south": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 1], "texture": "#5"}, - "up": {"uv": [4, 2, 15.99, 15], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#5"} + "east": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "south": {"uv": [7.75, 13.25, 11, 16], "texture": "#6"}, + "west": {"uv": [4, 12.75, 7.5, 15.5], "texture": "#6"}, + "up": {"uv": [0, 13, 3.475, 15.725], "texture": "#6"}, + "down": {"uv": [4, 12.75, 7.475, 15.475], "texture": "#6"} } } ], @@ -759,7 +226,6 @@ } }, "groups": [ - 0, { "name": "Counter", "origin": [0, 0, 0], @@ -769,7 +235,20 @@ "name": "Base", "origin": [0, 0, 0], "color": 0, - "children": [1, 2, 3, 4] + "children": [] + } + ] + }, + { + "name": "Counter", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "Base", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4] }, 5 ] @@ -779,95 +258,37 @@ "origin": [8, 4, 14], "color": 0, "children": [ - 6, - 7, - 8, - 9, - 10, { - "name": "group", - "origin": [8, 4, 14], + "name": "frontpanel", + "origin": [8, 3.4, 14], "color": 0, - "children": [ - { - "name": "oven_handle", - "origin": [8, 4, 14], - "color": 0, - "children": [11, 12, 13] - }, - 14, - 15, - 16, - 17, - 18 - ] + "children": [6, 7] }, { - "name": "griddle", - "origin": [0, 0, 0], + "name": "handletop", + "origin": [5, 11, 0], + "color": 0, + "children": [8, 9] + }, + { + "name": "handlebottom", + "origin": [5, 11, 0], + "color": 0, + "children": [10, 11] + } + ] + }, + { + "name": "inside", + "origin": [7.9572, 8.01406, 7.45], + "color": 0, + "children": [ + 12, + { + "name": "rack", + "origin": [7.9572, 8.01406, 7.45], "color": 0, - "children": [ - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - { - "name": "cooktop", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "stovecontrols", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 44, - 45, - 46, - 47, - 48, - { - "name": "bottom_handle", - "origin": [0, 0, 0], - "color": 0, - "children": [ - 49, - 50, - 51, - { - "name": "ovenInside", - "origin": [0, 0, 0], - "color": 0, - "children": [52, 53, 54, 55, 56] - } - ] - } - ] - } - ] - } - ] + "children": [13, 14] } ] } From 6919a0f35fa874f6d0cecabb0f279b620ab2452d Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:31:25 -0600 Subject: [PATCH 16/17] Overhaul Stovetop to match new appearance --- .../pfm/blocks/KitchenStovetopBlock.java | 2 +- .../pfm/client/ColorRegistry.java | 1 + .../render/StovetopBlockEntityRenderer.java | 8 +- .../kitchen_counter/kitchen_stovetop.json | 444 ++---------------- 4 files changed, 44 insertions(+), 411 deletions(-) diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenStovetopBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenStovetopBlock.java index 2878a1084..cadfc0a61 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenStovetopBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/KitchenStovetopBlock.java @@ -106,7 +106,7 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { return this.getDefaultState().with(FACING, ctx.getPlayerFacing()); } - protected static final VoxelShape STOVETOP = VoxelShapes.union(createCuboidShape(0, 0, 1, 16, 0.5, 15)); + protected static final VoxelShape STOVETOP = VoxelShapes.union(createCuboidShape(0, 0, 1, 16, 1, 15)); protected static final VoxelShape STOVETOP_SOUTH = rotateShape(Direction.NORTH, Direction.SOUTH, STOVETOP); protected static final VoxelShape STOVETOP_EAST = rotateShape(Direction.NORTH, Direction.EAST, STOVETOP); protected static final VoxelShape STOVETOP_WEST = rotateShape(Direction.NORTH, Direction.WEST, STOVETOP); diff --git a/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java index 51200a8ba..7c4a86422 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java @@ -57,6 +57,7 @@ public static void registerBlockRenderLayers() { registerBlockToRenderLayer(PaladinFurnitureModBlocksItems.WHITE_MIRROR, RenderLayer.getCutout()); registerBlockToRenderLayer(PaladinFurnitureModBlocksItems.GRAY_MIRROR, RenderLayer.getCutout()); registerBlockToRenderLayer(PaladinFurnitureModBlocksItems.BASIC_LAMP, RenderLayer.getCutout()); + registerBlockToRenderLayer(PaladinFurnitureModBlocksItems.KITCHEN_STOVETOP, RenderLayer.getCutout()); } public static void registerItemColors() { diff --git a/common/src/main/java/com/unlikepaladin/pfm/entity/render/StovetopBlockEntityRenderer.java b/common/src/main/java/com/unlikepaladin/pfm/entity/render/StovetopBlockEntityRenderer.java index a40c038a6..4af8cd9fa 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/entity/render/StovetopBlockEntityRenderer.java +++ b/common/src/main/java/com/unlikepaladin/pfm/entity/render/StovetopBlockEntityRenderer.java @@ -36,16 +36,16 @@ public void render(StovetopBlockEntity stovetopBlockEntity, float f, MatrixStack int rot = 45; switch(direction) { case NORTH: - matrices.translate(0.5, 0.05, 0.45); + matrices.translate(0.5, 0.08, 0.45); break; case SOUTH: - matrices.translate(0.5, 0.05, 0.55); + matrices.translate(0.5, 0.08, 0.55); break; case WEST: - matrices.translate(0.45, 0.05, 0.5); + matrices.translate(0.45, 0.08, 0.5); break; case EAST: - matrices.translate(0.55, 0.05, 0.5); + matrices.translate(0.55, 0.08, 0.5); } rot = 180; matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(g)); diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_stovetop.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_stovetop.json index 51b74b7eb..79a898fac 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_stovetop.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_stovetop.json @@ -1,403 +1,61 @@ { "credit": "By UnlikePaladin", + "texture_size": [64, 64], "textures": { - "3": "block/light_gray_concrete", - "4": "block/iron_block", - "5": "block/gray_concrete", - "particle": "block/iron_block" + "6": "pfm:block/iron_stove" }, "elements": [ { - "from": [14, 0, 3.9], - "to": [16, 0.5, 14.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, + "from": [1, 0, 3], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.25, 9]}, "faces": { - "north": {"uv": [6.5, 0, 8.5, 0.5], "texture": "#4"}, - "east": {"uv": [0.3, 0, 10.5, 0.5], "texture": "#4"}, - "south": {"uv": [6.5, 0, 8.5, 0.5], "texture": "#4"}, - "west": {"uv": [2, 1, 12.2, 1.5], "texture": "#4"}, - "up": {"uv": [0, 3, 2, 13], "rotation": 180, "texture": "#4"}, - "down": {"uv": [6.5, 2, 8.5, 12.2], "rotation": 180, "texture": "#4"} + "south": {"uv": [0.3, 0, 3.8, 0.25], "texture": "#6"}, + "up": {"uv": [4.5, 0, 8, 3], "rotation": 180, "texture": "#6"}, + "down": {"uv": [0.25, 0.75, 3.75, 3.75], "rotation": 180, "texture": "#6", "cullface": "down"} } }, { - "from": [0, 0, 1.1], - "to": [2, 0.5, 14.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, + "from": [1, 1.01, 3], + "to": [15, 1.01, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.75, 9]}, "faces": { - "north": {"uv": [14, 15.5, 16, 16], "texture": "#4"}, - "east": {"uv": [2, 2, 15, 2.5], "texture": "#4"}, - "south": {"uv": [6.5, 0, 8.5, 0.5], "texture": "#4"}, - "west": {"uv": [2, 0, 15, 0.5], "texture": "#4"}, - "up": {"uv": [14, 3, 16, 16], "rotation": 180, "texture": "#4"}, - "down": {"uv": [6.5, 2, 8.5, 15], "rotation": 180, "texture": "#4"} + "up": {"uv": [12.5, 0.25, 16, 3], "rotation": 180, "texture": "#6"}, + "down": {"uv": [6.5, 2, 8.5, 12.2], "rotation": 180, "texture": "#missing"} } }, { - "from": [0, 0, 14.1], - "to": [16, 0.5, 15.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, + "from": [15, 0, 1], + "to": [16, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 0.25, 9]}, "faces": { - "north": {"uv": [0, 8, 16, 8.5], "texture": "#4"}, - "east": {"uv": [15, 1, 16, 1.5], "texture": "#4"}, - "south": {"uv": [0, 0, 16, 0.5], "texture": "#4"}, - "west": {"uv": [15, 2, 16, 2.5], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#4"}, - "down": {"uv": [0, 14, 16, 15], "rotation": 180, "texture": "#4"} + "north": {"uv": [3.75, 0, 4, 0.25], "texture": "#6"}, + "east": {"uv": [0.3, 0, 3.8, 0.25], "texture": "#6", "cullface": "east"}, + "south": {"uv": [3.75, 0, 4, 0.25], "texture": "#6"}, + "up": {"uv": [4.25, 0, 4.5, 3.5], "rotation": 180, "texture": "#6"}, + "down": {"uv": [3.75, 0.25, 4, 3.75], "rotation": 180, "texture": "#6", "cullface": "down"} } }, { - "from": [2, 0, 1.1], - "to": [16, 0.5, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, + "from": [1, 0, 1], + "to": [15, 1, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.25, 7]}, "faces": { - "north": {"uv": [0, 15.5, 14, 16], "texture": "#4"}, - "east": {"uv": [0, 0, 2.8, 0.5], "texture": "#4"}, - "south": {"uv": [1, 13.5, 15, 14], "texture": "#4"}, - "west": {"uv": [10, 0, 13, 0.5], "texture": "#4"}, - "up": {"uv": [0, 13.2, 14, 16], "rotation": 180, "texture": "#4"}, - "down": {"uv": [0, 12, 14, 14.8], "rotation": 180, "texture": "#4"} + "north": {"uv": [0.3, 0, 3.8, 0.25], "texture": "#6"}, + "up": {"uv": [0.25, 8.75, 3.75, 8.25], "rotation": 180, "texture": "#6"}, + "down": {"uv": [0.25, 0, 3.75, 0.5], "rotation": 180, "texture": "#6", "cullface": "down"} } }, { - "from": [2, -0.5, 2.1], - "to": [14, 0.3, 14.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, + "from": [0, 0, 1], + "to": [1, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 0.25, 9]}, "faces": { - "north": {"uv": [2, 1, 14, 1.8], "texture": "#3"}, - "east": {"uv": [2, 1, 14, 1.8], "texture": "#3"}, - "south": {"uv": [2, 1, 14, 1.8], "texture": "#3"}, - "west": {"uv": [2, 1, 14, 1.8], "texture": "#3"}, - "up": {"uv": [4, 2, 16, 14], "rotation": 180, "texture": "#3"}, - "down": {"uv": [1, 2, 13, 14], "rotation": 180, "texture": "#3"} - } - }, - { - "from": [3.65, 0.25, 5.85], - "to": [5.65, 0.55, 7.85], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "from": [3.4, 0.1, 5.6], - "to": [5.9, 0.4, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "from": [9.4, 0.1, 5.2], - "to": [12.9, 0.4, 8.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "from": [9.65, 0.25, 5.45], - "to": [12.65, 0.55, 8.45], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "from": [2.95, 0.25, 9.65], - "to": [6.45, 0.55, 13.15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "from": [2.7, 0.1, 9.4], - "to": [6.7, 0.4, 13.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "from": [9.95, 0.25, 10.05], - "to": [12.45, 0.55, 12.55], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "from": [9.7, 0.1, 9.8], - "to": [12.7, 0.4, 12.8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "east": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "south": {"uv": [6.5, 0, 9.5, 0.5], "texture": "#5"}, - "west": {"uv": [2, 0, 14, 0.5], "texture": "#5"}, - "up": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"}, - "down": {"uv": [6.5, 2, 9.5, 14], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "door", - "from": [7.8, 0.4, 4.03125], - "to": [8, 0.6, 14.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [9.8, 0.4, 3.93125], - "to": [10, 0.6, 14.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [5.8, 0.4, 3.93125], - "to": [6, 0.6, 14.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [3.8, 0.4, 3.93125], - "to": [4, 0.6, 14.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2, 0.4, 3.93125], - "to": [2.2, 0.6, 14.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [11.8, 0.4, 4.03125], - "to": [12, 0.6, 14.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [13.8, 0.4, 4.03125], - "to": [14, 0.6, 14.03125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2.13125, 0.4, 9.9], - "to": [13.93125, 0.6, 10.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2.13125, 0.4, 7.8], - "to": [13.93125, 0.6, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2.13125, 0.4, 5.7], - "to": [13.83125, 0.6, 5.9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2.13125, 0.4, 12], - "to": [13.93125, 0.6, 12.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "door", - "from": [1.99687, 0.4, 13.9], - "to": [14.00937, 0.6, 14.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "door", - "from": [2.00469, 0.4, 3.9], - "to": [13.99375, 0.6, 4.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 180, "texture": "#5"} - } - }, - { - "name": "door", - "from": [4.8, -0.6, 2.33125], - "to": [6, 0.6, 3.53125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [7.1, -0.6, 2.03125], - "to": [8.8, 0.6, 3.73125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} - } - }, - { - "name": "door", - "from": [9.8, -0.6, 2.33125], - "to": [11, 0.6, 3.53125], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.2, 7.55]}, - "faces": { - "north": {"uv": [0, 0, 1.2, 1.2], "rotation": 270, "texture": "#5"}, - "east": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 1.2, 1.2], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 0, 1.2, 2], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 2, 1.2], "rotation": 90, "texture": "#5"} + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#6"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#6"}, + "west": {"uv": [0.3, 0, 3.8, 0.25], "texture": "#6", "cullface": "west"}, + "up": {"uv": [8, 0, 8.25, 3.5], "rotation": 180, "texture": "#6"}, + "down": {"uv": [0, 0.25, 0.25, 3.75], "rotation": 180, "texture": "#6", "cullface": "down"} } } ], @@ -444,36 +102,10 @@ }, "groups": [ { - "name": "Cooktop", - "origin": [0, 0, 0], + "name": "group", + "origin": [-6, 9.25, 9], "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [5, 6, 7, 8, 9, 10, 11, 12] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27] - }, - 28 - ] - } - ] + "children": [0, 1, 2, 3, 4] } ] } \ No newline at end of file From f93740ac8553afb51ab464aad381900bd44ab64f Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:28:23 -0600 Subject: [PATCH 17/17] Update the Book to include additions --- .../entries/coffee_table_crafting_entry.json | 26 +++++++++++++++++++ .../en_us/entries/freezer_recipe_entry.json | 4 +-- .../en_us/entries/freezer_usage_entry.json | 10 +++---- .../en_us/entries/fridge_usage_entry.json | 12 +++++++++ .../en_us/entries/table_crafting_entry.json | 2 +- 5 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/coffee_table_crafting_entry.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/fridge_usage_entry.json diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/coffee_table_crafting_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/coffee_table_crafting_entry.json new file mode 100644 index 000000000..9de5953f3 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/coffee_table_crafting_entry.json @@ -0,0 +1,26 @@ +{ + "name": "Crafting: Coffee Tables", + "icon": "minecraft:oak_log", + "category": "pfm:table_category", + "pages": [ + { + "type": "patchouli:text", + "text": "There are different kinds of coffee tables to match, you'll need planks and logs or stone and the polished block depending on which type you're crafting. To get the different wood types or stone types just replace the oak with the material you want the table to be." + }, + { + "type": "pfm:furniturerecipe2template", + "recipe": "pfm:coffe_oak_table_basic", + "recipe2": "pfm:stripped_oak_coffee_table_basic" + }, + { + "type": "pfm:furniturerecipe2template", + "recipe": "pfm:coffee_oak_table_classic", + "recipe2": "pfm:stripped_oak_coffee_table_classic" + }, + { + "type": "pfm:furniturerecipe2template", + "recipe": "pfm:oak_coffee_table_modern", + "recipe2": "pfm:stripped_oak_coffee_table_modern" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_recipe_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_recipe_entry.json index fd31cb695..8cb6b4a23 100644 --- a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_recipe_entry.json +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_recipe_entry.json @@ -1,6 +1,6 @@ { - "name": "Recipes: Fridges", - "icon": "pfm:white_fridge", + "name": "Recipes: Freezer", + "icon": "pfm:white_freezer", "category": "pfm:freezing_category", "pages": [ { diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_usage_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_usage_entry.json index f05085054..8f0f3f10d 100644 --- a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_usage_entry.json +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/freezer_usage_entry.json @@ -1,11 +1,12 @@ { - "name": "Usage: Fridges", + "name": "Usage: Freezer", "icon": "minecraft:ice", "category": "pfm:freezing_category", "pages": [ { "type": "patchouli:text", - "text": "To use the Freezer right click on the bottom or top of the unit, depending on if it's the iron or concrete fridge. This will open the Freezer's GUI, on the top slot goes whatever you want to freeze while on the bottom you will need to put your fuel, which can be Ice, Packed Ice, Blue Ice, Snow Blocks, Snow or Snowballs." + "title" : "Usage", + "text": "To use the Freezer right click on the freezer section of the unit. This will open the Freezer's GUI, on the top slot goes whatever you want to freeze while on the bottom you will need to put your coolant, which can be Ice, Packed Ice, Blue Ice, Snow Blocks, Snow or Snowballs." }, { "type": "pfm:furnitureusagetemplate", @@ -18,11 +19,6 @@ "item": "minecraft:snow_block", "item2": "minecraft:snow", "item3": "minecraft:snowball" - }, - { - "type": "patchouli:text", - "title": "Usage", - "text": "To use the Fridge right click on the top or bottom of the unit, depending on if it's the iron or concrete fridge. This will open the Fridge's GUI, it has as much storage as a chest, you can store anything you'd like in it." } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/fridge_usage_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/fridge_usage_entry.json new file mode 100644 index 000000000..585601b2c --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/fridge_usage_entry.json @@ -0,0 +1,12 @@ +{ + "name": "Usage: Freezer", + "icon": "minecraft:ice", + "category": "pfm:freezing_category", + "pages": [ + { + "type": "patchouli:text", + "title": "Usage", + "text": "To use the Fridge right click on the fridge section of the unit. This will open the Fridge's GUI, it has as much storage as a chest, you can store anything you'd like in it." + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/table_crafting_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/table_crafting_entry.json index 5b250a350..5a66bb7db 100644 --- a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/table_crafting_entry.json +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/table_crafting_entry.json @@ -5,7 +5,7 @@ "pages": [ { "type": "patchouli:text", - "text": "There are different kinds of tables, you'll need planks and logs depending on which type you're crafting. To get the different wood types just replace the oak with the wood type you want the table to be." + "text": "There are different kinds of tables, you'll need planks and logs or stone and the polished block depending on which type you're crafting. To get the different wood types or stone types just replace the oak with the material you want the table to be." }, { "type": "pfm:furniturerecipe2template",