From 6e9c79f735afbe875687ac93f1bd7634af5d9756 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sat, 12 Oct 2024 20:30:55 -0600 Subject: [PATCH 1/4] Blocks will now correctly take their "tint" from the variant parent --- .../pfm/client/ColorRegistry.java | 51 ++- .../block/basic_lamp/basic_lamp_bottom.json | 26 +- .../block/basic_lamp/basic_lamp_middle.json | 12 +- .../block/basic_lamp/basic_lamp_single.json | 90 ++--- .../block/basic_lamp/basic_lamp_top.json | 76 ++-- .../assets/pfm/models/block/chair/chair.json | 80 ++--- .../pfm/models/block/chair/chair_tucked.json | 78 ++--- .../block/chair_classic/chair_classic.json | 130 +++---- .../chair_classic/chair_classic_tucked.json | 130 +++---- .../block/chair_dinner/chair_dinner.json | 126 +++---- .../chair_dinner/chair_dinner_tucked.json | 126 +++---- .../block/chair_modern/chair_modern.json | 78 ++--- .../chair_modern/chair_modern_tucked.json | 78 ++--- .../bunk/foot/classic_bed_foot_left.json | 12 +- .../bunk/foot/classic_bed_foot_right.json | 12 +- .../template/foot/classic_bed_foot.json | 78 ++--- .../template/foot/classic_bed_foot_left.json | 16 +- .../template/foot/classic_bed_foot_right.json | 16 +- .../template/full/classic_bed.json | 210 +++++------ .../template/head/classic_bed_head.json | 18 +- .../template/head/classic_bed_head_left.json | 16 +- .../template/head/classic_bed_head_right.json | 16 +- .../classic_nightstand.json | 210 +++++------ .../classic_nightstand_left.json | 150 ++++---- .../classic_nightstand_left_open.json | 299 ++++++++-------- .../classic_nightstand_middle.json | 90 ++--- .../classic_nightstand_middle_open.json | 204 +++++------ .../classic_nightstand_open.json | 331 +++++++++--------- .../classic_nightstand_right.json | 150 ++++---- .../classic_nightstand_right_open.json | 313 ++++++++--------- .../block/classic_stool/classic_stool.json | 90 ++--- .../classic_stool/classic_stool_tucked.json | 90 ++--- .../coffe_table_basic_north_west.json | 16 +- .../coffee_table_basic.json | 84 ++--- .../coffee_table_basic_base.json | 12 +- .../coffee_table_basic_east_west_north.json | 16 +- .../coffee_table_basic_east_west_south.json | 16 +- .../coffee_table_basic_north_east.json | 16 +- .../coffee_table_basic_north_east_corner.json | 16 +- .../coffee_table_basic_north_south_east.json | 16 +- ...e_table_basic_north_south_east_bottom.json | 16 +- ...ffee_table_basic_north_south_east_top.json | 16 +- .../coffee_table_basic_north_south_west.json | 16 +- ...e_table_basic_north_south_west_bottom.json | 16 +- ...ffee_table_basic_north_south_west_top.json | 16 +- .../coffee_table_basic_north_west.json | 16 +- .../coffee_table_basic_north_west_corner.json | 16 +- .../coffee_table_basic_south_east.json | 12 +- .../coffee_table_basic_south_east_corner.json | 16 +- .../coffee_table_basic_south_west.json | 16 +- .../coffee_table_basic_south_west_corner.json | 16 +- .../coffee_table_classic.json | 60 ++-- .../coffee_table_classic_middle.json | 12 +- .../coffee_table_classic_one.json | 12 +- .../coffee_table_classic_one_uved.json | 12 +- .../coffee_table_classic_two.json | 12 +- .../coffee_table_classic_two_uved.json | 12 +- .../coffee_table_modern.json | 120 +++---- .../coffee_table_modern_base.json | 12 +- .../coffee_table_modern_left.json | 64 ++-- .../coffee_table_modern_legs.json | 112 +++--- .../coffee_table_modern_middle.json | 16 +- .../coffee_table_modern_right.json | 64 ++-- .../block/dinner_table/dinner_table.json | 60 ++-- .../block/dinner_table/dinner_table_left.json | 28 +- .../block/dinner_table/dinner_table_legs.json | 48 +-- .../dinner_table/dinner_table_middle.json | 12 +- .../dinner_table/dinner_table_right.json | 28 +- .../kitchen_cabinet/kitchen_cabinet.json | 46 +-- .../kitchen_cabinet_edge_left.json | 55 +-- .../kitchen_cabinet_edge_left_open.json | 91 ++--- .../kitchen_cabinet_edge_right.json | 40 +-- .../kitchen_cabinet_edge_right_open.json | 79 ++--- .../kitchen_cabinet_inner_corner_left.json | 119 +++---- ...itchen_cabinet_inner_corner_open_left.json | 153 ++++---- ...tchen_cabinet_inner_corner_open_right.json | 157 ++++----- .../kitchen_cabinet_inner_corner_right.json | 125 +++---- .../kitchen_cabinet/kitchen_cabinet_open.json | 114 +++--- .../kitchen_cabinet_outer_corner_left.json | 72 ++-- ...itchen_cabinet_outer_corner_open_left.json | 123 +++---- ...tchen_cabinet_outer_corner_open_right.json | 123 +++---- .../kitchen_cabinet_outer_corner_right.json | 72 ++-- .../kitchen_counter/kitchen_counter.json | 38 +- .../kitchen_counter_bottom.json | 28 +- .../kitchen_counter_bottom_inner_corner.json | 52 +-- .../kitchen_counter_bottom_outer_corner.json | 40 +-- .../kitchen_counter_edge_left.json | 44 +-- .../kitchen_counter_edge_right.json | 44 +-- .../kitchen_counter_inner_corner_left.json | 66 ++-- .../kitchen_counter_inner_corner_right.json | 66 ++-- .../kitchen_counter_middle.json | 28 +- ...chen_counter_middle_inner_corner_left.json | 52 +-- ...hen_counter_middle_inner_corner_right.json | 64 ++-- ...chen_counter_middle_outer_corner_left.json | 40 +-- ...hen_counter_middle_outer_corner_right.json | 40 +-- .../kitchen_counter_outer_corner_left.json | 42 +-- .../kitchen_counter_outer_corner_right.json | 42 +-- .../kitchen_counter_oven.json | 72 ++-- .../kitchen_counter_oven_middle.json | 58 +-- .../kitchen_counter_oven_middle_open.json | 70 ++-- .../kitchen_counter_oven_open.json | 72 ++-- .../block/kitchen_drawer/kitchen_drawer.json | 58 +-- .../kitchen_drawer/kitchen_drawer_bottom.json | 42 +-- .../kitchen_drawer_bottom_inner_corner.json | 78 ++--- .../kitchen_drawer_bottom_open.json | 78 ++--- .../kitchen_drawer_bottom_outer_corner.json | 42 +-- ...n_drawer_bottom_outer_corner_mirrored.json | 66 ++-- ...tchen_drawer_bottom_outer_corner_open.json | 142 ++++---- .../kitchen_drawer_edge_left.json | 64 ++-- .../kitchen_drawer_edge_left_open.json | 189 +++++----- .../kitchen_drawer_edge_right.json | 64 ++-- .../kitchen_drawer_edge_right_open.json | 135 ++++--- .../kitchen_drawer_inner_corner_left.json | 114 +++--- .../kitchen_drawer_inner_corner_right.json | 114 +++--- .../kitchen_drawer/kitchen_drawer_middle.json | 40 +-- ...tchen_drawer_middle_inner_corner_left.json | 78 ++--- ...chen_drawer_middle_inner_corner_right.json | 78 ++--- .../kitchen_drawer_middle_open.json | 78 ++--- ...tchen_drawer_middle_outer_corner_left.json | 66 ++-- ..._drawer_middle_outer_corner_open_left.json | 142 ++++---- ...drawer_middle_outer_corner_open_right.json | 142 ++++---- ...chen_drawer_middle_outer_corner_right.json | 66 ++-- .../kitchen_drawer/kitchen_drawer_open.json | 120 +++---- .../kitchen_drawer_outer_corner_left.json | 78 ++--- ...kitchen_drawer_outer_corner_open_left.json | 148 ++++---- ...itchen_drawer_outer_corner_open_right.json | 148 ++++---- .../kitchen_drawer_outer_corner_right.json | 78 ++--- .../block/kitchen_sink/kitchen_sink.json | 58 +-- .../block/kitchen_sink/kitchen_sink_full.json | 60 ++-- .../kitchen_sink/kitchen_sink_level1.json | 69 ++-- .../kitchen_sink/kitchen_sink_level2.json | 68 ++-- .../kitchen_wall_drawer_small.json | 30 +- .../kitchen_wall_drawer_small_open.json | 98 +++--- .../pfm/models/block/log_stool/log_stool.json | 36 +- .../block/log_stool/log_stool_tucked.json | 36 +- .../pfm/models/block/log_table/log_table.json | 36 +- .../block/log_table/log_table_left.json | 16 +- .../block/log_table/log_table_legs.json | 28 +- .../block/log_table/log_table_middle.json | 12 +- .../block/log_table/log_table_right.json | 12 +- .../block/modern_stool/modern_stool.json | 42 +-- .../modern_stool/modern_stool_tucked.json | 42 +-- .../bunk/foot/simple_bed_foot_left.json | 10 +- .../bunk/foot/simple_bed_foot_right.json | 10 +- .../template/bunk/head/simple_bed_head.json | 36 +- .../template/foot/simple_bed_foot.json | 20 +- .../template/foot/simple_bed_foot_left.json | 14 +- .../template/foot/simple_bed_foot_right.json | 14 +- .../simple_bed/template/full/simple_bed.json | 76 ++-- .../template/head/simple_bed_head.json | 22 +- .../template/head/simple_bed_head_left.json | 14 +- .../template/head/simple_bed_head_right.json | 14 +- .../simple_bunk_ladder/simple_ladder.json | 64 ++-- .../simple_bunk_ladder/simple_ladder_top.json | 64 ++-- .../block/simple_stool/simple_stool.json | 66 ++-- .../simple_stool/simple_stool_tucked.json | 52 +-- .../models/block/table_basic/table_basic.json | 90 ++--- .../block/table_basic/table_basic_base.json | 12 +- .../table_basic_east_west_north.json | 17 +- .../table_basic_east_west_south.json | 17 +- .../table_basic/table_basic_north_east.json | 17 +- .../table_basic_north_east_corner.json | 17 +- .../table_basic_north_south_east.json | 17 +- .../table_basic_north_south_east_bottom.json | 17 +- .../table_basic_north_south_east_top.json | 17 +- .../table_basic_north_south_west.json | 17 +- .../table_basic_north_south_west_bottom.json | 17 +- .../table_basic_north_south_west_top.json | 17 +- .../table_basic/table_basic_north_west.json | 17 +- .../table_basic_north_west_corner.json | 17 +- .../table_basic/table_basic_south_east.json | 17 +- .../table_basic_south_east_corner.json | 17 +- .../table_basic/table_basic_south_west.json | 17 +- .../table_basic_south_west_corner.json | 17 +- .../block/table_classic/table_classic.json | 66 ++-- .../table_classic/table_classic_middle.json | 12 +- .../table_classic/table_classic_one.json | 16 +- .../table_classic/table_classic_one_uved.json | 16 +- .../table_classic/table_classic_two.json | 14 +- .../table_classic/table_classic_two_uved.json | 16 +- .../table_modern_dinner.json | 126 +++---- .../table_modern_dinner_base.json | 12 +- .../table_modern_dinner_left.json | 64 ++-- .../table_modern_dinner_legs.json | 112 +++--- .../table_modern_dinner_middle.json | 12 +- .../table_modern_dinner_right.json | 64 ++-- .../pfm/client/fabric/ColorRegistryImpl.java | 8 + .../client/forge/BlockColorsExtension.java | 11 + .../pfm/client/forge/ColorRegistryForge.java | 10 +- .../pfm/client/forge/ColorRegistryImpl.java | 18 + .../pfm/client/forge/ItemColorsExtension.java | 13 + .../pfm/mixin/forge/BlockColorsAccessor.java | 25 ++ .../pfm/mixin/forge/ItemColorsAccessor.java | 28 ++ forge/src/main/resources/pfm.mixins.json | 2 + 194 files changed, 5751 insertions(+), 5612 deletions(-) create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/client/forge/BlockColorsExtension.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/client/forge/ItemColorsExtension.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/BlockColorsAccessor.java create mode 100644 forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/ItemColorsAccessor.java 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 7c4a86422..e2a59a2fb 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java @@ -7,6 +7,7 @@ import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.block.Block; +import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.color.item.ItemColorProvider; @@ -28,12 +29,6 @@ public static void registerBlockColors(){ sinks.forEach(block -> registerBlockColor(block, addWaterColor())); registerBlockColor(PaladinFurnitureModBlocksItems.BASIC_TOILET, addToiletColor()); registerBlockColor(PaladinFurnitureModBlocksItems.BASIC_BATHTUB, addWaterColor()); - registerItemColor(PaladinFurnitureModBlocksItems.BASIC_LAMP_ITEM, (stack, tintIndex) -> { - if (stack.hasNbt()) { - return DyeColor.byName(stack.getSubNbt("BlockEntityTag").getString("color"), DyeColor.WHITE).getMapColor().color; - } - return 0xFFFFFF; - }); registerBlockColor(PaladinFurnitureModBlocksItems.BASIC_LAMP, (state, world, pos, tintIndex) -> { BlockEntity entity = world.getBlockEntity(pos); if (entity != null) { @@ -49,6 +44,20 @@ public static void registerBlockColors(){ pfmModCompatibility.getClientModCompatiblity().get().registerBlockColors(); } }); + PaladinFurnitureModBlocksItems.furnitureEntryMap.forEach((key, value) -> { + value.getVariantToBlockMap().forEach((variantBase, block) -> { + BlockColorProvider blockColorProvider = getBlockColor(variantBase.getBaseBlock()); + if (blockColorProvider != null) { + registerBlockColor(block, blockColorProvider); + } + }); + value.getVariantToBlockMapNonBase().forEach((variantBase, block) -> { + BlockColorProvider blockColorProvider = getBlockColor(variantBase.getSecondaryBlock()); + if (blockColorProvider != null) { + registerBlockColor(block, blockColorProvider); + } + }); + }); } public static void registerBlockRenderLayers() { @@ -62,6 +71,27 @@ public static void registerBlockRenderLayers() { public static void registerItemColors() { registerItemColor(PaladinFurnitureModBlocksItems.BASIC_BATHTUB.asItem(), (stack, index) -> index == 1 ? 0x3c44a9 : 0xFFFFFF); + registerItemColor(PaladinFurnitureModBlocksItems.BASIC_LAMP_ITEM, (stack, tintIndex) -> { + if (stack.hasNbt()) { + return DyeColor.byName(stack.getSubNbt("BlockEntityTag").getString("color"), DyeColor.WHITE).getMapColor().color; + } + return 0xFFFFFF; + }); + + PaladinFurnitureModBlocksItems.furnitureEntryMap.forEach((key, value) -> { + value.getVariantToBlockMap().forEach((variantBase, block) -> { + ItemColorProvider itemColorProvider = getItemColor(variantBase.getBaseBlock().asItem()); + if (itemColorProvider != null) { + registerItemColor(block.asItem(), itemColorProvider); + } + }); + value.getVariantToBlockMapNonBase().forEach((variantBase, block) -> { + ItemColorProvider itemColorProvider = getItemColor(variantBase.getBaseBlock().asItem()); + if (itemColorProvider != null) { + registerItemColor(block.asItem(), itemColorProvider); + } + }); + }); } @ExpectPlatform @@ -72,6 +102,15 @@ public static void registerItemColor(Item item, ItemColorProvider colorProvider) public static void registerBlockColor(Block block, BlockColorProvider blockColorProvider){ throw new RuntimeException(); } + @ExpectPlatform + public static BlockColorProvider getBlockColor(Block block){ + throw new RuntimeException(); + } + + @ExpectPlatform + public static ItemColorProvider getItemColor(Item item){ + throw new RuntimeException(); + } @ExpectPlatform public static void registerBlockToRenderLayer(Block block, RenderLayer renderLayer){ diff --git a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_bottom.json b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_bottom.json index 22e877e18..fe8233d67 100644 --- a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_bottom.json +++ b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_bottom.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/stripped_oak_log", - "texture": "minecraft:block/stripped_oak_log" + "particle": "block/stripped_oak_log", + "texture": "block/stripped_oak_log" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [13, 1.5, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, -16, 0]}, "faces": { - "north": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up"}, - "down": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up"} + "north": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "east": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "south": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "west": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "up": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up", "tintindex": 0} } }, { @@ -23,11 +23,11 @@ "to": [9, 16, 9], "rotation": {"angle": 0, "axis": "y", "origin": [0, -16, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#texture", "cullface": "up"} + "north": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#texture", "cullface": "up", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_middle.json b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_middle.json index d5c7a5e7b..7b38dcfa3 100644 --- a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_middle.json @@ -1,7 +1,7 @@ { "credit": "By UnlikePaladin", "textures": { - "texture": "minecraft:block/stripped_oak_log" + "texture": "block/stripped_oak_log" }, "elements": [ { @@ -9,11 +9,11 @@ "to": [9, 16, 9], "rotation": {"angle": 0, "axis": "y", "origin": [0, -16, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#texture", "cullface": "up"} + "north": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 16], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#texture", "cullface": "up", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_single.json b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_single.json index 4df9971cb..444b362bb 100644 --- a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_single.json +++ b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_single.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/stripped_oak_log", - "texture": "minecraft:block/stripped_oak_log" + "particle": "block/stripped_oak_log", + "texture": "block/stripped_oak_log" }, "elements": [ { @@ -10,11 +10,11 @@ "to": [9, 10, 9], "rotation": {"angle": 0, "axis": "y", "origin": [-0.1, -16, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 8.5], "texture": "#texture"}, - "east": {"uv": [0, 0, 2, 8.5], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 8.5], "texture": "#texture"}, - "west": {"uv": [0, 0, 2, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 8.5], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8.5], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8.5], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8.5], "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#texture", "tintindex": 0} } }, { @@ -22,10 +22,10 @@ "to": [10.5, 14.5, 8.999], "rotation": {"angle": 45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 7], "rotation": 180, "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0} } }, { @@ -33,10 +33,10 @@ "to": [10.5, 15.8, 8.999], "rotation": {"angle": 45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 2, 1.3, 3.7], "rotation": 270, "texture": "#texture"}, - "east": {"uv": [0, 0, 1.998, 1.3], "texture": "#texture"}, - "south": {"uv": [0, 0, 1.7, 1.3], "rotation": 180, "texture": "#texture"}, - "up": {"uv": [0, 0, 1.998, 1.7], "rotation": 270, "texture": "#texture"} + "north": {"uv": [0, 2, 1.3, 3.7], "rotation": 270, "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.998, 1.3], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 1.7, 1.3], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 1.998, 1.7], "rotation": 270, "texture": "#texture", "tintindex": 0} } }, { @@ -44,10 +44,10 @@ "to": [7.5, 14.5, 8.999], "rotation": {"angle": -45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 8], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture"} + "north": {"uv": [0, 1, 2, 8], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0} } }, { @@ -55,10 +55,10 @@ "to": [7, 15.8, 8.999], "rotation": {"angle": -45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 1.5, 1.4], "rotation": 180, "texture": "#texture"}, - "south": {"uv": [0, 0, 1.5, 1.4], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 1.4], "rotation": 180, "texture": "#texture"}, - "up": {"uv": [0, 0, 1.5, 1.998], "texture": "#texture"} + "north": {"uv": [0, 0, 1.5, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 1.5, 1.4], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 1.5, 1.998], "texture": "#texture", "tintindex": 0} } }, { @@ -66,10 +66,10 @@ "to": [9, 14.5, 10.499], "rotation": {"angle": -45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 2, 2, 9], "texture": "#texture"}, - "east": {"uv": [0, 2, 1.998, 9], "texture": "#texture"}, - "south": {"uv": [0, 2, 2, 9], "texture": "#texture"}, - "west": {"uv": [0, 2, 1.998, 9], "texture": "#texture"} + "north": {"uv": [0, 2, 2, 9], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 2, 1.998, 9], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 9], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 2, 1.998, 9], "texture": "#texture", "tintindex": 0} } }, { @@ -77,10 +77,10 @@ "to": [9, 15.9, 10.499], "rotation": {"angle": -45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "east": {"uv": [0, 0, 1.498, 1.4], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 1.4], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.498, 1.4], "rotation": 180, "texture": "#texture"}, - "up": {"uv": [0, 0, 2, 1.498], "texture": "#texture"} + "east": {"uv": [0, 0, 1.498, 1.4], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 1.4], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.498, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 1.498], "texture": "#texture", "tintindex": 0} } }, { @@ -88,10 +88,10 @@ "to": [9, 14.5, 7.499], "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "east": {"uv": [1.998, 0, 0, 7], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [1.998, 0, 0, 7], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0} } }, { @@ -99,10 +99,10 @@ "to": [9, 15.9, 7.03806], "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 1.4], "texture": "#texture"}, - "east": {"uv": [0, 0, 1.53706, 1.4], "rotation": 180, "texture": "#texture"}, - "west": {"uv": [0, 0, 1.53706, 1.4], "texture": "#texture"}, - "up": {"uv": [2, 0, 0, 1.53706], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 1.4], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.53706, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.53706, 1.4], "texture": "#texture", "tintindex": 0}, + "up": {"uv": [2, 0, 0, 1.53706], "texture": "#texture", "tintindex": 0} } }, { @@ -110,12 +110,12 @@ "to": [13, 1.5, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, -16, 0]}, "faces": { - "north": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up"}, - "down": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up"} + "north": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "east": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "south": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "west": {"uv": [0, 0, 10, 1.5], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "up": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 10, 10], "texture": "#texture", "cullface": "up", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_top.json b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_top.json index 2c1260431..2939b49bd 100644 --- a/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_top.json +++ b/common/src/main/resources/assets/pfm/models/block/basic_lamp/basic_lamp_top.json @@ -1,7 +1,7 @@ { "credit": "By UnlikePaladin", "textures": { - "texture": "minecraft:block/stripped_oak_log" + "texture": "block/stripped_oak_log" }, "elements": [ { @@ -9,11 +9,11 @@ "to": [9, 10, 9], "rotation": {"angle": 0, "axis": "y", "origin": [-0.1, -16, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#texture"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#texture"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#texture"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 10], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#texture", "tintindex": 0} } }, { @@ -21,10 +21,10 @@ "to": [10.5, 14.5, 8.999], "rotation": {"angle": 45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 7], "rotation": 180, "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0} } }, { @@ -32,10 +32,10 @@ "to": [10.5, 15.8, 8.999], "rotation": {"angle": 45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 2, 1.3, 3.7], "rotation": 270, "texture": "#texture"}, - "east": {"uv": [0, 0, 1.998, 1.3], "texture": "#texture"}, - "south": {"uv": [0, 0, 1.7, 1.3], "rotation": 180, "texture": "#texture"}, - "up": {"uv": [0, 0, 1.998, 1.7], "rotation": 270, "texture": "#texture"} + "north": {"uv": [0, 2, 1.3, 3.7], "rotation": 270, "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.998, 1.3], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 1.7, 1.3], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 1.998, 1.7], "rotation": 270, "texture": "#texture", "tintindex": 0} } }, { @@ -43,10 +43,10 @@ "to": [7.5, 14.5, 8.999], "rotation": {"angle": -45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 8], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture"} + "north": {"uv": [0, 1, 2, 8], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0} } }, { @@ -54,10 +54,10 @@ "to": [7, 15.8, 8.999], "rotation": {"angle": -45, "axis": "z", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 1.5, 1.4], "rotation": 180, "texture": "#texture"}, - "south": {"uv": [0, 0, 1.5, 1.4], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 1.4], "rotation": 180, "texture": "#texture"}, - "up": {"uv": [0, 0, 1.5, 1.998], "texture": "#texture"} + "north": {"uv": [0, 0, 1.5, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 1.5, 1.4], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 1.5, 1.998], "texture": "#texture", "tintindex": 0} } }, { @@ -65,10 +65,10 @@ "to": [9, 14.5, 10.499], "rotation": {"angle": -45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 2, 2, 9], "texture": "#texture"}, - "east": {"uv": [0, 2, 1.998, 9], "texture": "#texture"}, - "south": {"uv": [0, 2, 2, 9], "texture": "#texture"}, - "west": {"uv": [0, 2, 1.998, 9], "texture": "#texture"} + "north": {"uv": [0, 2, 2, 9], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 2, 1.998, 9], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 9], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 2, 1.998, 9], "texture": "#texture", "tintindex": 0} } }, { @@ -76,10 +76,10 @@ "to": [9, 15.9, 10.499], "rotation": {"angle": -45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "east": {"uv": [0, 0, 1.498, 1.4], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 1.4], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.498, 1.4], "rotation": 180, "texture": "#texture"}, - "up": {"uv": [0, 0, 2, 1.498], "texture": "#texture"} + "east": {"uv": [0, 0, 1.498, 1.4], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 1.4], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.498, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 1.498], "texture": "#texture", "tintindex": 0} } }, { @@ -87,10 +87,10 @@ "to": [9, 14.5, 7.499], "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "east": {"uv": [1.998, 0, 0, 7], "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 7], "texture": "#texture"}, - "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [1.998, 0, 0, 7], "texture": "#texture", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 7], "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.998, 7], "texture": "#texture", "tintindex": 0} } }, { @@ -98,10 +98,10 @@ "to": [9, 15.9, 7.03806], "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.75, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 1.4], "texture": "#texture"}, - "east": {"uv": [0, 0, 1.53706, 1.4], "rotation": 180, "texture": "#texture"}, - "west": {"uv": [0, 0, 1.53706, 1.4], "texture": "#texture"}, - "up": {"uv": [2, 0, 0, 1.53706], "texture": "#texture"} + "north": {"uv": [0, 0, 2, 1.4], "texture": "#texture", "tintindex": 0}, + "east": {"uv": [0, 0, 1.53706, 1.4], "rotation": 180, "texture": "#texture", "tintindex": 0}, + "west": {"uv": [0, 0, 1.53706, 1.4], "texture": "#texture", "tintindex": 0}, + "up": {"uv": [2, 0, 0, 1.53706], "texture": "#texture", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair/chair.json b/common/src/main/resources/assets/pfm/models/block/chair/chair.json index 1847d6215..73a2fa0ce 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair/chair.json +++ b/common/src/main/resources/assets/pfm/models/block/chair/chair.json @@ -1,9 +1,9 @@ - { +{ "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "from": [0.3282, 10.46875, 1.5939], "to": [2.6282, 24.46875, 14.5939], "faces": { - "north": {"uv": [0, 0, 14, 2], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base"}, - "up": {"uv": [5, 1, 7, 14], "texture": "#base"}, - "down": {"uv": [4, 0, 6, 13], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 2], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 1, 7, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [4, 0, 6, 13], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -24,60 +24,60 @@ "from": [0.32813, 8, 1.59375], "to": [14.32813, 10.5, 14.59375], "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { "from": [1, 0, 2], "to": [3.5, 9, 4.5], "faces": { - "north": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "east": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "south": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "west": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "up": {"uv": [7, 3, 9.5, 5.5], "texture": "#legs"}, - "down": {"uv": [7, 3, 9, 5], "texture": "#legs"} + "north": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [7, 3, 9.5, 5.5], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [7, 3, 9, 5], "texture": "#legs", "tintindex": 0} } }, { "from": [11, 0, 11], "to": [13.5, 9, 13.5], "faces": { - "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs"}, - "east": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "south": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "west": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "up": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "down": {"uv": [9, 6, 11, 8], "texture": "#legs"} + "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [9, 6, 11, 8], "texture": "#legs", "tintindex": 0} } }, { "from": [1, 0, 11], "to": [3.5, 9, 13.5], "faces": { - "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs"}, - "east": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "south": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "west": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "up": {"uv": [6, 3, 8.5, 5.5], "texture": "#legs"}, - "down": {"uv": [9, 5, 11, 7], "rotation": 90, "texture": "#legs"} + "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [6, 3, 8.5, 5.5], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [9, 5, 11, 7], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { "from": [11, 0, 2], "to": [13.5, 9, 4.5], "faces": { - "north": {"uv": [6, 4, 8, 13], "texture": "#legs"}, - "east": {"uv": [6, 4, 8, 13], "texture": "#legs"}, - "south": {"uv": [6, 4, 8, 13], "texture": "#legs"}, - "west": {"uv": [9, 4, 11, 13], "texture": "#legs"}, - "up": {"uv": [6, 4, 8.5, 6.5], "texture": "#legs"}, - "down": {"uv": [8, 6, 10, 8], "texture": "#legs"} + "north": {"uv": [6, 4, 8, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [6, 4, 8, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [6, 4, 8, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [9, 4, 11, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [6, 4, 8.5, 6.5], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 6, 10, 8], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair/chair_tucked.json b/common/src/main/resources/assets/pfm/models/block/chair/chair_tucked.json index 0e63804a9..0ab78f8c5 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair/chair_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/chair/chair_tucked.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "from": [8.3282, 10.46875, 1.5939], "to": [10.6282, 24.46875, 14.5939], "faces": { - "north": {"uv": [0, 0, 14, 2], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base"}, - "up": {"uv": [5, 1, 7, 14], "texture": "#base"}, - "down": {"uv": [4, 0, 6, 13], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 2], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 14, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 1, 7, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [4, 0, 6, 13], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -24,60 +24,60 @@ "from": [8.32813, 8, 1.59375], "to": [22.32813, 10.5, 14.59375], "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { "from": [9, 0, 2], "to": [11.5, 9, 4.5], "faces": { - "north": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "east": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "south": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "west": {"uv": [7, 3, 9, 12], "texture": "#legs"}, - "up": {"uv": [7, 3, 9.5, 5.5], "texture": "#legs"}, - "down": {"uv": [7, 3, 9, 5], "texture": "#legs"} + "north": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [7, 3, 9, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [7, 3, 9.5, 5.5], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [7, 3, 9, 5], "texture": "#legs", "tintindex": 0} } }, { "from": [19, 0, 11], "to": [21.5, 9, 13.5], "faces": { - "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs"}, - "east": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "south": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "west": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "up": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "down": {"uv": [9, 6, 11, 8], "texture": "#legs"} + "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [9, 6, 11, 8], "texture": "#legs", "tintindex": 0} } }, { "from": [9, 0, 11], "to": [11.5, 9, 13.5], "faces": { - "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs"}, - "east": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "south": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "west": {"uv": [6, 3, 8, 12], "texture": "#legs"}, - "up": {"uv": [6, 3, 8.5, 5.5], "texture": "#legs"}, - "down": {"uv": [9, 5, 11, 7], "rotation": 90, "texture": "#legs"} + "north": {"uv": [6, 3, 8.5, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 3, 8, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [6, 3, 8.5, 5.5], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [9, 5, 11, 7], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { "from": [19, 0, 2], "to": [21.5, 9, 4.5], "faces": { - "north": {"uv": [6, 4, 8, 13], "texture": "#legs"}, - "east": {"uv": [6, 4, 8, 13], "texture": "#legs"}, - "south": {"uv": [6, 4, 8, 13], "texture": "#legs"}, - "west": {"uv": [9, 4, 11, 13], "texture": "#legs"}, - "up": {"uv": [6, 4, 8.5, 6.5], "texture": "#legs"}, - "down": {"uv": [8, 6, 10, 8], "texture": "#legs"} + "north": {"uv": [6, 4, 8, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [6, 4, 8, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [6, 4, 8, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [9, 4, 11, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [6, 4, 8.5, 6.5], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 6, 10, 8], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic.json b/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic.json index d179ec212..8d6514135 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic.json +++ b/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic.json @@ -11,11 +11,11 @@ "to": [4, 24, 4.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 0, 7, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [1, 0, 3, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [5, 0, 7, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 0, 3, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -23,11 +23,11 @@ "to": [4, 24, 13.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [7, 0, 9, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [7, 0, 9, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -36,10 +36,10 @@ "to": [3.6, 19.32, 12.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [3, 0, 12, 2], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 3, 9, 4], "rotation": 90, "texture": "#legs", "cullface": "up"} + "east": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "up": {"uv": [3, 0, 12, 2], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 3, 9, 4], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -48,10 +48,10 @@ "to": [4, 10.15, 11.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 2, 8, 4.3], "texture": "#legs"}, - "west": {"uv": [0, 2, 7, 4], "texture": "#legs"}, - "up": {"uv": [2, 0, 10, 1.98], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [4.48, 3, 12.23, 4.98], "rotation": 90, "texture": "#legs"} + "east": {"uv": [0, 2, 8, 4.3], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 7, 4], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 0, 10, 1.98], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [4.48, 3, 12.23, 4.98], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -60,10 +60,10 @@ "to": [3.58, 19.14, 10.8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -72,10 +72,10 @@ "to": [3.58, 19.14, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -84,10 +84,10 @@ "to": [3.58, 19.14, 6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -96,10 +96,10 @@ "to": [4, 24, 11.92], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 0, 8, 4], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [3, 0, 11, 4], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [3, 0, 11, 2], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 2], "rotation": 90, "texture": "#legs", "cullface": "up"} + "east": {"uv": [0, 0, 8, 4], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "west": {"uv": [3, 0, 11, 4], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "up": {"uv": [3, 0, 11, 2], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 2], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -108,11 +108,11 @@ "to": [14.95, 10.25, 13.96], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 9, 12.1, 10], "rotation": 180, "texture": "#base"}, - "east": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base"}, - "south": {"uv": [1, 1, 12.1, 2], "rotation": 180, "texture": "#base"}, - "west": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 1.5, 11.1, 13.47219], "texture": "#base"} + "north": {"uv": [1, 9, 12.1, 10], "rotation": 180, "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 12.1, 2], "rotation": 180, "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1.5, 11.1, 13.47219], "texture": "#base", "tintindex": 0} } }, { @@ -121,12 +121,12 @@ "to": [15, 9.26, 13.97], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 11, 13.2, 12.1], "rotation": 180, "texture": "#legs"}, - "east": {"uv": [0, 4, 12, 5], "texture": "#legs"}, - "south": {"uv": [2, 14, 13, 15], "texture": "#legs"}, - "west": {"uv": [4, 2, 5.4, 14], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 1, 11.2, 13], "texture": "#legs"}, - "down": {"uv": [0, 1, 12, 12.2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [2, 11, 13.2, 12.1], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 4, 12, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 14, 13, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [4, 2, 5.4, 14], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 11.2, 13], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 12, 12.2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -134,11 +134,11 @@ "to": [4, 9, 13.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "down": {"uv": [6, 5, 8, 7], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [6, 5, 8, 7], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -146,11 +146,11 @@ "to": [14, 9, 13.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "down": {"uv": [12, 8, 14, 10], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [12, 8, 14, 10], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -158,11 +158,11 @@ "to": [4, 9, 4.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "down": {"uv": [1, 1, 3, 3], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 3, 3], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -170,11 +170,11 @@ "to": [14, 9, 4.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "down": {"uv": [8, 11, 10, 13], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 11, 10, 13], "texture": "#legs", "cullface": "down", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic_tucked.json b/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic_tucked.json index e97dcdd01..df7b6d6de 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/chair_classic/chair_classic_tucked.json @@ -12,11 +12,11 @@ "to": [12, 24, 4.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 0, 7, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [1, 0, 3, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [5, 0, 7, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 0, 3, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -24,11 +24,11 @@ "to": [12, 24, 13.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [7, 0, 9, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [7, 0, 9, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -37,10 +37,10 @@ "to": [11.6, 19.32, 12.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [3, 0, 12, 2], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 3, 9, 4], "rotation": 90, "texture": "#legs", "cullface": "up"} + "east": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "up": {"uv": [3, 0, 12, 2], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 3, 9, 4], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -49,10 +49,10 @@ "to": [12, 10.15, 11.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 2, 8, 4.3], "texture": "#legs"}, - "west": {"uv": [0, 2, 7, 4], "texture": "#legs"}, - "up": {"uv": [2, 0, 10, 1.98], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [4.48, 3, 12.23, 4.98], "rotation": 90, "texture": "#legs"} + "east": {"uv": [0, 2, 8, 4.3], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 7, 4], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 0, 10, 1.98], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [4.48, 3, 12.23, 4.98], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -61,10 +61,10 @@ "to": [11.58, 19.14, 10.8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -73,10 +73,10 @@ "to": [11.58, 19.14, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -85,10 +85,10 @@ "to": [11.58, 19.14, 6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs"}, - "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs"}, - "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 3, 9, 4], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 2, 9, 3], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 2, 9, 3], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -97,10 +97,10 @@ "to": [12, 24, 11.92], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 0, 8, 4], "texture": "#legs", "cullface": "up"}, - "west": {"uv": [3, 0, 11, 4], "texture": "#legs", "cullface": "up"}, - "up": {"uv": [3, 0, 11, 2], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 2], "rotation": 90, "texture": "#legs", "cullface": "up"} + "east": {"uv": [0, 0, 8, 4], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "west": {"uv": [3, 0, 11, 4], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "up": {"uv": [3, 0, 11, 2], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 2], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -109,11 +109,11 @@ "to": [22.95, 10.25, 13.96], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 9, 12.1, 10], "rotation": 180, "texture": "#base"}, - "east": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base", "cullface": "east"}, - "south": {"uv": [1, 1, 12.1, 2], "rotation": 180, "texture": "#base"}, - "west": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0, 1.5, 11.1, 13.47219], "texture": "#base"} + "north": {"uv": [1, 9, 12.1, 10], "rotation": 180, "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [1, 1, 12.1, 2], "rotation": 180, "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1.5, 6.5, 13.47219], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1.5, 11.1, 13.47219], "texture": "#base", "tintindex": 0} } }, { @@ -122,12 +122,12 @@ "to": [23, 9.26, 13.97], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 11, 13.2, 12.1], "rotation": 180, "texture": "#legs"}, - "east": {"uv": [0, 4, 12, 5], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [2, 14, 13, 15], "texture": "#legs"}, - "west": {"uv": [4, 2, 5.4, 14], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 1, 11.2, 13], "texture": "#legs"}, - "down": {"uv": [0, 1, 12, 12.2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [2, 11, 13.2, 12.1], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 4, 12, 5], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [2, 14, 13, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [4, 2, 5.4, 14], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 11.2, 13], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 12, 12.2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -135,11 +135,11 @@ "to": [12, 9, 13.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "down": {"uv": [6, 5, 8, 7], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [6, 5, 8, 7], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -147,11 +147,11 @@ "to": [22, 9, 13.9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "down": {"uv": [12, 8, 14, 10], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "down": {"uv": [12, 8, 14, 10], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -159,11 +159,11 @@ "to": [12, 9, 4.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs"}, - "down": {"uv": [1, 1, 3, 3], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 3, 3], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -171,11 +171,11 @@ "to": [22, 9, 4.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east"}, - "down": {"uv": [8, 11, 10, 13], "texture": "#legs", "cullface": "down"} + "north": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "down": {"uv": [8, 11, 10, 13], "texture": "#legs", "cullface": "down", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner.json b/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner.json index e7694d3e2..6c701d77a 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner.json +++ b/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [4, 22, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "to": [4, 22, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "to": [3.9, 14.4, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 2, 3.3], "rotation": 90, "texture": "#base"}, - "east": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 2, 2, 3.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base"}, - "up": {"uv": [6, 3, 7, 12], "texture": "#base"}, - "down": {"uv": [7, 3, 8, 12], "texture": "#base"} + "north": {"uv": [0, 2, 2, 3.3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 3.3], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 3, 7, 12], "texture": "#base", "tintindex": 0}, + "down": {"uv": [7, 3, 8, 12], "texture": "#base", "tintindex": 0} } }, { @@ -52,12 +52,12 @@ "to": [3.9, 21.4, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 1.3], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 3, 6, 12], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 6, 1.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [8, 3, 14, 12], "rotation": 270, "texture": "#base"}, - "up": {"uv": [5, 3, 6, 12], "texture": "#base"}, - "down": {"uv": [5, 3, 6, 12], "texture": "#base"} + "north": {"uv": [0, 0, 6, 1.3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 6, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 6, 1.3], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [8, 3, 14, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 3, 6, 12], "texture": "#base", "tintindex": 0}, + "down": {"uv": [5, 3, 6, 12], "texture": "#base", "tintindex": 0} } }, { @@ -66,12 +66,12 @@ "to": [14.98963, 10.3, 14.4], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 11, 1], "texture": "#base"}, - "east": {"uv": [5, 1, 6, 13.8], "rotation": 90, "texture": "#base"}, - "south": {"uv": [1, 1, 12, 2], "texture": "#base"}, - "west": {"uv": [5, 1.2, 6, 14], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0.9, 1, 11.9, 13.8], "texture": "#base"}, - "down": {"uv": [0, 1, 11, 13.8], "texture": "#base"} + "north": {"uv": [0, 0, 11, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 6, 13.8], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1.2, 6, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [0.9, 1, 11.9, 13.8], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 11, 13.8], "texture": "#base", "tintindex": 0} } }, { @@ -80,12 +80,12 @@ "to": [15.1, 9, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [1.9, 1, 13, 2], "texture": "#legs"}, - "east": {"uv": [1, 7, 14, 8], "texture": "#legs"}, - "south": {"uv": [1, 8, 12.1, 9], "texture": "#legs"}, - "west": {"uv": [1, 1, 14, 2], "texture": "#legs"}, - "up": {"uv": [1.9, 1, 13, 14], "texture": "#legs"}, - "down": {"uv": [1, 1, 12.1, 14], "texture": "#legs"} + "north": {"uv": [1.9, 1, 13, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 7, 14, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 8, 12.1, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 14, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1.9, 1, 13, 14], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 12.1, 14], "texture": "#legs", "tintindex": 0} } }, { @@ -93,12 +93,12 @@ "to": [4, 9, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -106,12 +106,12 @@ "to": [14, 8, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -119,12 +119,12 @@ "to": [4, 9, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -132,12 +132,12 @@ "to": [14, 8, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner_tucked.json b/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner_tucked.json index 4eba2ee9f..f9dfdb7c2 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/chair_dinner/chair_dinner_tucked.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [12, 22, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "to": [12, 22, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "to": [11.9, 14.4, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 2, 3.3], "rotation": 90, "texture": "#base"}, - "east": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 2, 2, 3.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base"}, - "up": {"uv": [6, 3, 7, 12], "texture": "#base"}, - "down": {"uv": [7, 3, 8, 12], "texture": "#base"} + "north": {"uv": [0, 2, 2, 3.3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 3.3], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 3, 3, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 3, 7, 12], "texture": "#base", "tintindex": 0}, + "down": {"uv": [7, 3, 8, 12], "texture": "#base", "tintindex": 0} } }, { @@ -52,12 +52,12 @@ "to": [11.9, 21.4, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 1.3], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 3, 6, 12], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 6, 1.3], "rotation": 270, "texture": "#base"}, - "west": {"uv": [8, 3, 14, 12], "rotation": 270, "texture": "#base"}, - "up": {"uv": [5, 3, 6, 12], "texture": "#base"}, - "down": {"uv": [5, 3, 6, 12], "texture": "#base"} + "north": {"uv": [0, 0, 6, 1.3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 6, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 6, 1.3], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [8, 3, 14, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 3, 6, 12], "texture": "#base", "tintindex": 0}, + "down": {"uv": [5, 3, 6, 12], "texture": "#base", "tintindex": 0} } }, { @@ -66,12 +66,12 @@ "to": [22.98963, 10.3, 14.4], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 11, 1], "texture": "#base"}, - "east": {"uv": [5, 1, 6, 13.8], "rotation": 90, "texture": "#base"}, - "south": {"uv": [1, 1, 12, 2], "texture": "#base"}, - "west": {"uv": [5, 1.2, 6, 14], "rotation": 90, "texture": "#base"}, - "up": {"uv": [0.9, 1, 11.9, 13.8], "texture": "#base"}, - "down": {"uv": [0, 1, 11, 13.8], "texture": "#base"} + "north": {"uv": [0, 0, 11, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 6, 13.8], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1.2, 6, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [0.9, 1, 11.9, 13.8], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 11, 13.8], "texture": "#base", "tintindex": 0} } }, { @@ -80,12 +80,12 @@ "to": [23.1, 9, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [1.9, 1, 13, 2], "texture": "#legs"}, - "east": {"uv": [1, 7, 14, 8], "texture": "#legs"}, - "south": {"uv": [1, 8, 12.1, 9], "texture": "#legs"}, - "west": {"uv": [1, 1, 14, 2], "texture": "#legs"}, - "up": {"uv": [1.9, 1, 13, 14], "texture": "#legs"}, - "down": {"uv": [1, 1, 12.1, 14], "texture": "#legs"} + "north": {"uv": [1.9, 1, 13, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 7, 14, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 8, 12.1, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 14, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1.9, 1, 13, 14], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 12.1, 14], "texture": "#legs", "tintindex": 0} } }, { @@ -93,12 +93,12 @@ "to": [12, 9, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -106,12 +106,12 @@ "to": [22, 8, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -119,12 +119,12 @@ "to": [12, 9, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } }, { @@ -132,12 +132,12 @@ "to": [22, 8, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 9], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 3], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern.json b/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern.json index fe5c1e05d..209fda8f4 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern.json +++ b/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,12 +12,12 @@ "to": [3, 23.4, 14.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 9, 2.2], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 9, 2.2], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base"}, - "up": {"uv": [5, 1, 7.2, 14], "texture": "#base"}, - "down": {"uv": [0, 1, 2.2, 14], "texture": "#base"} + "north": {"uv": [0, 0, 9, 2.2], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 9, 2.2], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 1, 7.2, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 2.2, 14], "texture": "#base", "tintindex": 0} } }, { @@ -26,12 +26,12 @@ "to": [14.3, 10.5, 14.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12.3, 2.5], "texture": "#base"}, - "east": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base"}, - "south": {"uv": [1, 1, 13.3, 3.5], "texture": "#base"}, - "west": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base"}, - "up": {"uv": [1, 1, 13.3, 14], "texture": "#base"}, - "down": {"uv": [0, 1, 12.3, 14], "texture": "#base"} + "north": {"uv": [0, 0, 12.3, 2.5], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 13.3, 3.5], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 13.3, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 12.3, 14], "texture": "#base", "tintindex": 0} } }, { @@ -40,12 +40,12 @@ "to": [3, 14.5, 4.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [11, 3, 13, 5], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [11, 3, 13, 5], "texture": "#legs", "tintindex": 0} } }, { @@ -54,12 +54,12 @@ "to": [13, 9, 13.4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [13, 8, 15, 10], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [13, 8, 15, 10], "texture": "#legs", "tintindex": 0} } }, { @@ -68,12 +68,12 @@ "to": [3, 14.5, 13.4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [8, 2, 10, 4], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 2, 10, 4], "texture": "#legs", "tintindex": 0} } }, { @@ -82,12 +82,12 @@ "to": [13, 9, 4.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [4, 4, 6, 6], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [4, 4, 6, 6], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern_tucked.json b/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern_tucked.json index d436364f4..8e5091b2d 100644 --- a/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/chair_modern/chair_modern_tucked.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,12 +12,12 @@ "to": [11, 23.4, 14.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 9, 2.2], "rotation": 90, "texture": "#base"}, - "east": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base"}, - "south": {"uv": [0, 0, 9, 2.2], "rotation": 270, "texture": "#base"}, - "west": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base"}, - "up": {"uv": [5, 1, 7.2, 14], "texture": "#base"}, - "down": {"uv": [0, 1, 2.2, 14], "texture": "#base"} + "north": {"uv": [0, 0, 9, 2.2], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 9, 2.2], "rotation": 270, "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 9, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 1, 7.2, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 2.2, 14], "texture": "#base", "tintindex": 0} } }, { @@ -26,12 +26,12 @@ "to": [22.3, 10.5, 14.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12.3, 2.5], "texture": "#base"}, - "east": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base"}, - "south": {"uv": [1, 1, 13.3, 3.5], "texture": "#base"}, - "west": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base"}, - "up": {"uv": [1, 1, 13.3, 14], "texture": "#base"}, - "down": {"uv": [0, 1, 12.3, 14], "texture": "#base"} + "north": {"uv": [0, 0, 12.3, 2.5], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 13.3, 3.5], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7.5, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 13.3, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 12.3, 14], "texture": "#base", "tintindex": 0} } }, { @@ -40,12 +40,12 @@ "to": [11, 14.5, 4.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [11, 3, 13, 5], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [11, 3, 13, 5], "texture": "#legs", "tintindex": 0} } }, { @@ -54,12 +54,12 @@ "to": [21, 9, 13.4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [13, 8, 15, 10], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [13, 8, 15, 10], "texture": "#legs", "tintindex": 0} } }, { @@ -68,12 +68,12 @@ "to": [11, 14.5, 13.4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [8, 2, 10, 4], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 15.5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 2, 10, 4], "texture": "#legs", "tintindex": 0} } }, { @@ -82,12 +82,12 @@ "to": [21, 9, 4.6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 3], "texture": "#legs"}, - "down": {"uv": [4, 4, 6, 6], "texture": "#legs"} + "north": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [4, 4, 6, 6], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_left.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_left.json index 7efa6080a..193799694 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_left.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,10 +10,10 @@ "to": [3, 0, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 8, 3, 13], "texture": "#0"}, - "east": {"uv": [0, 8, 3.02344, 13], "texture": "#0"}, - "south": {"uv": [0, 8, 3, 13], "texture": "#0"}, - "west": {"uv": [0, 8, 3.02344, 13], "texture": "#0"} + "north": {"uv": [0, 8, 3, 13], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 8, 3.02344, 13], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 8, 3, 13], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 8, 3.02344, 13], "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_right.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_right.json index db99b2514..03e30a8c0 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_right.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/bunk/foot/classic_bed_foot_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,10 +10,10 @@ "to": [16, 0, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 8, 3, 13], "texture": "#0"}, - "east": {"uv": [0, 8, 3.02344, 13], "texture": "#0"}, - "south": {"uv": [0, 8, 3, 13], "texture": "#0"}, - "west": {"uv": [0, 8, 3.02344, 13], "texture": "#0"} + "north": {"uv": [0, 8, 3, 13], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 8, 3.02344, 13], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 8, 3, 13], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 8, 3.02344, 13], "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot.json index 15e643a38..7cf00f753 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot.json @@ -1,7 +1,7 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks" + "0": "block/oak_planks" }, "elements": [ { @@ -9,9 +9,9 @@ "to": [16, 5, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "east": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "west": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0"} + "east": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -19,10 +19,10 @@ "to": [16, 10, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 16, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 4], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 6], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -30,10 +30,10 @@ "to": [10.6, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#0"} + "north": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0} } }, { @@ -41,10 +41,10 @@ "to": [13, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#0"} + "north": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0} } }, { @@ -52,10 +52,10 @@ "to": [15.3, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#0"} + "north": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0} } }, { @@ -63,10 +63,10 @@ "to": [4, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#0"} + "north": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0} } }, { @@ -74,10 +74,10 @@ "to": [1.7, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#0"} + "north": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0} } }, { @@ -85,10 +85,10 @@ "to": [6.2, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#0"} + "north": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0} } }, { @@ -96,10 +96,10 @@ "to": [8.4, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#0"} + "north": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0} } }, { @@ -107,9 +107,9 @@ "to": [16, 5, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "south": {"uv": [0, 3, 16, 6], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"} + "south": {"uv": [0, 3, 16, 6], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 6], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_left.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_left.json index c0f6e7d76..96e7bab9d 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_left.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [3, 11, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "east": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "south": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "west": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 1, 3, 4], "rotation": 270, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_right.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_right.json index 29e4fbeb4..a7f8f50cd 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_right.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/foot/classic_bed_foot_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [16, 11, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "east": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "south": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "west": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 1, 3, 4], "rotation": 270, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/full/classic_bed.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/full/classic_bed.json index 0ca16ed52..4ce48493a 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/full/classic_bed.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/full/classic_bed.json @@ -9,273 +9,273 @@ "from": [29, 2, 0], "to": [31, 14, 16], "faces": { - "east": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#0"} + "east": {"uv": [0, 2, 16, 14], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 2, 16, 14], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0} } }, { "from": [28.96875, 0, 13], "to": [32, 16, 16], "faces": { - "north": {"uv": [0, 0, 3.03125, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 3.03125, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 3.03125, 3], "texture": "#0"}, - "down": {"uv": [0, 0, 3.03125, 3], "texture": "#0"} + "north": {"uv": [0, 0, 3.03125, 16], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3.03125, 16], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 3.03125, 3], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3.03125, 3], "texture": "#0", "tintindex": 0} } }, { "from": [28.98438, 0, 0], "to": [32, 16, 3], "faces": { - "north": {"uv": [0, 0, 3.01563, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 3.01563, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 3.01563, 3], "texture": "#0"}, - "down": {"uv": [0, 0, 3.01563, 3], "texture": "#0"} + "north": {"uv": [0, 0, 3.01563, 16], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3.01563, 16], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 3.01563, 3], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3.01563, 3], "texture": "#0", "tintindex": 0} } }, { "from": [16, 2, 0], "to": [29, 5, 16], "faces": { - "north": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "south": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "texture": "#0"} + "north": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "texture": "#0", "tintindex": 0} } }, { "from": [3, 2, 0], "to": [16, 5, 16], "faces": { - "north": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "south": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "texture": "#0"} + "north": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "texture": "#0", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [3, 11, 3], "faces": { - "north": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "east": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "south": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "west": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "texture": "#0"} + "north": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0} } }, { "from": [0, 0, 13], "to": [3, 11, 16], "faces": { - "north": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "east": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "south": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "west": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "texture": "#0"} + "north": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0} } }, { "from": [1, 8, 0], "to": [3, 10, 16], "faces": { - "east": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#0"} + "east": {"uv": [0, 0, 16, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 2, 16, 4], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 9.6], "to": [3, 8, 10.6], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 12], "to": [3, 8, 13], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 14.3], "to": [3, 8, 15.3], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 3], "to": [3, 8, 4], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 0.7], "to": [3, 8, 1.7], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 5.2], "to": [3, 8, 6.2], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 7.4], "to": [3, 8, 8.4], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 2, 0], "to": [3, 5, 16], "faces": { - "west": {"uv": [0, 3, 16, 6], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#0"} + "west": {"uv": [0, 3, 16, 6], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0} } }, { "from": [3, 2, 0], "to": [16, 5, 16], "faces": { - "north": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "south": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "texture": "#0"} + "north": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "texture": "#0", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [3.02344, 11, 3], "faces": { - "north": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "east": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "south": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "west": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "texture": "#0"} + "north": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0} } }, { "from": [0, 0, 13], "to": [3.02344, 11, 16], "faces": { - "north": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "east": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "south": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "west": {"uv": [0, 1, 3, 12], "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "texture": "#0"} + "north": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 1, 3, 4], "texture": "#0", "tintindex": 0} } }, { "from": [1, 8, 0], "to": [3, 10, 16], "faces": { - "east": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#0"} + "east": {"uv": [0, 0, 16, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 2, 16, 4], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 9.6], "to": [3, 8, 10.6], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 12], "to": [3, 8, 13], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 14.3], "to": [3, 8, 15.3], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 3], "to": [3, 8, 4], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 0.7], "to": [3, 8, 1.7], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 5.2], "to": [3, 8, 6.2], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 5, 7.4], "to": [3, 8, 8.4], "faces": { - "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"} + "north": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 3], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#0", "tintindex": 0} } }, { "from": [1, 2, 0], "to": [3, 5, 16], "faces": { - "west": {"uv": [0, 3, 16, 6], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#0"} + "west": {"uv": [0, 3, 16, 6], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 6], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head.json index 4573453da..2c27599ed 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,10 +10,10 @@ "to": [16, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "south": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 2, 16, 14], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 14], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -21,9 +21,9 @@ "to": [16, 5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "west": {"uv": [0, 3, 13, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0"} + "east": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 6], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_left.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_left.json index 56e7a377e..f2b2e048c 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_left.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [3, 16, 3.01562], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 3.01563, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 3.01563, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 3.01563, 3], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 3.01563, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3.01563, 16], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3.01563, 16], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 3.01563, 3], "rotation": 270, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3.01563, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_right.json b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_right.json index d565357c5..a7c2e92bc 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_right.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_bed/template/head/classic_bed_head_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [16, 16, 3.03125], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 3.03125, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 3.03125, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 3.03125, 3], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 3.03125, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3.03125, 16], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3.03125, 16], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 3.03125, 3], "rotation": 270, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3.03125, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand.json index b836b0fd0..21505f37b 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [16, 16, 14, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 14, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [2, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 0, 14, 2], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 0, 14, 2], "texture": "#support"}, - "up": {"uv": [14, 2, 2, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 0, 14, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 0, 14, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 14, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 2, 2, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 0, 14, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -42,12 +42,12 @@ "to": [16, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 14, 14, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 14, 14, 16], "texture": "#support"}, - "up": {"uv": [14, 16, 2, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 14, 14, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 14, 14, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 14, 14, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 16, 2, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 14, 14, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -56,12 +56,12 @@ "to": [16, 16, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -69,12 +69,12 @@ "to": [15, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -82,12 +82,12 @@ "to": [15, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 12, 5, 14], "texture": "#support"}, - "east": {"uv": [4, 12, 14, 14], "texture": "#support"}, - "south": {"uv": [4, 12, 5, 14], "texture": "#support"}, - "west": {"uv": [4, 12, 14, 14], "texture": "#support"}, - "up": {"uv": [4, 12, 14, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [4, 12, 14, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 12, 5, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [4, 12, 14, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [4, 12, 5, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [4, 12, 14, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [4, 12, 14, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [4, 12, 14, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -95,12 +95,12 @@ "to": [2, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 2], "texture": "#support"}, - "east": {"uv": [0, 0, 8, 2], "texture": "#support"}, - "south": {"uv": [0, 0, 1, 2], "texture": "#support"}, - "west": {"uv": [3, 14, 11, 16], "texture": "#support"}, - "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 1, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 14, 11, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -108,12 +108,12 @@ "to": [13, 3, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 5, 12, 7], "texture": "#support"}, - "east": {"uv": [2, 5, 3, 7], "texture": "#support"}, - "south": {"uv": [2, 5, 12, 7], "texture": "#support"}, - "west": {"uv": [2, 5, 3, 7], "texture": "#support"}, - "up": {"uv": [4, 5, 12, 6], "rotation": 180, "texture": "#support"}, - "down": {"uv": [3, 6, 11, 7], "rotation": 180, "texture": "#support"} + "north": {"uv": [2, 5, 12, 7], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 5, 3, 7], "texture": "#support", "tintindex": 0}, + "south": {"uv": [2, 5, 12, 7], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 5, 3, 7], "texture": "#support", "tintindex": 0}, + "up": {"uv": [4, 5, 12, 6], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [3, 6, 11, 7], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -121,12 +121,12 @@ "to": [13, 3, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "east": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"}, - "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"} + "north": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "east": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "west": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -134,12 +134,12 @@ "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "up": {"uv": [0, 1, 12, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 12, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -147,12 +147,12 @@ "to": [3, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -160,12 +160,12 @@ "to": [3, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [2, 0, 0, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 0, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -173,12 +173,12 @@ "to": [15, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -186,12 +186,12 @@ "to": [16, 1, 15.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -199,12 +199,12 @@ "to": [16, 1, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -212,12 +212,12 @@ "to": [2, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [6, 1, 7, 5], "texture": "#support"}, - "east": {"uv": [6, 1, 14, 5], "texture": "#support"}, - "south": {"uv": [11, 1, 12, 5], "texture": "#support"}, - "west": {"uv": [6, 1, 14, 5], "texture": "#support"}, - "up": {"uv": [14, 1, 6, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [14, 3, 6, 4], "rotation": 90, "texture": "#support"} + "north": {"uv": [6, 1, 7, 5], "texture": "#support", "tintindex": 0}, + "east": {"uv": [6, 1, 14, 5], "texture": "#support", "tintindex": 0}, + "south": {"uv": [11, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "west": {"uv": [6, 1, 14, 5], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 1, 6, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [14, 3, 6, 4], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -225,12 +225,12 @@ "to": [2, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 5, 5, 9], "texture": "#support"}, - "east": {"uv": [4, 5, 12, 9], "texture": "#support"}, - "south": {"uv": [9, 5, 10, 9], "texture": "#support"}, - "west": {"uv": [4, 5, 12, 9], "texture": "#support"}, - "up": {"uv": [12, 5, 4, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [12, 7, 4, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 5, 5, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [4, 5, 12, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [9, 5, 10, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [4, 5, 12, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [12, 5, 4, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [12, 7, 4, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left.json index 2260f51f0..67a9410b1 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [2, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -42,12 +42,12 @@ "to": [16, 16, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -55,12 +55,12 @@ "to": [15, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -68,12 +68,12 @@ "to": [15, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "east": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "south": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "west": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -81,12 +81,12 @@ "to": [2, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#support"}, - "east": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 4, 2], "texture": "#support"}, - "west": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 0, 5, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 4, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -94,12 +94,12 @@ "to": [13, 3, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "east": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"}, - "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"} + "north": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "east": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "west": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -107,12 +107,12 @@ "to": [14, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 13], "texture": "#base"}, - "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -120,12 +120,12 @@ "to": [3, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -133,12 +133,12 @@ "to": [16, 1, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -146,12 +146,12 @@ "to": [2, 13, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 2, 5], "texture": "#support"}, - "east": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "south": {"uv": [6, 1, 7, 5], "texture": "#support"}, - "west": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support"} + "north": {"uv": [1, 1, 2, 5], "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "south": {"uv": [6, 1, 7, 5], "texture": "#support", "tintindex": 0}, + "west": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -159,12 +159,12 @@ "to": [2, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 5, 3, 9], "texture": "#support"}, - "east": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "south": {"uv": [7, 5, 8, 9], "texture": "#support"}, - "west": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 5, 3, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [7, 5, 8, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left_open.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left_open.json index 80c6b2e52..32d31e4de 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left_open.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_left_open.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [2, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -42,12 +42,12 @@ "to": [16, 16, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -55,12 +55,12 @@ "to": [15, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -68,12 +68,12 @@ "to": [15, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "east": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "south": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "west": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -81,12 +81,12 @@ "to": [2, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#support"}, - "east": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 4, 2], "texture": "#support"}, - "west": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 0, 5, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 4, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -94,25 +94,12 @@ "to": [13, 3, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "east": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"}, - "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"} - } - }, - { - "from": [-7, 5.5, 8], - "to": [-6, 6.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, - "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, - "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + "north": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "east": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "west": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -120,12 +107,12 @@ "to": [-5, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 5, 4, 9], "texture": "#support"}, - "east": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "south": {"uv": [7, 5, 8, 9], "texture": "#support"}, - "west": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 5, 4, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [7, 5, 8, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -133,12 +120,12 @@ "to": [9, 5, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -146,12 +133,12 @@ "to": [9, 8, 5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -159,12 +146,12 @@ "to": [9, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -172,12 +159,12 @@ "to": [3, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -185,12 +172,12 @@ "to": [16, 1, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -198,25 +185,12 @@ "to": [2, 13, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 2, 5], "texture": "#support"}, - "east": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "south": {"uv": [6, 1, 7, 5], "texture": "#support"}, - "west": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support"} - } - }, - { - "from": [0, 10.5, 8], - "to": [1, 11.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [5, 3, 6, 4], "texture": "#2"}, - "east": {"uv": [4, 3, 6, 4], "texture": "#2"}, - "south": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "up": {"uv": [4, 3, 6, 4], "rotation": 270, "texture": "#2"}, - "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + "north": {"uv": [1, 1, 2, 5], "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "south": {"uv": [6, 1, 7, 5], "texture": "#support", "tintindex": 0}, + "west": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -224,12 +198,12 @@ "to": [14, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 8], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 8], "texture": "#base"}, - "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 8], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -237,12 +211,12 @@ "to": [14, 8, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 8, 12, 13], "texture": "#base"}, - "east": {"uv": [0, 8, 2, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 5], "texture": "#base"}, - "west": {"uv": [0, 8, 2, 13], "texture": "#base"}, - "up": {"uv": [0, 0, 2, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 2, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 8, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 8, 2, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 5], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 8, 2, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -250,12 +224,12 @@ "to": [14, 4, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "east": {"uv": [1, 12, 12, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "west": {"uv": [2, 12, 13, 13], "texture": "#base"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 11, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 12, 12, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 12, 13, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -263,12 +237,12 @@ "to": [14, 8, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [0, 8, 12, 13], "texture": "#base"}, - "west": {"uv": [13, 8, 14, 13], "texture": "#base"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 8, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [13, 8, 14, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -276,12 +250,38 @@ "to": [14, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "east": {"uv": [1, 8, 12, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "west": {"uv": [3, 8, 14, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 11, 5], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 8, 12, 12], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "west": {"uv": [3, 8, 14, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 5], "rotation": 90, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [-7, 5.5, 8], + "to": [-6, 6.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, + "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, + "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [0, 10.5, 8], + "to": [1, 11.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [5, 3, 6, 4], "texture": "#2"}, + "east": {"uv": [4, 3, 6, 4], "texture": "#2"}, + "south": {"uv": [3, 3, 4, 4], "texture": "#2"}, + "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "up": {"uv": [4, 3, 6, 4], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} } } ], @@ -348,17 +348,17 @@ "name": "group", "origin": [14, 0, 13], "color": 0, - "children": [7, 8, 9, 10, 11] + "children": [7, 8, 9, 10] }, - 12, - 13 + 11, + 12 ] }, { "name": "drawer", "origin": [0, 0, 0], "color": 0, - "children": [14, 15] + "children": [13] } ] }, @@ -366,7 +366,8 @@ "name": "legs", "origin": [0, 0, 0], "color": 0, - "children": [16, 17, 18, 19, 20] - } + "children": [14, 15, 16, 17, 18, 19] + }, + 20 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle.json index 76f8c8142..47cf75a57 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [2, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 5, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [16, 2, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 2, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 14, 3, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#support"}, - "south": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#support"}, - "up": {"uv": [16, 16, 0, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [1, 14, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 0, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -41,12 +41,12 @@ "to": [15, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 12, 1, 14], "texture": "#support"}, - "east": {"uv": [0, 12, 16, 14], "texture": "#support"}, - "south": {"uv": [0, 12, 1, 14], "texture": "#support"}, - "west": {"uv": [0, 12, 16, 14], "texture": "#support"}, - "up": {"uv": [0, 12, 16, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 12, 1, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 12, 16, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 12, 1, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 12, 16, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 12, 16, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -54,12 +54,12 @@ "to": [2, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#support"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 4, 2], "texture": "#support"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [0, 0, 13, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 13, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 0, 5, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 4, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -67,12 +67,12 @@ "to": [14, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "up": {"uv": [0, 1, 16, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 16, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 16, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -80,12 +80,12 @@ "to": [2, 13, 13.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 2, 3, 6], "texture": "#support"}, - "east": {"uv": [2, 2, 13, 6], "texture": "#support"}, - "south": {"uv": [7, 2, 8, 6], "texture": "#support"}, - "west": {"uv": [2, 2, 13, 6], "texture": "#support"}, - "up": {"uv": [13, 2, 2, 3], "rotation": 270, "texture": "#support"}, - "down": {"uv": [13, 4, 2, 5], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 2, 3, 6], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 2, 13, 6], "texture": "#support", "tintindex": 0}, + "south": {"uv": [7, 2, 8, 6], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 2, 13, 6], "texture": "#support", "tintindex": 0}, + "up": {"uv": [13, 2, 2, 3], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [13, 4, 2, 5], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -93,12 +93,12 @@ "to": [2, 8, 13.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 5, 4, 9], "texture": "#support"}, - "east": {"uv": [3, 5, 14, 9], "texture": "#support"}, - "south": {"uv": [8, 5, 9, 9], "texture": "#support"}, - "west": {"uv": [3, 5, 14, 9], "texture": "#support"}, - "up": {"uv": [14, 5, 3, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [14, 7, 3, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 5, 4, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [3, 5, 14, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [8, 5, 9, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 5, 14, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 5, 3, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [14, 7, 3, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle_open.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle_open.json index 0ddd8f41c..478297d96 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle_open.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_middle_open.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [2, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 5, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [16, 2, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 2, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 14, 3, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#support"}, - "south": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#support"}, - "up": {"uv": [16, 16, 0, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [1, 14, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 0, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -41,12 +41,12 @@ "to": [15, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 12, 1, 14], "texture": "#support"}, - "east": {"uv": [0, 12, 16, 14], "texture": "#support"}, - "south": {"uv": [0, 12, 1, 14], "texture": "#support"}, - "west": {"uv": [0, 12, 16, 14], "texture": "#support"}, - "up": {"uv": [0, 12, 16, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 12, 1, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 12, 16, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 12, 1, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 12, 16, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 12, 16, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 12, 16, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -54,12 +54,12 @@ "to": [2, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#support"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 4, 2], "texture": "#support"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [0, 0, 13, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 13, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 0, 5, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 4, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -67,12 +67,12 @@ "to": [14, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#base"}, - "up": {"uv": [0, 1, 16, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 16, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 8], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 16, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -80,10 +80,10 @@ "to": [14, 8, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 8, 12, 13], "texture": "#base"}, - "east": {"uv": [13, 8, 16, 13], "texture": "#base"}, - "west": {"uv": [0, 8, 3, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 3, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 8, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [13, 8, 16, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 8, 3, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -91,9 +91,9 @@ "to": [14, 4, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [3, 12, 13, 13], "texture": "#base"}, - "west": {"uv": [3, 12, 13, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 10, 12], "rotation": 90, "texture": "#base"} + "east": {"uv": [3, 12, 13, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [3, 12, 13, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 10, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -101,10 +101,10 @@ "to": [14, 8, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 8, 3, 13], "texture": "#base"}, - "south": {"uv": [0, 8, 12, 13], "texture": "#base"}, - "west": {"uv": [13, 8, 16, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 3, 12], "rotation": 90, "texture": "#base"} + "east": {"uv": [0, 8, 3, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 8, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [13, 8, 16, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -112,9 +112,9 @@ "to": [14, 8, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [3, 8, 13, 12], "texture": "#base"}, - "west": {"uv": [3, 8, 13, 12], "texture": "#base"}, - "down": {"uv": [0, 0, 10, 5], "rotation": 90, "texture": "#base"} + "east": {"uv": [3, 8, 13, 12], "texture": "#base", "tintindex": 0}, + "west": {"uv": [3, 8, 13, 12], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 10, 5], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -122,87 +122,87 @@ "to": [2, 13, 13.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 2, 3, 6], "texture": "#support"}, - "south": {"uv": [7, 2, 8, 6], "texture": "#support"}, - "west": {"uv": [2, 2, 13, 6], "texture": "#support"}, - "up": {"uv": [13, 2, 2, 3], "rotation": 270, "texture": "#support"}, - "down": {"uv": [13, 4, 2, 5], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 2, 3, 6], "texture": "#support", "tintindex": 0}, + "south": {"uv": [7, 2, 8, 6], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 2, 13, 6], "texture": "#support", "tintindex": 0}, + "up": {"uv": [13, 2, 2, 3], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [13, 4, 2, 5], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { - "from": [0, 10.5, 6.5], - "to": [1, 11.5, 9.5], + "from": [-6, 4, 2.5], + "to": [-5, 8, 13.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 3, 6, 4], "texture": "#2"}, - "east": {"uv": [4, 3, 6, 4], "texture": "#2"}, - "south": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "up": {"uv": [4, 3, 6, 4], "rotation": 270, "texture": "#2"}, - "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + "north": {"uv": [3, 5, 4, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [3, 5, 14, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [8, 5, 9, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 5, 14, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 5, 3, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [14, 7, 3, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { - "from": [-7, 5.5, 6.5], - "to": [-6, 6.5, 9.5], + "from": [-5, 4, 2.5], + "to": [9, 5, 13.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, - "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, - "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { - "from": [-6, 4, 2.5], - "to": [-5, 8, 13.5], + "from": [-5, 5, 2.5], + "to": [9, 8, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 5, 4, 9], "texture": "#support"}, - "east": {"uv": [3, 5, 14, 9], "texture": "#support"}, - "south": {"uv": [8, 5, 9, 9], "texture": "#support"}, - "west": {"uv": [3, 5, 14, 9], "texture": "#support"}, - "up": {"uv": [14, 5, 3, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [14, 7, 3, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { - "from": [-5, 4, 2.5], - "to": [9, 5, 13.5], + "from": [-5, 5, 12.5], + "to": [9, 8, 13.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { - "from": [-5, 5, 2.5], - "to": [9, 8, 3.5], + "from": [-7, 5.5, 6.5], + "to": [-6, 6.5, 9.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} + "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, + "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, + "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} } }, { - "from": [-5, 5, 12.5], - "to": [9, 8, 13.5], + "from": [0, 10.5, 6.5], + "to": [1, 11.5, 9.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"} + "north": {"uv": [5, 3, 6, 4], "texture": "#2"}, + "east": {"uv": [4, 3, 6, 4], "texture": "#2"}, + "south": {"uv": [3, 3, 4, 4], "texture": "#2"}, + "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "up": {"uv": [4, 3, 6, 4], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} } } ], @@ -265,7 +265,7 @@ "name": "drawer", "origin": [0, 0, 0], "color": 0, - "children": [9, 10] + "children": [9] } ] }, @@ -273,7 +273,9 @@ "name": "group", "origin": [14, 0, 13], "color": 0, - "children": [11, 12, 13, 14, 15] - } + "children": [10, 11, 12, 13] + }, + 14, + 15 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_open.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_open.json index 5c63d3ca7..a574ebbf3 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_open.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_open.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [16, 16, 14, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 14, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [2, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 0, 14, 2], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 0, 14, 2], "texture": "#support"}, - "up": {"uv": [14, 2, 2, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 0, 14, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 0, 14, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 14, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 2, 2, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 0, 14, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -42,12 +42,12 @@ "to": [16, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 14, 14, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 14, 14, 16], "texture": "#support"}, - "up": {"uv": [14, 16, 2, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 14, 14, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 14, 14, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 14, 14, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 16, 2, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 14, 14, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -56,12 +56,12 @@ "to": [16, 16, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -69,12 +69,12 @@ "to": [15, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -82,12 +82,12 @@ "to": [15, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 12, 5, 14], "texture": "#support"}, - "east": {"uv": [4, 12, 14, 14], "texture": "#support"}, - "south": {"uv": [4, 12, 5, 14], "texture": "#support"}, - "west": {"uv": [4, 12, 14, 14], "texture": "#support"}, - "up": {"uv": [4, 12, 14, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [4, 12, 14, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 12, 5, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [4, 12, 14, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [4, 12, 5, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [4, 12, 14, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [4, 12, 14, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [4, 12, 14, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -95,12 +95,12 @@ "to": [2, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 2], "texture": "#support"}, - "east": {"uv": [0, 0, 8, 2], "texture": "#support"}, - "south": {"uv": [0, 0, 1, 2], "texture": "#support"}, - "west": {"uv": [3, 14, 11, 16], "texture": "#support"}, - "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 1, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 14, 11, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -108,12 +108,12 @@ "to": [13, 3, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 5, 12, 7], "texture": "#support"}, - "east": {"uv": [2, 5, 3, 7], "texture": "#support"}, - "south": {"uv": [2, 5, 12, 7], "texture": "#support"}, - "west": {"uv": [2, 5, 3, 7], "texture": "#support"}, - "up": {"uv": [4, 5, 12, 6], "rotation": 180, "texture": "#support"}, - "down": {"uv": [3, 6, 11, 7], "rotation": 180, "texture": "#support"} + "north": {"uv": [2, 5, 12, 7], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 5, 3, 7], "texture": "#support", "tintindex": 0}, + "south": {"uv": [2, 5, 12, 7], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 5, 3, 7], "texture": "#support", "tintindex": 0}, + "up": {"uv": [4, 5, 12, 6], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [3, 6, 11, 7], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -121,12 +121,12 @@ "to": [14, 16, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "east": {"uv": [2, 0, 10, 8], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "west": {"uv": [2, 0, 10, 8], "texture": "#base"}, - "up": {"uv": [2, 1, 10, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "east": {"uv": [2, 0, 10, 8], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 0, 10, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [2, 1, 10, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -134,12 +134,12 @@ "to": [14, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 7, 4], "texture": "#base"}, - "east": {"uv": [2, 8, 10, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 7, 4], "texture": "#base"}, - "west": {"uv": [2, 0, 10, 4], "texture": "#base"}, - "up": {"uv": [2, 0, 10, 7], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 7, 4], "texture": "#base", "tintindex": 0}, + "east": {"uv": [2, 8, 10, 12], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 7, 4], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 0, 10, 4], "texture": "#base", "tintindex": 0}, + "up": {"uv": [2, 0, 10, 7], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -147,12 +147,12 @@ "to": [14, 4, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [2, 12, 10, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [2, 12, 10, 13], "texture": "#base"}, - "up": {"uv": [0, 1, 8, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 1, 8, 13], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [2, 12, 10, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 12, 10, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 8, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 8, 13], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -160,12 +160,12 @@ "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "west": {"uv": [10, 0, 12, 13], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [10, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -173,12 +173,12 @@ "to": [14, 16, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "east": {"uv": [10, 0, 12, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#base"}, - "up": {"uv": [10, 1, 12, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [10, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 1, 12, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -186,12 +186,12 @@ "to": [13, 3, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "east": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"}, - "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"} + "north": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "east": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "west": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -199,12 +199,12 @@ "to": [9, 5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -212,12 +212,12 @@ "to": [9, 8, 5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -225,25 +225,12 @@ "to": [9, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base"} - } - }, - { - "from": [-7, 5.5, 6.5], - "to": [-6, 6.5, 9.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, - "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, - "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -251,12 +238,12 @@ "to": [-5, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 5, 5, 9], "texture": "#support"}, - "east": {"uv": [4, 5, 12, 9], "texture": "#support"}, - "south": {"uv": [9, 5, 10, 9], "texture": "#support"}, - "west": {"uv": [4, 5, 12, 9], "texture": "#support"}, - "up": {"uv": [12, 5, 4, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [12, 7, 4, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 5, 5, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [4, 5, 12, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [9, 5, 10, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [4, 5, 12, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [12, 5, 4, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [12, 7, 4, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -264,12 +251,12 @@ "to": [3, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -277,12 +264,12 @@ "to": [3, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [2, 0, 0, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 0, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -290,12 +277,12 @@ "to": [15, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -303,12 +290,12 @@ "to": [16, 1, 15.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -316,12 +303,12 @@ "to": [16, 1, 3.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -329,12 +316,12 @@ "to": [2, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [6, 1, 7, 5], "texture": "#support"}, - "east": {"uv": [6, 1, 14, 5], "texture": "#support"}, - "south": {"uv": [11, 1, 12, 5], "texture": "#support"}, - "west": {"uv": [6, 1, 14, 5], "texture": "#support"}, - "up": {"uv": [14, 1, 6, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [14, 3, 6, 4], "rotation": 90, "texture": "#support"} + "north": {"uv": [6, 1, 7, 5], "texture": "#support", "tintindex": 0}, + "east": {"uv": [6, 1, 14, 5], "texture": "#support", "tintindex": 0}, + "south": {"uv": [11, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "west": {"uv": [6, 1, 14, 5], "texture": "#support", "tintindex": 0}, + "up": {"uv": [14, 1, 6, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [14, 3, 6, 4], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -349,6 +336,19 @@ "up": {"uv": [4, 3, 6, 4], "rotation": 270, "texture": "#2"}, "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} } + }, + { + "from": [-7, 5.5, 6.5], + "to": [-6, 6.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, + "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, + "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + } } ], "display": { @@ -421,22 +421,23 @@ "name": "group", "origin": [14, 0, 13], "color": 0, - "children": [14, 15, 16, 17, 18] + "children": [14, 15, 16, 17] }, + 18, 19, 20, 21, - 22, - 23 + 22 ] }, { "name": "drawer", "origin": [0, 0, 0], "color": 0, - "children": [24, 25] + "children": [23, 24] } ] - } + }, + 25 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right.json index 0753ae1c1..74a960e2c 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [2, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [16, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -42,12 +42,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -55,12 +55,12 @@ "to": [15, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -68,12 +68,12 @@ "to": [15, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "east": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "south": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "west": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -81,12 +81,12 @@ "to": [2, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#support"}, - "east": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 4, 2], "texture": "#support"}, - "west": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 0, 5, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 4, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -94,12 +94,12 @@ "to": [13, 3, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "east": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"}, - "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"} + "north": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "east": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "west": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -107,12 +107,12 @@ "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 13], "texture": "#base"}, - "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -120,12 +120,12 @@ "to": [3, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -133,12 +133,12 @@ "to": [16, 1, 15.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -146,12 +146,12 @@ "to": [2, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 2, 5], "texture": "#support"}, - "east": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "south": {"uv": [6, 1, 7, 5], "texture": "#support"}, - "west": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support"} + "north": {"uv": [1, 1, 2, 5], "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "south": {"uv": [6, 1, 7, 5], "texture": "#support", "tintindex": 0}, + "west": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -159,12 +159,12 @@ "to": [2, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 5, 3, 9], "texture": "#support"}, - "east": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "south": {"uv": [7, 5, 8, 9], "texture": "#support"}, - "west": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 5, 3, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [7, 5, 8, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right_open.json b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right_open.json index 59348eb72..aa4e9d928 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right_open.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_nightstand/classic_nightstand_right_open.json @@ -3,9 +3,9 @@ "parent": "block/block", "textures": { "2": "block/stone", - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "support": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "support": "block/oak_log" }, "elements": [ { @@ -14,12 +14,12 @@ "to": [2, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 0, 4, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 2], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 2, 2, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 0, 16, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -28,12 +28,12 @@ "to": [16, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [2, 14, 16, 16], "texture": "#support"}, - "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [3, 14, 5, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 14, 16, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [16, 16, 2, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 14, 16, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -42,12 +42,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support"}, - "east": {"uv": [1, 1, 3, 3], "texture": "#support"}, - "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#support"}, - "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support"}, - "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 0, 7, 16], "rotation": 90, "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 16, 0, 0], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -55,12 +55,12 @@ "to": [15, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -68,12 +68,12 @@ "to": [15, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "east": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "south": {"uv": [2, 12, 3, 14], "texture": "#support"}, - "west": {"uv": [2, 12, 15, 14], "texture": "#support"}, - "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support"}, - "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "south": {"uv": [2, 12, 3, 14], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 12, 15, 14], "texture": "#support", "tintindex": 0}, + "up": {"uv": [2, 12, 15, 13], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [2, 12, 15, 13], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -81,12 +81,12 @@ "to": [2, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#support"}, - "east": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "south": {"uv": [3, 0, 4, 2], "texture": "#support"}, - "west": {"uv": [3, 0, 16, 2], "texture": "#support"}, - "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support"}, - "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support"} + "north": {"uv": [4, 0, 5, 2], "texture": "#support", "tintindex": 0}, + "east": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "south": {"uv": [3, 0, 4, 2], "texture": "#support", "tintindex": 0}, + "west": {"uv": [3, 0, 16, 2], "texture": "#support", "tintindex": 0}, + "up": {"uv": [3, 0, 16, 1], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [3, 0, 16, 1], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -94,12 +94,12 @@ "to": [13, 3, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "east": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "south": {"uv": [5, 14, 15, 16], "texture": "#support"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#support"}, - "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"}, - "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support"} + "north": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "east": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "south": {"uv": [5, 14, 15, 16], "texture": "#support", "tintindex": 0}, + "west": {"uv": [5, 14, 6, 16], "texture": "#support", "tintindex": 0}, + "up": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0}, + "down": {"uv": [5, 14, 15, 15], "rotation": 180, "texture": "#support", "tintindex": 0} } }, { @@ -107,12 +107,12 @@ "to": [3, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#support"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -120,12 +120,12 @@ "to": [16, 1, 15.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#support"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#support"}, - "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support"}, - "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support"} + "north": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#support", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#support", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 14], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 14], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -133,38 +133,12 @@ "to": [2, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [1, 1, 2, 5], "texture": "#support"}, - "east": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "south": {"uv": [6, 1, 7, 5], "texture": "#support"}, - "west": {"uv": [1, 1, 12, 5], "texture": "#support"}, - "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support"}, - "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support"} - } - }, - { - "from": [0, 10.5, 5], - "to": [1, 11.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [5, 3, 6, 4], "texture": "#2"}, - "east": {"uv": [4, 3, 6, 4], "texture": "#2"}, - "south": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "up": {"uv": [4, 3, 6, 4], "rotation": 270, "texture": "#2"}, - "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [-7, 5.5, 5], - "to": [-6, 6.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, - "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, - "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, - "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, - "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + "north": {"uv": [1, 1, 2, 5], "texture": "#support", "tintindex": 0}, + "east": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "south": {"uv": [6, 1, 7, 5], "texture": "#support", "tintindex": 0}, + "west": {"uv": [1, 1, 12, 5], "texture": "#support", "tintindex": 0}, + "up": {"uv": [12, 1, 1, 2], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [12, 3, 1, 4], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -172,12 +146,12 @@ "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 8], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 8], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 8], "texture": "#base"}, - "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 8], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 14, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -185,12 +159,12 @@ "to": [14, 8, 1], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 8, 12, 13], "texture": "#base"}, - "east": {"uv": [12, 8, 13, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 5], "texture": "#base"}, - "west": {"uv": [0, 8, 1, 13], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 8, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [12, 8, 13, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 5], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 8, 1, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -198,12 +172,12 @@ "to": [14, 8, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 8, 12, 13], "texture": "#base"}, - "east": {"uv": [1, 8, 2, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 5], "texture": "#base"}, - "west": {"uv": [12, 8, 13, 13], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 8, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 8, 2, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 5], "texture": "#base", "tintindex": 0}, + "west": {"uv": [12, 8, 13, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -211,12 +185,12 @@ "to": [14, 4, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [2, 12, 13, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [1, 12, 12, 13], "texture": "#base"}, - "up": {"uv": [0, 0, 11, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 11, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [2, 12, 13, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 12, 12, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -224,12 +198,12 @@ "to": [14, 8, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#base"}, - "south": {"uv": [0, 8, 12, 13], "texture": "#base"}, - "west": {"uv": [13, 8, 14, 13], "texture": "#base"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 8, 12, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [13, 8, 14, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -237,12 +211,12 @@ "to": [14, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "east": {"uv": [2, 8, 13, 12], "texture": "#base"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#base"}, - "west": {"uv": [3, 8, 14, 12], "texture": "#base"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 11, 5], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "east": {"uv": [2, 8, 13, 12], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 0, 0], "texture": "#base", "tintindex": 0}, + "west": {"uv": [3, 8, 14, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 5], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -250,12 +224,12 @@ "to": [-5, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 5, 3, 9], "texture": "#support"}, - "east": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "south": {"uv": [7, 5, 8, 9], "texture": "#support"}, - "west": {"uv": [2, 5, 13, 9], "texture": "#support"}, - "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support"}, - "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support"} + "north": {"uv": [2, 5, 3, 9], "texture": "#support", "tintindex": 0}, + "east": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "south": {"uv": [7, 5, 8, 9], "texture": "#support", "tintindex": 0}, + "west": {"uv": [2, 5, 13, 9], "texture": "#support", "tintindex": 0}, + "up": {"uv": [13, 5, 2, 6], "rotation": 270, "texture": "#support", "tintindex": 0}, + "down": {"uv": [13, 7, 2, 8], "rotation": 90, "texture": "#support", "tintindex": 0} } }, { @@ -263,12 +237,12 @@ "to": [9, 5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -276,12 +250,12 @@ "to": [9, 8, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -289,12 +263,38 @@ "to": [9, 8, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [0, 10.5, 5], + "to": [1, 11.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [5, 3, 6, 4], "texture": "#2"}, + "east": {"uv": [4, 3, 6, 4], "texture": "#2"}, + "south": {"uv": [3, 3, 4, 4], "texture": "#2"}, + "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "up": {"uv": [4, 3, 6, 4], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [-7, 5.5, 5], + "to": [-6, 6.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 3, 4, 4], "texture": "#2"}, + "east": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "south": {"uv": [4, 3, 5, 4], "texture": "#2"}, + "west": {"uv": [3, 3, 5, 4], "texture": "#2"}, + "up": {"uv": [3, 3, 5, 4], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 5, 4], "rotation": 90, "texture": "#2"} } } ], @@ -358,27 +358,28 @@ "name": "drawer", "origin": [0, 0, 0], "color": 0, - "children": [9, 10] + "children": [9] }, { "name": "group", "origin": [14, 0, 13], "color": 0, "children": [ - 11, { "name": "legs", "origin": [0, 0, 0], "color": 0, - "children": [12, 13, 14, 15, 16, 17] + "children": [10, 11, 12, 13, 14, 15] }, + 16, + 17, 18, - 19, - 20, - 21 + 19 ] } ] - } + }, + 20, + 21 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool.json b/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool.json index 0638faf02..f8915a318 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool.json @@ -11,11 +11,11 @@ "to": [12.5, 10, 5.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -23,11 +23,11 @@ "to": [12.5, 10, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -35,11 +35,11 @@ "to": [5.5, 10, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -47,10 +47,10 @@ "to": [12.5, 11, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 7, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 9, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 7, 2], "texture": "#base"}, - "down": {"uv": [1, 1, 10, 8], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 1, 7, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 9, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 7, 2], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 1, 10, 8], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -58,10 +58,10 @@ "to": [12.5, 12, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 9, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 10, 8], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 9, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 10, 8], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -69,9 +69,9 @@ "to": [5.5, 12, 10.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "west": {"uv": [0, 0, 5, 2], "texture": "#base"}, - "up": {"uv": [6, 1, 11, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [4, 2, 9, 4], "rotation": 270, "texture": "#base"} + "west": {"uv": [0, 0, 5, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 1, 11, 3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [4, 2, 9, 4], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -79,10 +79,10 @@ "to": [5, 19.5, 10.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [1, 1, 6, 6], "texture": "#base"}, - "west": {"uv": [1, 1, 6, 6], "texture": "#base"}, - "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [4, 2, 9, 3], "rotation": 270, "texture": "#base"} + "east": {"uv": [1, 1, 6, 6], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 1, 6, 6], "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 2, 9, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -90,11 +90,11 @@ "to": [5.5, 10, 5.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -102,11 +102,11 @@ "to": [5.5, 20, 5.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -114,11 +114,11 @@ "to": [5.5, 20, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool_tucked.json b/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool_tucked.json index ae04296dd..b26eafdb7 100644 --- a/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/classic_stool/classic_stool_tucked.json @@ -11,11 +11,11 @@ "to": [20.5, 10, 5.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -23,11 +23,11 @@ "to": [20.5, 10, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -35,11 +35,11 @@ "to": [13.5, 10, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -47,10 +47,10 @@ "to": [20.5, 11, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 7, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 9, 2], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 7, 2], "texture": "#base"}, - "down": {"uv": [1, 1, 10, 8], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 1, 7, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 9, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 7, 2], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 1, 10, 8], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -58,10 +58,10 @@ "to": [20.5, 12, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 9, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "up": {"uv": [1, 1, 10, 8], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 9, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 10, 8], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -69,9 +69,9 @@ "to": [13.5, 12, 10.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "west": {"uv": [0, 0, 5, 2], "texture": "#base"}, - "up": {"uv": [6, 1, 11, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [4, 2, 9, 4], "rotation": 270, "texture": "#base"} + "west": {"uv": [0, 0, 5, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 1, 11, 3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [4, 2, 9, 4], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -79,10 +79,10 @@ "to": [13, 19.5, 10.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [1, 1, 6, 6], "texture": "#base"}, - "west": {"uv": [1, 1, 6, 6], "texture": "#base"}, - "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [4, 2, 9, 3], "rotation": 270, "texture": "#base"} + "east": {"uv": [1, 1, 6, 6], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 1, 6, 6], "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 2, 9, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -90,11 +90,11 @@ "to": [13.5, 10, 5.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -102,11 +102,11 @@ "to": [13.5, 20, 5.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { @@ -114,11 +114,11 @@ "to": [13.5, 20, 12.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } } ], 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 index 1268feffe..fdbf8d06d 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 557b9d72d..18f71832e 100644 --- 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 @@ -12,12 +12,12 @@ "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { @@ -25,12 +25,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -51,12 +51,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -77,12 +77,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -90,12 +90,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } } ], 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 index 56cc7eb0f..5d73a8cd1 100644 --- 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 @@ -11,12 +11,12 @@ "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } } ], 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 index 2156995cb..490332d1f 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 9], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 11], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index 7c894dc09..b8c16b4dd 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [1, 0, 3, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 9], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 11], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index a8a721d70..3def62ac4 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 160563b2c..676e32713 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index e4d1c5503..6a1943ed8 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 4, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 0, 4, 16], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index 49307ef3a..4769f2136 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index d61d1d7bf..10db8565f 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index f993e0d38..62be94046 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 4, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 0, 4, 16], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index 70bb888e7..1b15137cc 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index a36e5280a..7e6d29bd5 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index 1268feffe..fdbf8d06d 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 836f70da9..125a542ec 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 24c96956d..a06f07b21 100644 --- 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 @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 0a9abcd4b..dc6df94a9 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index fb4375a05..fe4b1de35 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 41437b3af..809684859 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index f760de17e..2ebf9c07e 100644 --- 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 @@ -11,12 +11,12 @@ "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { @@ -24,12 +24,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -63,12 +63,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index b509699a2..efd4cb140 100644 --- 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 @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } } ], 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 index f848a1d2a..4ee120dfc 100644 --- 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 @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 5fd517534..d79c6aa51 100644 --- 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 @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 9c464d341..62892da77 100644 --- 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 @@ -9,12 +9,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 9aadc8256..2e167a31a 100644 --- 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 @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 0b0ba33d5..8a70789d5 100644 --- 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 @@ -12,12 +12,12 @@ "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -25,12 +25,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -51,12 +51,12 @@ "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"} + "north": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "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"} + "north": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -77,12 +77,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -90,12 +90,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -103,12 +103,12 @@ "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"} + "north": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -116,12 +116,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -129,12 +129,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index dfa81bf67..81f0db75d 100644 --- 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 @@ -11,12 +11,12 @@ "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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } } ], 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 index fce1d97ff..3fbc17c0e 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "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"} + "north": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "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"} + "north": {"uv": [0, 0, 2, 13], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -62,12 +62,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } } ], 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 index 4a2e2e89f..e89659ec6 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "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"} + "north": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "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"} + "north": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -62,12 +62,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -75,12 +75,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -88,12 +88,12 @@ "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"} + "north": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -101,12 +101,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -114,12 +114,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], 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 index 4816ab95f..3542aa6d1 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], 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 index ee83b75a6..1f9ca4248 100644 --- 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 @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "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"} + "north": {"uv": [0, 0, 2, 13], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -62,12 +62,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"} + "north": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table.json b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table.json index b8b1fa761..e800a2a5d 100644 --- a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table.json +++ b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table.json @@ -12,12 +12,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { @@ -25,12 +25,12 @@ "to": [16.00357, 19.48669, 4], "rotation": {"angle": 45, "axis": "z", "origin": [14.04688, 0, 3]}, "faces": { - "north": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "west": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [7, 5, 9, 7], "texture": "#legs"} + "north": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [7, 5, 9, 7], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "to": [2.34375, 18.125, 4.0625], "rotation": {"angle": -45, "axis": "z", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "west": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [1, 3, 3, 5], "texture": "#legs"} + "north": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 3, 3, 5], "texture": "#legs", "tintindex": 0} } }, { @@ -51,12 +51,12 @@ "to": [16.00357, 19.48669, 14], "rotation": {"angle": 45, "axis": "z", "origin": [14.04688, 0, 13]}, "faces": { - "north": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "west": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 2, 2, 4], "texture": "#legs"} + "north": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 2, 2, 4], "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "to": [2.34375, 18.125, 14.0625], "rotation": {"angle": -45, "axis": "z", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "west": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [1, 4, 3, 6], "texture": "#legs"} + "north": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 4, 3, 6], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_left.json b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_left.json index 1c0b2fda3..494b9405d 100644 --- a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_left.json +++ b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [16.00357, 19.48669, 4], "rotation": {"angle": 45, "axis": "z", "origin": [14.04688, 0, 3]}, "faces": { - "north": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "west": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [2.34375, 18.125, 4.0625], "rotation": {"angle": -45, "axis": "z", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "west": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_legs.json b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_legs.json index a5cb6e96a..4363c0bae 100644 --- a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_legs.json +++ b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_legs.json @@ -10,12 +10,12 @@ "to": [16.00357, 19.48669, 4], "rotation": {"angle": 45, "axis": "z", "origin": [14.04688, 0, 3]}, "faces": { - "north": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "west": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [7, 5, 9, 7], "texture": "#legs"} + "north": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [7, 5, 9, 7], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [2.34375, 18.125, 4.0625], "rotation": {"angle": -45, "axis": "z", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "west": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [1, 3, 3, 5], "texture": "#legs"} + "north": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 3, 3, 5], "texture": "#legs", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "to": [16.00357, 19.48669, 14], "rotation": {"angle": 45, "axis": "z", "origin": [14.04688, 0, 13]}, "faces": { - "north": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "west": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 2, 2, 4], "texture": "#legs"} + "north": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 2, 2, 4], "texture": "#legs", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "to": [2.34375, 18.125, 14.0625], "rotation": {"angle": -45, "axis": "z", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "west": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [1, 4, 3, 6], "texture": "#legs"} + "north": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 4, 3, 6], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_middle.json b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_middle.json index 144d3ed42..925195973 100644 --- a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_middle.json @@ -11,12 +11,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]}, "faces": { - "north": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, - "east": {"uv": [1, 1, 15, 3], "texture": "#base"}, - "south": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base"}, - "west": {"uv": [0, 0, 14, 2], "texture": "#base"}, - "up": {"uv": [1, 1, 15, 14], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 1, 14, 14], "rotation": 90, "texture": "#base"} + "north": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_right.json b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_right.json index 5379bf108..cd97706a8 100644 --- a/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_right.json +++ b/common/src/main/resources/assets/pfm/models/block/dinner_table/dinner_table_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [2.34375, 18.125, 14.0625], "rotation": {"angle": -45, "axis": "z", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "west": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [1, 4, 3, 6], "texture": "#legs"} + "north": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 4, 3, 6], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [16.00357, 19.48669, 14], "rotation": {"angle": 45, "axis": "z", "origin": [14.04688, 0, 13]}, "faces": { - "north": {"uv": [6, 0, 8, 16], "texture": "#legs"}, - "east": {"uv": [9, 0, 11, 16], "texture": "#legs"}, - "south": {"uv": [1, 0, 3, 16], "texture": "#legs"}, - "west": {"uv": [3, 0, 5, 16], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 2, 2, 4], "texture": "#legs"} + "north": {"uv": [6, 0, 8, 16], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [9, 0, 11, 16], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 0, 3, 16], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [3, 0, 5, 16], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 2, 2, 4], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet.json index cc0b08326..915b2ce45 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet.json @@ -2,33 +2,33 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 1, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 16, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -46,10 +46,10 @@ "from": [8, 1, 8], "to": [16, 16, 9], "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "texture": "#legs"} + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "texture": "#legs", "tintindex": 0} } }, { @@ -67,10 +67,10 @@ "from": [0, 1, 8], "to": [8, 16, 9], "faces": { - "south": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 8, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 1], "texture": "#legs"} + "south": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left.json index 9b4b568d7..5840492df 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left.json @@ -2,32 +2,44 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [8, 1, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 8, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 12, 8, 4], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 1, 8, 9], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 12, 8, 4], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 1, 8, 9], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [8, 1, 8], "to": [16, 16, 9], "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east"}, - "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "texture": "#legs"} + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "texture": "#legs", "tintindex": 0} + } + }, + { + "from": [8, 0, 0], + "to": [16, 1, 8], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -40,18 +52,6 @@ "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, "down": {"uv": [0, 0, 1, 1], "texture": "#2"} } - }, - { - "from": [8, 0, 0], - "to": [16, 1, 8], - "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} - } } ], "display": { @@ -105,10 +105,11 @@ "name": "Base", "origin": [0, 0, 0], "color": 0, - "children": [0, 1, 2] + "children": [0, 1] } ] }, + 2, 3 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left_open.json index 08dc9c4af..bdd3c7277 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_left_open.json @@ -2,69 +2,57 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [15, 1, 0], "to": [16, 15, 8], "faces": { - "north": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 8, 16], "texture": "#base"} + "north": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0} } }, { "from": [9, 1, 0], "to": [15, 15, 1], "faces": { - "north": {"uv": [2, 2, 8, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [2, 2, 8, 16], "texture": "#base"} + "north": {"uv": [2, 2, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [2, 2, 8, 16], "texture": "#base", "tintindex": 0} } }, { "from": [8, 1, 0], "to": [9, 15, 8], "faces": { - "north": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 2, 8, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 8, 16], "texture": "#base"} + "north": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0} } }, { "from": [9, 7, 1], "to": [15, 8, 7], "faces": { - "south": {"uv": [1, 0, 7, 1], "texture": "#base"}, - "up": {"uv": [1, 0, 7, 6], "texture": "#base"}, - "down": {"uv": [1, 0, 7, 6], "texture": "#base"} + "south": {"uv": [1, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 0, 7, 6], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 0, 7, 6], "texture": "#base", "tintindex": 0} } }, { "from": [8, 15, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 8, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 2], "texture": "#base"}, - "up": {"uv": [0, 11, 8, 3], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base"} - } - }, - { - "from": [7, 3, 14], - "to": [8, 7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8.25, 6.75, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 11, 8, 3], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "tintindex": 0} } }, { @@ -72,23 +60,35 @@ "to": [9, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8.25, 6.75, 9]}, "faces": { - "east": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs"} + "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { "from": [8, 0, 0], "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [7, 3, 14], + "to": [8, 7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8.25, 6.75, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"} } } ], @@ -153,12 +153,13 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [5, 6] + "children": [5] } ] } ] }, + 6, 7 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right.json index f93d704b0..e354956a0 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right.json @@ -2,44 +2,44 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 1, 0], "to": [8, 16, 8], "faces": { - "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 8, 15], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 11, 8, 3], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 15], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 11, 8, 3], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [8, 1, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 8], "to": [8, 16, 9], "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east"}, - "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "texture": "#legs"} + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right_open.json index 6d78e7868..030073a57 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_edge_right_open.json @@ -2,57 +2,57 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [7, 1, 0], "to": [8, 15, 8], "faces": { - "north": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 2, 8, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 8, 16], "texture": "#base"} + "north": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 15, 0], "to": [8, 16, 8], "faces": { - "north": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 8, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 8, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 11, 8, 3], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base"} + "north": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 11, 8, 3], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [7, 15, 1], "faces": { - "north": {"uv": [2, 2, 8, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [2, 1, 8, 15], "texture": "#base"} + "north": {"uv": [2, 2, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [2, 1, 8, 15], "texture": "#base", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [1, 15, 8], "faces": { - "north": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 2, 8, 16], "texture": "#base"}, - "south": {"uv": [8, 2, 9, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "west"} + "north": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [8, 2, 9, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "west", "tintindex": 0} } }, { "from": [1, 7, 1], "to": [7, 8, 7], "faces": { - "south": {"uv": [1, 0, 7, 1], "texture": "#base"}, - "up": {"uv": [1, 0, 7, 6], "texture": "#base"}, - "down": {"uv": [1, 0, 7, 6], "texture": "#base"} + "south": {"uv": [1, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 0, 7, 6], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 0, 7, 6], "texture": "#base", "tintindex": 0} } }, { @@ -60,11 +60,23 @@ "to": [8, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2.75, 6.75, 9]}, "faces": { - "east": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs"} + "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} + } + }, + { + "from": [0, 0, 0], + "to": [8, 1, 8], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -78,18 +90,6 @@ "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} } - }, - { - "from": [0, 0, 0], - "to": [8, 1, 8], - "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} - } } ], "display": { @@ -153,12 +153,13 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [5, 6] + "children": [5] } ] } ] }, + 6, 7 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_left.json index 384c598ae..e8c8aa77d 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_left.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,23 +12,23 @@ "to": [8, 15, 8], "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, "faces": { - "north": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [8, 2, 16, 16], "texture": "#base"}, - "west": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "west"}, - "up": {"uv": [8, 11, 0, 3], "rotation": 180, "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 16, 0, 8], "rotation": 180, "texture": "#base", "cullface": "down"} + "north": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [8, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [8, 11, 0, 3], "rotation": 180, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 16, 0, 8], "rotation": 180, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 15, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north"}, - "east": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base"} + "north": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "tintindex": 0} } }, { @@ -36,24 +36,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, "faces": { - "north": {"uv": [0, 1, 8, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#base"}, - "up": {"uv": [8, 7, 16, 15], "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 8], "texture": "#base", "cullface": "down"} - } - }, - { - "from": [1, 3, 9], - "to": [2, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [7.25, 6.75, 9]}, - "faces": { - "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + "north": {"uv": [0, 1, 8, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "south", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 7, 16, 15], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -61,10 +49,10 @@ "to": [8, 16, 9], "rotation": {"angle": 0, "axis": "y", "origin": [7.25, 6.75, 9]}, "faces": { - "south": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "texture": "#legs"} + "south": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "texture": "#legs", "tintindex": 0} } }, { @@ -72,10 +60,10 @@ "to": [8, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [4, 8.5, 8.5]}, "faces": { - "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [8, 0, 15, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs"} + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [8, 0, 15, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -83,36 +71,48 @@ "to": [16, 15, 16], "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, "faces": { - "north": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 2, 16, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "south"}, - "west": {"uv": [0, 2, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 8, 16, 0], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 16], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 2, 16, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 8, 16, 0], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 16], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 16, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [8, 0, 8], "to": [16, 1, 16], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [1, 3, 9], + "to": [2, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [7.25, 6.75, 9]}, + "faces": { + "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#2"} } }, { @@ -181,8 +181,9 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [3, 4] + "children": [3] }, + 4, 5, 6, 7, diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_open_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_open_left.json index 96e8ff7cb..e34161153 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_open_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_open_left.json @@ -2,33 +2,21 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ - { - "from": [7.25, 3, 13.75], - "to": [8.25, 7, 14.75], - "rotation": {"angle": -45, "axis": "y", "origin": [7.25, 6.75, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} - } - }, { "from": [6.25, 1, 7.75], "to": [7.25, 15.999, 15.75], "rotation": {"angle": -45, "axis": "y", "origin": [7.25, 6.75, 9]}, "faces": { - "east": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs"} + "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -36,10 +24,10 @@ "to": [8, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [4, 8.5, 8.5]}, "faces": { - "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [8, 0, 15, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs"} + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [8, 0, 15, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 15, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -47,95 +35,107 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, "faces": { - "north": {"uv": [0, 1, 8, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#base"}, - "up": {"uv": [8, 7, 16, 15], "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 8, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "south", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 7, 16, 15], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [8, 0, 8], "to": [16, 1, 16], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} - } - }, - { - "from": [6, 3, 13], - "to": [7, 7, 14], - "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 15, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north"}, - "east": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base"} + "north": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [15, 15, 1], "faces": { - "north": {"uv": [1, 2, 15, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [1, 2, 15, 16], "texture": "#base"} + "north": {"uv": [1, 2, 15, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [1, 2, 15, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [1, 15, 8], "faces": { - "north": {"uv": [15, 2, 16, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [5, 2, 13, 16], "texture": "#base"}, - "south": {"uv": [15, 2, 16, 16], "texture": "#base"}, - "west": {"uv": [5, 2, 13, 16], "texture": "#base", "cullface": "west"} + "north": {"uv": [15, 2, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [5, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [15, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 2, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0} } }, { "from": [15, 1, 0], "to": [16, 15, 8], "faces": { - "north": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "east"}, - "west": {"uv": [8, 2, 16, 16], "texture": "#base"} + "north": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "west": {"uv": [8, 2, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [1, 7, 1], "to": [15, 8, 7], "faces": { - "south": {"uv": [1, 0, 7, 1], "texture": "#base"}, - "up": {"uv": [1, 0, 15, 6], "texture": "#base"}, - "down": {"uv": [1, 0, 15, 6], "texture": "#base"} + "south": {"uv": [1, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 0, 15, 6], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 0, 15, 6], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 16, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [7.25, 3, 13.75], + "to": [8.25, 7, 14.75], + "rotation": {"angle": -45, "axis": "y", "origin": [7.25, 6.75, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [6, 3, 13], + "to": [7, 7, 14], + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#2"} } } ], @@ -190,20 +190,21 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [0, 1] + "children": [0] }, + 1, 2, - 3, - 4, - 5 + 3 ] }, { "name": "group", "origin": [8, 8, 8], "color": 0, - "children": [6, 7, 8, 9, 10] + "children": [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/kitchen_cabinet/kitchen_cabinet_inner_corner_open_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_open_right.json index da8539c4a..55e28a5a8 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_open_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_open_right.json @@ -2,33 +2,21 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ - { - "from": [8.98125, 3, 13.4875], - "to": [9.98125, 7, 14.4875], - "rotation": {"angle": 45, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} - } - }, { "from": [7.98125, 1, 7.4875], "to": [8.98125, 15.999, 15.4875], "rotation": {"angle": 45, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "east": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs"} + "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -36,10 +24,10 @@ "to": [15.98125, 16, 8.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "south": {"uv": [8, 0, 15, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 15, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 15, 1], "rotation": 180, "texture": "#legs"} + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "south": {"uv": [8, 0, 15, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 15, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 15, 1], "rotation": 180, "texture": "#legs", "tintindex": 0} } }, { @@ -47,12 +35,12 @@ "to": [15.98125, 16, 7.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "south"}, - "south": {"uv": [8, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 16], "texture": "#base"}, - "up": {"uv": [8, 7, 16, 15], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "south", "tintindex": 0}, + "south": {"uv": [8, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 7, 16, 15], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -60,24 +48,12 @@ "to": [15.98125, 1, 7.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 3, 8, 11], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base", "cullface": "down"} - } - }, - { - "from": [12.98125, 3, 8.9875], - "to": [13.98125, 7, 9.9875], - "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, - "faces": { - "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -85,12 +61,12 @@ "to": [7.98125, 16, 15.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "north": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west"}, - "west": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base"} + "north": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -98,8 +74,8 @@ "to": [0.98125, 15, 14.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "east": {"uv": [1, 2, 15, 16], "texture": "#base"}, - "west": {"uv": [1, 2, 15, 16], "texture": "#base", "cullface": "north"} + "east": {"uv": [1, 2, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 2, 15, 16], "texture": "#base", "cullface": "north", "tintindex": 0} } }, { @@ -107,10 +83,10 @@ "to": [7.98125, 15, 15.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "north": {"uv": [5, 2, 13, 16], "texture": "#base"}, - "east": {"uv": [15, 2, 16, 16], "texture": "#base"}, - "south": {"uv": [5, 2, 13, 16], "texture": "#base", "cullface": "west"}, - "west": {"uv": [15, 2, 16, 16], "texture": "#base", "cullface": "north"} + "north": {"uv": [5, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [15, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [5, 2, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [15, 2, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0} } }, { @@ -118,9 +94,9 @@ "to": [7.98125, 15, 0.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "north": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [8, 2, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north"} + "north": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [8, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 1, 16], "texture": "#base", "cullface": "north", "tintindex": 0} } }, { @@ -128,9 +104,9 @@ "to": [6.98125, 8, 14.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "east": {"uv": [1, 0, 7, 1], "texture": "#base"}, - "up": {"uv": [1, 0, 15, 6], "rotation": 270, "texture": "#base"}, - "down": {"uv": [1, 0, 15, 6], "rotation": 90, "texture": "#base"} + "east": {"uv": [1, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 0, 15, 6], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 0, 15, 6], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -138,12 +114,36 @@ "to": [7.98125, 1, 15.9875], "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 2, 16, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 2, 16, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [8.98125, 3, 13.4875], + "to": [9.98125, 7, 14.4875], + "rotation": {"angle": 45, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [12.98125, 3, 8.9875], + "to": [13.98125, 7, 9.9875], + "rotation": {"angle": 0, "axis": "y", "origin": [8.98125, 6.75, 8.7375]}, + "faces": { + "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} } } ], @@ -198,20 +198,21 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [0, 1] + "children": [0] }, + 1, 2, 3, - 4, - 5, { "name": "group", "origin": [8, 8, 8], "color": 0, - "children": [6, 7, 8, 9, 10] + "children": [4, 5, 6, 7, 8] }, - 11 + 9 ] - } + }, + 10, + 11 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_right.json index e9889bdc1..f34b0e622 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_inner_corner_right.json @@ -2,111 +2,111 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 1, 8], "to": [8, 15, 16], "faces": { - "east": {"uv": [8, 2, 16, 16], "texture": "#base"}, - "south": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "west"}, - "west": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "north"}, - "up": {"uv": [8, 11, 0, 3], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 16, 0, 8], "rotation": 270, "texture": "#base", "cullface": "down"} + "east": {"uv": [8, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [8, 2, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [8, 11, 0, 3], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 16, 0, 8], "rotation": 270, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 15, 0], "to": [8, 16, 16], "faces": { - "north": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west"}, - "west": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base"} + "north": {"uv": [8, 1, 16, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [0, 1, 16, 2], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [8, 15, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "south"}, - "south": {"uv": [8, 0, 16, 15], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 2], "texture": "#base"}, - "up": {"uv": [8, 7, 16, 15], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down"} - } - }, - { - "from": [9, 3, 14], - "to": [10, 7, 15], - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 2], "texture": "#base", "cullface": "south", "tintindex": 0}, + "south": {"uv": [8, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 7, 16, 15], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [8, 1, 8], "to": [9, 16, 16], "faces": { - "east": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs"} + "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { "from": [9, 1, 8], "to": [16, 16, 9], "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "south": {"uv": [8, 0, 15, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 15, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 15, 1], "rotation": 180, "texture": "#legs"} + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "south": {"uv": [8, 0, 15, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 15, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 15, 1], "rotation": 180, "texture": "#legs", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [16, 15, 8], "faces": { - "north": {"uv": [0, 2, 16, 16], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "south"}, - "south": {"uv": [0, 2, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 8, 16, 0], "texture": "#base", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 16], "rotation": 90, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 2, 16, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "south", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [0, 8, 16, 0], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 16], "rotation": 90, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [8, 1, 16], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 2, 16, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 2, 16, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 8], "rotation": 90, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [8, 0, 0], "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "east": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "up": {"uv": [0, 3, 8, 11], "rotation": 270, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "rotation": 270, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#base", "cullface": "down", "tintindex": 0} + } + }, + { + "from": [9, 3, 14], + "to": [10, 7, 15], + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} } }, { @@ -175,14 +175,15 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [3, 4] + "children": [3] }, + 4, 5, 6, - 7, - 8, - 9 + 7 ] - } + }, + 8, + 9 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_open.json index 874c2778a..9fea0eee2 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_open.json @@ -2,96 +2,96 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 1, 0], "to": [1, 16, 8], "faces": { - "north": {"uv": [15, 1, 16, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 15], "texture": "#base"}, - "south": {"uv": [15, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 1, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 1, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [15, 1, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 15], "texture": "#base", "tintindex": 0}, + "south": {"uv": [15, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 1, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [15, 15, 1], "faces": { - "north": {"uv": [1, 2, 15, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [1, 2, 15, 16], "texture": "#base"} + "north": {"uv": [1, 2, 15, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [1, 2, 15, 16], "texture": "#base", "tintindex": 0} } }, { "from": [15, 1, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 1, 1, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 15], "texture": "#base"}, - "up": {"uv": [15, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [15, 0, 16, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 1, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [15, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [15, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 16, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [1, 15, 0], "to": [15, 16, 8], "faces": { - "north": {"uv": [1, 1, 15, 2], "texture": "#base", "cullface": "north"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, - "up": {"uv": [1, 3, 15, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [1, 0, 15, 8], "texture": "#base"} + "north": {"uv": [1, 1, 15, 2], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [1, 0, 15, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 3, 15, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [1, 0, 15, 8], "texture": "#base", "tintindex": 0} } }, { "from": [1, 7, 0], "to": [15, 8, 7], "faces": { - "south": {"uv": [1, 0, 15, 1], "texture": "#base"}, - "up": {"uv": [1, 0, 15, 7], "texture": "#base"}, - "down": {"uv": [1, 0, 15, 7], "texture": "#base"} + "south": {"uv": [1, 0, 15, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 0, 15, 7], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 0, 15, 7], "texture": "#base", "tintindex": 0} } }, { - "from": [16, 3, 14], - "to": [17, 7, 15], + "from": [15, 1, 8], + "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [16, 8, 8.5]}, "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#2", "cullface": "east"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#2", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2", "cullface": "east"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2", "cullface": "east"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2", "cullface": "east"} + "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { - "from": [15, 1, 8], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8, 8.5]}, + "from": [0, 1, 8], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 8.5]}, "faces": { - "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs"} + "east": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -107,15 +107,15 @@ } }, { - "from": [0, 1, 8], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 8.5]}, + "from": [16, 3, 14], + "to": [17, 7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 8, 8.5]}, "faces": { - "east": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 8, 15], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 4], "texture": "#2", "cullface": "east"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#2", "cullface": "east"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2", "cullface": "east"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2", "cullface": "east"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2", "cullface": "east"} } } ], @@ -181,17 +181,19 @@ "name": "rightDoor", "origin": [0, 0, 0], "color": 0, - "children": [6, 7] + "children": [6] }, { "name": "leftDoor", "origin": [0, 0, 0], "color": 0, - "children": [8, 9] + "children": [7] } ] } ] - } + }, + 8, + 9 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_left.json index 907cc779e..a3560efc5 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_left.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,46 +12,35 @@ "to": [8, 16, 8], "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, "faces": { - "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 8, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 12, 8, 4], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 1, 8, 9], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 12, 8, 4], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 1, 8, 9], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [8, 1, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} - } - }, - { - "from": [6, 3, 9], - "to": [7, 7, 10], - "faces": { - "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 8], "to": [8, 16, 9], "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "south": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "texture": "#legs"} + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "texture": "#legs", "tintindex": 0} } }, { @@ -59,11 +48,22 @@ "to": [9, 16, 8], "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} + } + }, + { + "from": [6, 3, 9], + "to": [7, 7, 10], + "faces": { + "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#2"} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_left.json index 2ffc9ff49..acd95a999 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_left.json @@ -2,57 +2,57 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [1, 1, 0], "to": [8, 15, 1], "faces": { - "north": {"uv": [2, 2, 9, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 1, 1, 15], "texture": "#base"}, - "south": {"uv": [2, 2, 9, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 15], "texture": "#base"}, - "up": {"uv": [0, 5, 7, 4], "texture": "#base"}, - "down": {"uv": [0, 1, 7, 2], "texture": "#base"} + "north": {"uv": [2, 2, 9, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 1, 1, 15], "texture": "#base", "tintindex": 0}, + "south": {"uv": [2, 2, 9, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 1, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 5, 7, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 7, 2], "texture": "#base", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [1, 15, 8], "faces": { - "north": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 2, 8, 16], "texture": "#base"}, - "south": {"uv": [8, 2, 9, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 8, 16], "texture": "#base"}, - "up": {"uv": [0, 12, 1, 4], "texture": "#base"}, - "down": {"uv": [0, 1, 1, 9], "texture": "#base"} + "north": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [8, 2, 9, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 12, 1, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 1, 9], "texture": "#base", "tintindex": 0} } }, { "from": [1, 7, 1], "to": [8, 8, 7], "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "south": {"uv": [1, 0, 8, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "up": {"uv": [1, 0, 8, 6], "texture": "#base"}, - "down": {"uv": [1, 0, 8, 6], "texture": "#base"} + "north": {"uv": [1, 0, 15, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 0, 8, 6], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 0, 8, 6], "texture": "#base", "tintindex": 0} } }, { "from": [0, 15, 0], "to": [8, 16, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "up": {"uv": [0, 12, 8, 4], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 12, 8, 4], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "tintindex": 0} } }, { @@ -60,12 +60,37 @@ "to": [1, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0.25, 6.75, 9]}, "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west"}, - "east": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "east": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "tintindex": 0} + } + }, + { + "from": [8, 1, 0], + "to": [9, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} + } + }, + { + "from": [0, 0, 0], + "to": [8, 1, 8], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -80,19 +105,6 @@ "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"} } }, - { - "from": [8, 1, 0], - "to": [9, 16, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [24, 7, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#legs"} - } - }, { "from": [9, 3, 6], "to": [10, 7, 7], @@ -104,18 +116,6 @@ "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"}, "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"} } - }, - { - "from": [0, 0, 0], - "to": [8, 1, 8], - "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "up": {"uv": [0, 3, 8, 11], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#base", "cullface": "down"} - } } ], "display": { @@ -180,14 +180,15 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [4, 5] + "children": [4] }, - 6, - 7 + 5 ] } ] }, + 6, + 7, 8 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_right.json index 38d236bdd..b940d3bba 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_open_right.json @@ -2,92 +2,93 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [15, 1, 1], "to": [16, 15, 8], "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#base"}, - "east": {"uv": [2, 2, 9, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#base"}, - "west": {"uv": [2, 2, 9, 16], "texture": "#base"}, - "up": {"uv": [0, 5, 7, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 7, 2], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 1, 1, 15], "texture": "#base", "tintindex": 0}, + "east": {"uv": [2, 2, 9, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 15], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 2, 9, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 5, 7, 4], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 7, 2], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { "from": [8, 1, 0], "to": [16, 15, 1], "faces": { - "north": {"uv": [0, 2, 8, 16], "texture": "#base"}, - "east": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 2, 8, 16], "texture": "#base"}, - "west": {"uv": [8, 2, 9, 16], "texture": "#base"}, - "up": {"uv": [0, 12, 1, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 1, 1, 9], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [8, 2, 9, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 2, 8, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [8, 2, 9, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 12, 1, 4], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 1, 9], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { "from": [9, 7, 1], "to": [15, 8, 8], "faces": { - "north": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "east": {"uv": [1, 0, 15, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 7, 1], "texture": "#base"}, - "west": {"uv": [1, 0, 8, 1], "texture": "#base"}, - "up": {"uv": [1, 0, 8, 6], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 0, 8, 6], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 0, 15, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 7, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 0, 8, 6], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 0, 8, 6], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { "from": [8, 15, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#base"}, - "up": {"uv": [0, 12, 8, 4], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 0, 8, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 12, 8, 4], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [8, 16, 1], "faces": { - "north": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west"}, - "south": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 180, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "south": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 180, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 180, "texture": "#legs", "tintindex": 0} } }, { - "from": [1, 3, -1], - "to": [2, 7, 0], + "from": [8, 1, 8], + "to": [16, 16, 9], "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#2"} + "north": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "texture": "#legs", "tintindex": 0} } }, { - "from": [8, 1, 8], - "to": [16, 16, 9], + "from": [8, 0, 0], + "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 8, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 1], "texture": "#legs"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -102,15 +103,14 @@ } }, { - "from": [8, 0, 0], - "to": [16, 1, 8], + "from": [1, 3, -1], + "to": [2, 7, 0], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "west": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "up": {"uv": [0, 3, 8, 11], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 180, "texture": "#2"} } } ], @@ -176,14 +176,15 @@ "name": "door", "origin": [0, 0, 0], "color": 0, - "children": [4, 5] + "children": [4] }, - 6, - 7 + 5 ] }, - 8 + 6 ] - } + }, + 7, + 8 ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_right.json index f92943130..5b7395e47 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_cabinet/kitchen_cabinet_outer_corner_right.json @@ -2,66 +2,55 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [8, 1, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west"}, - "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 1, 8, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 8, 16], "texture": "#base"}, - "up": {"uv": [0, 12, 8, 4], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 1, 8, 9], "rotation": 270, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 1, 8, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 1, 8, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 8, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 12, 8, 4], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 1, 8, 9], "rotation": 270, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [8, 0, 0], "to": [16, 1, 8], "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east"}, - "west": {"uv": [0, 2, 8, 3], "texture": "#base"}, - "up": {"uv": [0, 3, 8, 11], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#base", "cullface": "down"} - } - }, - { - "from": [6, 3, 6], - "to": [7, 7, 7], - "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"} + "north": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 2, 8, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 8, 11], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [7, 1, 0], "to": [8, 16, 8], "faces": { - "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west"}, - "south": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "west": {"uv": [8, 0, 16, 15], "texture": "#legs"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [8, 0, 16, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [8, 0, 16, 1], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { "from": [8, 1, 8], "to": [16, 16, 9], "faces": { - "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 8, 1], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 1], "texture": "#legs"} + "east": {"uv": [0, 0, 1, 15], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 8, 1], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 8, 1], "texture": "#legs", "tintindex": 0} } }, { @@ -74,6 +63,17 @@ "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, "down": {"uv": [0, 0, 1, 1], "texture": "#2"} } + }, + { + "from": [6, 3, 6], + "to": [7, 7, 7], + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#2"} + } } ], "display": { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter.json index fb7e6a0cc..38f933786 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter.json @@ -1,31 +1,31 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 16, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [0, 3, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { @@ -33,12 +33,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom.json index 9202dc0c4..7f9303bb5 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom.json @@ -1,32 +1,32 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 1, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 12], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_inner_corner.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_inner_corner.json index 43efa2ae9..c5d7945b3 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_inner_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_inner_corner.json @@ -1,20 +1,20 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 1, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { @@ -22,36 +22,36 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 3, 13, 18], "texture": "#base"}, - "east": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "up": {"uv": [0, 4, 13, 7], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 3, 13, 18], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 4, 13, 7], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 4, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 4, 16, 16], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [4, 0, 12], "to": [16, 1, 16], "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 7], "texture": "#base"}, - "down": {"uv": [0, 4, 12, 8], "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 7], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 12, 8], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_outer_corner.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_outer_corner.json index b0858eafe..4cecd6054 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_outer_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_bottom_outer_corner.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "from": [0, 0, 0], "to": [12, 1, 12], "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": [0, 0, 12, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "texture": "#base", "tintindex": 0} } }, { @@ -23,24 +23,24 @@ "to": [1, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [11, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [13, 16, 13], "faces": { - "north": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "texture": "#base"} + "north": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_left.json index 57b1cb763..d9a3626db 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_left.json @@ -1,29 +1,29 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [2, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 14, 16], "texture": "#base"} + "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0} } }, { @@ -31,11 +31,11 @@ "from": [0, 0, 0], "to": [2, 14, 16], "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "west"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -43,12 +43,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_right.json index 1cbb0be55..459c72f62 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_edge_right.json @@ -1,29 +1,29 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 0, 0], "to": [14, 1, 12], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [14, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 14, 16], "texture": "#base"} + "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0} } }, { @@ -31,11 +31,11 @@ "from": [14, 0, 0], "to": [16, 14, 16], "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 14], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -43,12 +43,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_left.json index c377f19d9..057365936 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_left.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "from": [0, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 16], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 16], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "from": [3, 1, 13], "to": [16, 14, 16], "faces": { - "north": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 3, 16], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 3, 16], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 16], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 16], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -63,12 +63,12 @@ "from": [4, 0, 12], "to": [16, 1, 16], "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 4, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 4, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_right.json index 5d095dce9..1e10085ec 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_inner_corner_right.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#legs", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "from": [0, 1, 0], "to": [13, 14, 16], "faces": { - "north": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 16], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 16], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "from": [13, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "from": [0, 0, 0], "to": [12, 1, 16], "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 16], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 16], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 16], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { @@ -63,12 +63,12 @@ "from": [12, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 4, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 4, 12], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 4, 12], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 4, 12], "rotation": 180, "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle.json index cd1dc1709..4409115eb 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle.json @@ -1,32 +1,32 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 1, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_left.json index 5155ea73c..34c1442aa 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 13, 5], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 13, 5], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -23,36 +23,36 @@ "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 1, 16, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 19], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 16, 14], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 19], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [3, 0, 13], "to": [16, 1, 16], "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "texture": "#base"}, - "down": {"uv": [0, 4, 13, 7], "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 13, 7], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_right.json index 8b2c43142..48a4ee2b6 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_inner_corner_right.json @@ -1,47 +1,47 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { - "from": [13, 1, 0], - "to": [16, 16, 13], + "from": [0, 1, 0], + "to": [13, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 19], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { - "from": [0, 1, 0], - "to": [13, 16, 16], + "from": [0, 0, 0], + "to": [13, 1, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 19], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { - "from": [0, 0, 0], - "to": [13, 1, 16], + "from": [13, 1, 0], + "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "to": [16, 1, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 4, 13, 7], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 13, 7], "rotation": 90, "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_left.json index e3bd8a81c..0afef8dea 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "from": [0, 0, 0], "to": [13, 1, 13], "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 13], "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 13], "texture": "#base", "tintindex": 0} } }, { @@ -23,24 +23,24 @@ "to": [1, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [11, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [13, 16, 13], "faces": { - "north": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "texture": "#base"} + "north": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_right.json index ed1b44c2c..b6df05dd5 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_middle_outer_corner_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [16, 1, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "to": [16, 16, 1], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "up": {"uv": [0, 1, 13, 2], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 1, 13, 2], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 13, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 13, 14], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "rotation": 270, "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_left.json index f974487cc..2c97f8f76 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_left.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_log", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "from": [0, 1, 0], "to": [13, 14, 13], "faces": { - "north": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 16], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 16], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "from": [0, 0, 0], "to": [12, 1, 12], "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": [0, 0, 12, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_right.json index e49840dcc..26d18b2f6 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_counter_outer_corner_right.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "base": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_log", - "legs": "minecraft:block/oak_log" + "base": "block/oak_planks", + "particle": "block/oak_log", + "legs": "block/oak_log" }, "elements": [ { @@ -12,12 +12,12 @@ "to": [16, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [7, 7.75, 7]}, "faces": { - "north": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 13, 16], "texture": "#base"} + "north": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0} } }, { @@ -26,12 +26,12 @@ "to": [16, 1, 12], "rotation": {"angle": 0, "axis": "y", "origin": [7, 7.75, 7]}, "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": [0, 0, 12, 12], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 12], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "texture": "#base", "tintindex": 0} } }, { @@ -40,12 +40,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, 7.75, 7]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs", "tintindex": 0} } } ], 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 466bd3547..6f890e9ad 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 @@ -13,12 +13,12 @@ "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, 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"} + "north": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [3, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [15, 1, 16, 14], "texture": "#base", "tintindex": 0} } }, { @@ -26,48 +26,48 @@ "to": [1, 14, 13], "rotation": {"angle": 0, "axis": "x", "origin": [15, 0, 0]}, "faces": { - "north": {"uv": [0, 3, 1, 16], "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"} + "north": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 15, 14], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { "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"} + "north": {"uv": [1, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "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, 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"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { @@ -75,12 +75,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 16], "texture": "#legs", "tintindex": 0} } }, { 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 e97a63554..13a538559 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 @@ -12,11 +12,11 @@ "to": [16, 14, 13], "faces": { "north": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "east": {"uv": [3, 3, 16, 16], "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"} + "east": {"uv": [3, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [15, 1, 16, 14], "texture": "#base", "tintindex": 0} } }, { @@ -24,10 +24,10 @@ "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"} + "east": {"uv": [3, 1, 16, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { @@ -36,11 +36,11 @@ "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { "north": {"uv": [0, 3, 1, 16], "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"} + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 15, 14], "texture": "#base", "tintindex": 0} } }, { @@ -48,11 +48,11 @@ "to": [16, 1, 13], "faces": { "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base"} + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { @@ -60,11 +60,11 @@ "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"} + "east": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -72,11 +72,11 @@ "to": [15, 2, 13], "faces": { "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"} + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { 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 9d85a11e1..0d3c9ef65 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 @@ -11,23 +11,23 @@ "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, 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"} + "north": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [3, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [15, 1, 16, 14], "texture": "#base", "tintindex": 0} } }, { "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"} + "north": {"uv": [0, 0, 16, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [3, 1, 16, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { @@ -35,48 +35,48 @@ "to": [1, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { - "north": {"uv": [0, 3, 1, 16], "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"} + "north": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 15, 14], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { "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"} + "north": {"uv": [1, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "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, 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"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { 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 94648d4dc..a73862e8d 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 @@ -12,12 +12,12 @@ "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, 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"} + "north": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [3, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [15, 1, 16, 14], "texture": "#base", "tintindex": 0} } }, { @@ -25,48 +25,48 @@ "to": [1, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { - "north": {"uv": [0, 3, 1, 16], "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"} + "north": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 15, 14], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { "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"} + "north": {"uv": [1, 3, 15, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [14, 0, 16, 15], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#base", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "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, 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"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 7, 14, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { @@ -74,12 +74,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs"}, - "down": {"uv": [0, 0, 1, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 1, 16], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer.json index 0b0dfb46d..5814df856 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer.json @@ -2,31 +2,31 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 0, 13, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 0, 13, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 16, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 3, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { @@ -34,12 +34,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -47,11 +47,11 @@ "from": [1, 8, 12], "to": [15, 13, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 14, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 14, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 14, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 14, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 14, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -59,11 +59,11 @@ "from": [1, 2, 12], "to": [15, 7, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 14, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 14, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 14, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 14, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 14, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom.json index 71a85c789..cd6b31b5f 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom.json @@ -2,33 +2,33 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 1, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 15], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 15], "texture": "#base", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "from": [1, 1, 13], "to": [15, 15, 14], "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "east": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "west": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "up": {"uv": [1, 1, 15, 2], "texture": "#legs"}, - "down": {"uv": [1, 1, 15, 2], "texture": "#legs"} + "north": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 15, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_inner_corner.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_inner_corner.json index 267c2aae8..09e07fe48 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_inner_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_inner_corner.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -24,36 +24,36 @@ "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 19], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 19], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 4, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 4, 16, 16], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [4, 0, 12], "to": [16, 1, 16], "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 7], "texture": "#base"}, - "down": {"uv": [0, 4, 12, 8], "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 7], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 12, 8], "texture": "#base", "tintindex": 0} } }, { @@ -61,12 +61,12 @@ "from": [0, 1, 13], "to": [3, 15, 14], "faces": { - "north": {"uv": [0, 0, 3, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#legs"}, - "south": {"uv": [0, 1, 3, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 3, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -75,12 +75,12 @@ "to": [3, 15, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_open.json index d3c1f71ac..afa29ea18 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_open.json @@ -2,75 +2,75 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 1, 0], "to": [2, 15, 13], "faces": { - "north": {"uv": [14, 2, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 2, 2, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [14, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [14, 1, 0], "to": [16, 15, 13], "faces": { - "north": {"uv": [0, 2, 2, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "south": {"uv": [14, 2, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [0, 2, 2, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [2, 7, 1], "to": [14, 8, 12], "faces": { - "north": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 14], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 14], "texture": "#base"} + "north": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 14], "texture": "#base", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [14, 15, 1], "faces": { - "north": {"uv": [2, 2, 14, 16], "texture": "#base"}, - "south": {"uv": [2, 2, 14, 16], "texture": "#base"} + "north": {"uv": [2, 2, 14, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [2, 2, 14, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 15, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 2], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "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"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 15], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 15], "texture": "#base", "tintindex": 0} } }, { @@ -79,12 +79,12 @@ "to": [2, 15, 27], "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]}, "faces": { - "north": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "east": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "south": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "west": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "up": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner.json index 0a7ff6778..1ef56922f 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -37,12 +37,12 @@ "from": [1, 1, 0], "to": [13, 16, 13], "faces": { - "north": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "texture": "#base"} + "north": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "from": [1, 2, 12], "to": [12, 15, 14], "faces": { - "north": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "to": [14, 15, 12], "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6.5]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_mirrored.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_mirrored.json index a17df865d..79cac8727 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_mirrored.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_mirrored.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 0, 0], "to": [12, 1, 12], "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": [0, 0, 12, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "texture": "#base", "tintindex": 0} } }, { @@ -25,24 +25,24 @@ "to": [1, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [11, 15, 12, 2], "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 15, 12, 2], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [13, 16, 13], "faces": { - "north": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 15, 12, 2], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "texture": "#base"} + "north": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 15, 12, 2], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0} } }, { @@ -51,12 +51,12 @@ "to": [14, 15, 12], "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6.5]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "from": [1, 2, 12], "to": [12, 15, 14], "faces": { - "north": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_open.json index ac5b814d9..6c40b4012 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_bottom_outer_corner_open.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 0, 0], "to": [12, 1, 12], "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": [0, 0, 12, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "texture": "#base", "tintindex": 0} } }, { @@ -25,84 +25,84 @@ "to": [1, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [11, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [1, 15, 0], "to": [13, 16, 13], "faces": { - "north": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "texture": "#base"} + "north": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0} } }, { "from": [12, 1, 12], "to": [13, 15, 13], "faces": { - "north": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "south": {"uv": [11, 2, 12, 16], "texture": "#base"}, - "west": {"uv": [13, 2, 14, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 1, 4], "texture": "#base"}, - "down": {"uv": [0, 4, 1, 5], "texture": "#base"} + "north": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [11, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [13, 2, 14, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 1, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 1, 5], "texture": "#base", "tintindex": 0} } }, { "from": [12, 1, 1], "to": [13, 2, 12], "faces": { - "north": {"uv": [0, 2, 1, 3], "texture": "#base"}, - "east": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "south": {"uv": [11, 2, 12, 3], "texture": "#base"}, - "west": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "up": {"uv": [10, 3, 11, 14], "texture": "#base"}, - "down": {"uv": [0, 3, 1, 14], "texture": "#base"} + "north": {"uv": [0, 2, 1, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [11, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 3, 11, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 1, 14], "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 12], "to": [12, 2, 13], "faces": { - "north": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 1, 3], "texture": "#base"}, - "south": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "west": {"uv": [11, 2, 12, 3], "texture": "#base"}, - "up": {"uv": [10, 3, 11, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 1, 14], "rotation": 270, "texture": "#base"} + "north": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [11, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 3, 11, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { "from": [1, 8, 0], "to": [12, 9, 12], "faces": { - "north": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "up": {"uv": [0, 2, 11, 14], "texture": "#base"}, - "down": {"uv": [0, 3, 11, 15], "texture": "#base"} + "north": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 11, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 11, 15], "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [13, 15, 1], "faces": { - "north": {"uv": [0, 2, 12, 16], "texture": "#base"}, - "east": {"uv": [12, 2, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 2, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 4], "texture": "#base"}, - "down": {"uv": [0, 4, 12, 5], "texture": "#base"} + "north": {"uv": [0, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [12, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 12, 5], "texture": "#base", "tintindex": 0} } }, { @@ -111,12 +111,26 @@ "to": [2, 15, 23.75], "rotation": {"angle": 0, "axis": "y", "origin": [2, 6.5, 13.25]}, "faces": { - "north": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "west": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "tintindex": 0} + } + }, + { + "name": "top", + "from": [13, 2, 1], + "to": [14, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -133,20 +147,6 @@ "down": {"uv": [6, 3, 7, 4], "rotation": 180, "texture": "#2"} } }, - { - "name": "top", - "from": [13, 2, 1], - "to": [14, 15, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs"} - } - }, { "name": "top", "from": [14, 2.5, 10], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left.json index 0f20744ef..742e27a00 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left.json @@ -2,29 +2,29 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [2, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 0, 13, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 0, 13, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "down": {"uv": [0, 16, 14, 3], "texture": "#base"} + "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 16, 14, 3], "texture": "#base", "tintindex": 0} } }, { @@ -32,11 +32,11 @@ "from": [0, 0, 0], "to": [2, 14, 16], "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "west"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -44,12 +44,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -57,11 +57,11 @@ "from": [3, 8, 12], "to": [15, 13, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -69,11 +69,11 @@ "from": [3, 2, 12], "to": [15, 7, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left_open.json index e456140ff..c816e2b64 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_left_open.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 0, 0], "to": [2, 14, 16], "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 0, 0], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 0, 0], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -25,159 +25,159 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { "from": [2, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "east": {"uv": [1, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 14, 12], "texture": "#base"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "texture": "#base", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [16, 8, 13], "faces": { - "north": {"uv": [1, 9, 15, 16], "texture": "#base"}, - "east": {"uv": [0, 9, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 9, 14, 16], "texture": "#base"}, - "west": {"uv": [0, 6, 13, 13], "texture": "#base"}, - "up": {"uv": [0, 3, 15, 16], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 3, 15, 16], "texture": "#base"} + "north": {"uv": [1, 9, 15, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 9, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 9, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 6, 13, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 15, 16], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 3, 15, 16], "texture": "#base", "tintindex": 0} } }, { "from": [2, 8, 0], "to": [3, 14, 13], "faces": { - "north": {"uv": [15, 3, 16, 9], "texture": "#base"}, - "east": {"uv": [0, 6, 13, 13], "texture": "#base"}, - "south": {"uv": [0, 3, 1, 9], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 6], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [15, 3, 16, 9], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 6, 13, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 1, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 6], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 13], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { "from": [15, 8, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 1, 9], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 9], "texture": "#base"}, - "south": {"uv": [12, 3, 13, 9], "texture": "#base"}, - "west": {"uv": [0, 2, 13, 9], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 13], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [0, 3, 1, 9], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 9], "texture": "#base", "tintindex": 0}, + "south": {"uv": [12, 3, 13, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 13, 9], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 13], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { "from": [3, 8, 0], "to": [15, 14, 3], "faces": { - "north": {"uv": [2, 3, 14, 9], "texture": "#base"}, - "east": {"uv": [0, 6, 3, 12], "texture": "#base"}, - "south": {"uv": [0, 3, 12, 9], "texture": "#base"}, - "west": {"uv": [0, 2, 3, 8], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 6], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 3, 12, 7], "texture": "#base"} + "north": {"uv": [2, 3, 14, 9], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 6, 3, 12], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 12, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 3, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 6], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 7], "texture": "#base", "tintindex": 0} } }, { "from": [3, 13, 12], "to": [15, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 4], "texture": "#base"}, - "east": {"uv": [10, 3, 11, 4], "texture": "#base"}, - "south": {"uv": [1, 3, 13, 4], "texture": "#base"}, - "west": {"uv": [5, 3, 6, 4], "texture": "#base"}, - "up": {"uv": [1, 3, 13, 4], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 3, 14, 4], "texture": "#base"} + "north": {"uv": [0, 3, 14, 4], "texture": "#base", "tintindex": 0}, + "east": {"uv": [10, 3, 11, 4], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 3, 13, 4], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 3, 6, 4], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 3, 13, 4], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 3, 14, 4], "texture": "#base", "tintindex": 0} } }, { "from": [3, 9, 3], "to": [4, 13, 18], "faces": { - "north": {"uv": [0, 6, 1, 13], "texture": "#base"}, - "east": {"uv": [0, 3, 15, 7], "texture": "#base"}, - "south": {"uv": [0, 6, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "up": {"uv": [4, 0, 5, 15], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [0, 6, 1, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 15, 7], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 6, 1, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [4, 0, 5, 15], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { "from": [3, 8, 3], "to": [15, 9, 18], "faces": { - "north": {"uv": [0, 2, 12, 3], "texture": "#base"}, - "east": {"uv": [0, 8, 15, 9], "texture": "#base"}, - "south": {"uv": [0, 2, 12, 3], "texture": "#base"}, - "west": {"uv": [0, 2, 15, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 15], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 12, 15], "texture": "#base", "cullface": "up"} + "north": {"uv": [0, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 8, 15, 9], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 15, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 15], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 15], "texture": "#base", "cullface": "up", "tintindex": 0} } }, { "from": [14, 9, 3], "to": [15, 13, 18], "faces": { - "north": {"uv": [0, 6, 1, 13], "texture": "#base"}, - "east": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "south": {"uv": [0, 6, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 3, 15, 7], "texture": "#base"}, - "up": {"uv": [4, 0, 5, 15], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [0, 6, 1, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 6, 1, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 15, 7], "texture": "#base", "tintindex": 0}, + "up": {"uv": [4, 0, 5, 15], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { "name": "top", - "from": [8, 10, 19], - "to": [12, 11, 20], + "from": [3, 8, 18], + "to": [15, 13, 19], "faces": { - "north": {"uv": [3, 3, 7, 4], "texture": "#2"}, - "east": {"uv": [5, 2, 6, 3], "texture": "#2"}, - "south": {"uv": [1, 2, 5, 3], "texture": "#2"}, - "west": {"uv": [6, 3, 7, 4], "texture": "#2"}, - "up": {"uv": [3, 1, 7, 2], "rotation": 180, "texture": "#2"}, - "down": {"uv": [3, 3, 7, 4], "texture": "#2"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 1], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 1], "texture": "#legs", "tintindex": 0} } }, { "name": "top", - "from": [3, 8, 18], - "to": [15, 13, 19], + "from": [3, 2, 12], + "to": [15, 7, 14], "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 12, 1], "texture": "#legs"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0} } }, { "name": "top", - "from": [3, 2, 12], - "to": [15, 7, 14], + "from": [8, 10, 19], + "to": [12, 11, 20], "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#legs"} + "north": {"uv": [3, 3, 7, 4], "texture": "#2"}, + "east": {"uv": [5, 2, 6, 3], "texture": "#2"}, + "south": {"uv": [1, 2, 5, 3], "texture": "#2"}, + "west": {"uv": [6, 3, 7, 4], "texture": "#2"}, + "up": {"uv": [3, 1, 7, 2], "rotation": 180, "texture": "#2"}, + "down": {"uv": [3, 3, 7, 4], "texture": "#2"} } }, { @@ -265,8 +265,9 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [8, 9, 10, 11, 12] + "children": [8, 9, 10, 11] }, + 12, 13, 14 ] diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right.json index 40d8e488f..bc36daeeb 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right.json @@ -2,29 +2,29 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 0, 0], "to": [14, 1, 12], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [14, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { @@ -32,12 +32,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -45,11 +45,11 @@ "from": [14, 0, 0], "to": [16, 14, 16], "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 14], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -57,11 +57,11 @@ "from": [1, 8, 12], "to": [13, 13, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -69,11 +69,11 @@ "from": [1, 2, 12], "to": [13, 7, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right_open.json index f9c7af196..e3285e2ce 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_edge_right_open.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -25,132 +25,132 @@ "from": [14, 0, 0], "to": [16, 14, 16], "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 14], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 14], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 14], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [14, 1, 12], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [14, 8, 13], "faces": { - "north": {"uv": [0, 9, 14, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 9, 14, 16], "texture": "#base"}, - "west": {"uv": [0, 9, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 15, 16], "texture": "#base"} + "north": {"uv": [0, 9, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 9, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 9, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 15, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 8, 0], "to": [1, 14, 13], "faces": { - "north": {"uv": [15, 3, 16, 9], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 10], "texture": "#base"}, - "south": {"uv": [0, 3, 1, 9], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 9], "texture": "#base", "cullface": "west"} + "north": {"uv": [15, 3, 16, 9], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 10], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 1, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 9], "texture": "#base", "cullface": "west", "tintindex": 0} } }, { "from": [13, 8, 0], "to": [14, 14, 13], "faces": { - "north": {"uv": [0, 3, 1, 9], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 1, 9], "texture": "#base"}, - "west": {"uv": [0, 2, 13, 9], "texture": "#base"} + "north": {"uv": [0, 3, 1, 9], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 1, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 13, 9], "texture": "#base", "tintindex": 0} } }, { "from": [1, 8, 0], "to": [13, 14, 3], "faces": { - "north": {"uv": [0, 3, 12, 9], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 2, 12, 8], "texture": "#base"} + "north": {"uv": [0, 3, 12, 9], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 2, 12, 8], "texture": "#base", "tintindex": 0} } }, { "from": [1, 13, 12], "to": [13, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 4], "texture": "#base"}, - "south": {"uv": [0, 3, 12, 4], "texture": "#base"}, - "down": {"uv": [0, 0, 14, 1], "texture": "#base"} + "north": {"uv": [0, 3, 14, 4], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 12, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0} } }, { "from": [1, 9, 3], "to": [2, 13, 18], "faces": { - "east": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "west": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "up": {"uv": [4, 0, 5, 15], "texture": "#base"} + "east": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [4, 0, 5, 15], "texture": "#base", "tintindex": 0} } }, { "from": [1, 8, 3], "to": [13, 9, 18], "faces": { - "east": {"uv": [0, 8, 15, 9], "texture": "#base"}, - "west": {"uv": [0, 2, 15, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 15], "texture": "#base"} + "east": {"uv": [0, 8, 15, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 15, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 15], "texture": "#base", "tintindex": 0} } }, { "from": [12, 9, 3], "to": [13, 13, 18], "faces": { - "east": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "west": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "up": {"uv": [4, 0, 5, 15], "texture": "#base"} + "east": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [4, 0, 5, 15], "texture": "#base", "tintindex": 0} } }, { "name": "top", - "from": [6, 10, 19], - "to": [10, 11, 20], + "from": [1, 8, 18], + "to": [13, 13, 19], "faces": { - "east": {"uv": [5, 2, 6, 3], "texture": "#2", "cullface": "south"}, - "south": {"uv": [1, 2, 5, 3], "texture": "#2", "cullface": "south"}, - "west": {"uv": [6, 3, 7, 4], "texture": "#2", "cullface": "south"}, - "up": {"uv": [3, 1, 7, 2], "rotation": 180, "texture": "#2", "cullface": "south"}, - "down": {"uv": [3, 3, 7, 4], "texture": "#2", "cullface": "south"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 1], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 1], "texture": "#legs", "cullface": "south", "tintindex": 0} } }, { "name": "top", - "from": [1, 8, 18], - "to": [13, 13, 19], + "from": [1, 2, 12], + "to": [13, 7, 14], "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [0, 0, 12, 1], "texture": "#legs", "cullface": "south"}, - "down": {"uv": [0, 0, 12, 1], "texture": "#legs", "cullface": "south"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 2], "texture": "#legs", "tintindex": 0} } }, { "name": "top", - "from": [1, 2, 12], - "to": [13, 7, 14], + "from": [6, 10, 19], + "to": [10, 11, 20], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 12, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#legs"} + "east": {"uv": [5, 2, 6, 3], "texture": "#2", "cullface": "south"}, + "south": {"uv": [1, 2, 5, 3], "texture": "#2", "cullface": "south"}, + "west": {"uv": [6, 3, 7, 4], "texture": "#2", "cullface": "south"}, + "up": {"uv": [3, 1, 7, 2], "rotation": 180, "texture": "#2", "cullface": "south"}, + "down": {"uv": [3, 3, 7, 4], "texture": "#2", "cullface": "south"} } }, { @@ -238,9 +238,8 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [8, 9, 10, 11, 12] + "children": [8, 9, 10, 11, 12, 13] }, - 13, 14 ] } diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_left.json index 4e1afae32..b9acbd80f 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_left.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [16, 1, 16], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "south": {"uv": [1, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 12], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 12], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 12], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "to": [4, 1, 11.9], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 10.9, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 10.9, 4], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 10.9, 4], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 0, 5, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 10.9, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 10.9, 4], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 10.9, 4], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "to": [16, 14, 16], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 14, 16], "rotation": 90, "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 16, 14, 3], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 14, 16], "rotation": 90, "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 16, 14, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "to": [3, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 7.5, 6.5]}, "faces": { - "north": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 12, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 12, 16], "texture": "#base"}, - "up": {"uv": [0, 6, 12, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 6, 12, 3], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 6, 12, 3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 6, 12, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -78,12 +78,12 @@ "to": [3, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [2, 1, 4, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -92,12 +92,12 @@ "to": [13, 7, 15], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [2, 1, 3, 6], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "texture": "#legs"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [2, 1, 3, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0} } }, { @@ -106,12 +106,12 @@ "to": [3, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [5, 3, 7, 8], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [5, 3, 7, 8], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -120,12 +120,12 @@ "to": [13, 13, 15], "rotation": {"angle": 0, "axis": "y", "origin": [9.49444, 6.77778, 10.44444]}, "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [2, 1, 3, 6], "texture": "#legs"}, - "up": {"uv": [1, 1, 12, 2], "texture": "#legs"}, - "down": {"uv": [0, 1, 11, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [2, 1, 3, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 12, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 11, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_right.json index e1f26db8e..18af4da89 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_inner_corner_right.json @@ -1,57 +1,57 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "east": {"uv": [1, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 12], "to": [11.9, 1, 16], "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 10.9, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 10.9, 4], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 0, 10.9, 4], "texture": "#base"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 0, 5, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 10.9, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 4, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 10.9, 4], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 10.9, 4], "texture": "#base", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "up"}, - "down": {"uv": [0, 16, 14, 3], "texture": "#base"} + "north": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 16, 14, 3], "texture": "#base", "tintindex": 0} } }, { "from": [0, 1, 13], "to": [13, 14, 16], "faces": { - "north": {"uv": [0, 3, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 3, 16], "texture": "#base"}, - "up": {"uv": [0, 6, 12, 3], "texture": "#base"}, - "down": {"uv": [0, 6, 12, 3], "texture": "#base"} + "north": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 3, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 6, 12, 3], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 6, 12, 3], "texture": "#base", "tintindex": 0} } }, { @@ -59,12 +59,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -72,12 +72,12 @@ "from": [12, 2, 13], "to": [14, 7, 15], "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [2, 1, 4, 6], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [2, 1, 4, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -85,12 +85,12 @@ "from": [14, 2, 3], "to": [15, 7, 14], "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "south": {"uv": [2, 1, 3, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 3, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -98,12 +98,12 @@ "from": [12, 8, 13], "to": [14, 13, 15], "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [5, 3, 7, 8], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [5, 3, 7, 8], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -111,12 +111,12 @@ "from": [14, 8, 3], "to": [15, 13, 14], "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "south": {"uv": [2, 1, 3, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "up": {"uv": [1, 1, 12, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 1, 11, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 3, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 12, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle.json index 62bddec1f..1063a6303 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle.json @@ -2,33 +2,33 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 1, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "from": [1, 1, 13], "to": [15, 15, 14], "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "east": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "west": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "up": {"uv": [1, 1, 15, 2], "texture": "#legs"}, - "down": {"uv": [1, 1, 15, 2], "texture": "#legs"} + "north": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 15, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_left.json index 34d08947a..3ef8e7b0a 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_left.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -24,36 +24,36 @@ "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 19], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 19], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [3, 0, 13], "to": [16, 1, 16], "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "texture": "#base"}, - "down": {"uv": [0, 4, 13, 7], "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 13, 7], "texture": "#base", "tintindex": 0} } }, { @@ -61,12 +61,12 @@ "from": [0, 1, 13], "to": [3, 15, 14], "faces": { - "north": {"uv": [0, 0, 3, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 14], "texture": "#legs"}, - "south": {"uv": [0, 1, 3, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 3, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -75,12 +75,12 @@ "to": [3, 15, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_right.json index e05b867f8..efa78d3ab 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_inner_corner_right.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 3, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 3, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 3, 16], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "to": [13, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 19], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 16, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 19], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "to": [13, 1, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "to": [16, 1, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 3, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 13, 6], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 4, 13, 7], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 13, 6], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 13, 7], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "to": [14, 15, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 0, 1, 14], "texture": "#legs"}, - "east": {"uv": [0, 1, 3, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 3, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 3, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -78,12 +78,12 @@ "to": [16, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 1, 2, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_open.json index 36552ee1e..4ebbb1f53 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_open.json @@ -2,75 +2,75 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 1, 0], "to": [2, 15, 13], "faces": { - "north": {"uv": [14, 2, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 2, 2, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [14, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [14, 1, 0], "to": [16, 15, 13], "faces": { - "north": {"uv": [0, 2, 2, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "south": {"uv": [14, 2, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 13, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [0, 2, 2, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [14, 2, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [2, 7, 1], "to": [14, 8, 12], "faces": { - "north": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 14], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 14], "texture": "#base"} + "north": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 14], "texture": "#base", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [14, 15, 1], "faces": { - "north": {"uv": [2, 2, 14, 16], "texture": "#base"}, - "south": {"uv": [2, 2, 14, 16], "texture": "#base"} + "north": {"uv": [2, 2, 14, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [2, 2, 14, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 15, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 2], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 13], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { @@ -79,12 +79,12 @@ "to": [2, 15, 27], "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]}, "faces": { - "north": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "east": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "south": {"uv": [1, 1, 2, 15], "texture": "#legs"}, - "west": {"uv": [1, 1, 15, 15], "texture": "#legs"}, - "up": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 15, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_left.json index 012f723ae..161c59f94 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_left.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 0, 0], "to": [13, 1, 13], "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 13], "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 13], "texture": "#base", "tintindex": 0} } }, { @@ -25,24 +25,24 @@ "to": [1, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [11, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [13, 16, 13], "faces": { - "north": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "texture": "#base"} + "north": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "from": [1, 2, 13], "to": [12, 15, 14], "faces": { - "north": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "texture": "#legs"} + "north": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "to": [14, 15, 12], "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6.5]}, "faces": { - "north": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_left.json index ba4b364d3..f25fb042a 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_left.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 0, 0], "to": [13, 1, 13], "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 13, 13], "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 13], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 13], "texture": "#base", "tintindex": 0} } }, { @@ -25,84 +25,84 @@ "to": [1, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 6.5]}, "faces": { - "north": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [11, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [1, 15, 0], "to": [13, 16, 13], "faces": { - "north": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "up": {"uv": [0, 2, 12, 15], "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "texture": "#base"} + "north": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 12, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0} } }, { "from": [12, 1, 12], "to": [13, 15, 13], "faces": { - "north": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "south": {"uv": [11, 2, 12, 16], "texture": "#base"}, - "west": {"uv": [13, 2, 14, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 1, 4], "texture": "#base"}, - "down": {"uv": [0, 4, 1, 5], "texture": "#base"} + "north": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [11, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [13, 2, 14, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 1, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 1, 5], "texture": "#base", "tintindex": 0} } }, { "from": [12, 1, 1], "to": [13, 2, 12], "faces": { - "north": {"uv": [0, 2, 1, 3], "texture": "#base"}, - "east": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "south": {"uv": [11, 2, 12, 3], "texture": "#base"}, - "west": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "up": {"uv": [10, 3, 11, 14], "texture": "#base"}, - "down": {"uv": [0, 3, 1, 14], "texture": "#base"} + "north": {"uv": [0, 2, 1, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [11, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 3, 11, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 1, 14], "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 12], "to": [12, 2, 13], "faces": { - "north": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 1, 3], "texture": "#base"}, - "south": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "west": {"uv": [11, 2, 12, 3], "texture": "#base"}, - "up": {"uv": [10, 3, 11, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 1, 14], "rotation": 270, "texture": "#base"} + "north": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [11, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 3, 11, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { "from": [1, 8, 0], "to": [12, 9, 12], "faces": { - "north": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "up": {"uv": [0, 2, 11, 14], "texture": "#base"}, - "down": {"uv": [0, 3, 11, 15], "texture": "#base"} + "north": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 11, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 11, 15], "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [13, 15, 1], "faces": { - "north": {"uv": [0, 2, 12, 16], "texture": "#base"}, - "east": {"uv": [12, 2, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 2, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 4], "texture": "#base"}, - "down": {"uv": [0, 4, 12, 5], "texture": "#base"} + "north": {"uv": [0, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [12, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 12, 5], "texture": "#base", "tintindex": 0} } }, { @@ -111,12 +111,26 @@ "to": [2, 15, 23.75], "rotation": {"angle": 0, "axis": "y", "origin": [2, 6.5, 13.25]}, "faces": { - "north": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "west": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "tintindex": 0} + } + }, + { + "name": "top", + "from": [13, 2, 1], + "to": [14, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6.5]}, + "faces": { + "north": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -133,20 +147,6 @@ "down": {"uv": [6, 3, 7, 4], "rotation": 180, "texture": "#2"} } }, - { - "name": "top", - "from": [13, 2, 1], - "to": [14, 15, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6.5]}, - "faces": { - "north": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs"} - } - }, { "name": "top", "from": [14, 2.5, 10], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_right.json index f78938ae6..183b0a0fd 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_open_right.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -13,12 +13,12 @@ "to": [16, 1, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 13], "texture": "#base"}, - "down": {"uv": [0, 13, 13, 0], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 13, 13, 0], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -26,12 +26,12 @@ "to": [16, 16, 1], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "up": {"uv": [11, 16, 12, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 16, 12, 3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "texture": "#base", "tintindex": 0} } }, { @@ -39,12 +39,12 @@ "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "up": {"uv": [0, 16, 12, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 16, 12, 3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -52,12 +52,12 @@ "to": [4, 15, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [13, 2, 14, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "south": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "west": {"uv": [11, 2, 12, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 1, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 4, 1, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [13, 2, 14, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [11, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 1, 4], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 1, 5], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -65,12 +65,12 @@ "to": [15, 2, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 1, 3], "texture": "#base"}, - "south": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "west": {"uv": [11, 2, 12, 3], "texture": "#base"}, - "up": {"uv": [10, 3, 11, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 1, 14], "rotation": 270, "texture": "#base"} + "north": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 1, 3], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [11, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 3, 11, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 1, 14], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -78,12 +78,12 @@ "to": [4, 2, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [11, 2, 12, 3], "texture": "#base"}, - "east": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "south": {"uv": [0, 2, 1, 3], "texture": "#base"}, - "west": {"uv": [1, 15, 12, 16], "texture": "#base"}, - "up": {"uv": [10, 3, 11, 14], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 3, 1, 14], "rotation": 180, "texture": "#base"} + "north": {"uv": [11, 2, 12, 3], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 1, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 15, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 3, 11, 14], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 1, 14], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { @@ -91,12 +91,12 @@ "to": [16, 9, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "east": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "south": {"uv": [0, 1, 12, 2], "texture": "#base"}, - "west": {"uv": [0, 1, 11, 2], "texture": "#base"}, - "up": {"uv": [0, 2, 11, 14], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 11, 15], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 12, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 2, 11, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 11, 15], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -104,12 +104,12 @@ "to": [16, 15, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [0, 2, 1, 16], "texture": "#base"}, - "east": {"uv": [0, 2, 12, 16], "texture": "#base"}, - "south": {"uv": [12, 2, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 2, 12, 16], "texture": "#base"}, - "up": {"uv": [0, 3, 12, 4], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 4, 12, 5], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 2, 1, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [12, 2, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 12, 4], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 4, 12, 5], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -118,12 +118,26 @@ "to": [3.25, 15, 2], "rotation": {"angle": 0, "axis": "y", "origin": [0, 6.5, 0]}, "faces": { - "north": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#legs", "tintindex": 0} + } + }, + { + "name": "top", + "from": [4, 2, 13], + "to": [15, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]}, + "faces": { + "north": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0} } }, { @@ -140,20 +154,6 @@ "down": {"uv": [6, 3, 7, 4], "rotation": 90, "texture": "#2"} } }, - { - "name": "top", - "from": [4, 2, 13], - "to": [15, 15, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]}, - "faces": { - "north": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "texture": "#legs"} - } - }, { "name": "top", "from": [5, 2.5, 14], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_right.json index 8ad2dfffd..72839593b 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_middle_outer_corner_right.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { @@ -13,12 +13,12 @@ "to": [16, 1, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 6.5, 0]}, "faces": { - "north": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 13, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 13, 13], "texture": "#base"}, - "down": {"uv": [0, 13, 13, 0], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 13, 13, 0], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -26,12 +26,12 @@ "to": [16, 16, 1], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 1, 16], "texture": "#base"}, - "up": {"uv": [11, 16, 12, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 13, 4], "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 1, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 16, 12, 3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 13, 4], "texture": "#base", "tintindex": 0} } }, { @@ -53,12 +53,12 @@ "to": [16, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 6.5, 0]}, "faces": { - "north": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "east": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "south": {"uv": [0, 1, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 1, 12, 16], "texture": "#base"}, - "up": {"uv": [0, 16, 12, 3], "rotation": 90, "texture": "#base"}, - "down": {"uv": [0, 3, 12, 16], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 16, 12, 3], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 12, 16], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -67,12 +67,12 @@ "to": [3, 15, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 6.5, 0]}, "faces": { - "north": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "west": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -81,12 +81,12 @@ "to": [15, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 6.5, 0]}, "faces": { - "north": {"uv": [0, 0, 11, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 1, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 1], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 1], "texture": "#legs"} + "north": {"uv": [0, 0, 11, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_open.json index 429f7d108..ac73658fd 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_open.json @@ -2,96 +2,109 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 0, 13, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 0, 13, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [16, 8, 13], "faces": { - "north": {"uv": [0, 9, 16, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 9, 13, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 9, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 9, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "north": {"uv": [0, 9, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 9, 13, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 9, 16, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 9, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { "from": [0, 8, 0], "to": [1, 14, 13], "faces": { - "north": {"uv": [15, 3, 16, 9], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 6, 13, 13], "texture": "#base"}, - "south": {"uv": [0, 7, 1, 13], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 9], "texture": "#base", "cullface": "west"} + "north": {"uv": [15, 3, 16, 9], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 6, 13, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 7, 1, 13], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 9], "texture": "#base", "cullface": "west", "tintindex": 0} } }, { "from": [15, 8, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 1, 9], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 9], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 3, 1, 9], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 9], "texture": "#base"} + "north": {"uv": [0, 3, 1, 9], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 9], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 3, 1, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 9], "texture": "#base", "tintindex": 0} } }, { "from": [1, 8, 0], "to": [15, 14, 4], "faces": { - "north": {"uv": [1, 3, 15, 9], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 14, 9], "texture": "#base"} + "north": {"uv": [1, 3, 15, 9], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 9], "texture": "#base", "tintindex": 0} } }, { "from": [1, 13, 12], "to": [15, 14, 13], "faces": { - "north": {"uv": [0, 3, 14, 4], "texture": "#base"}, - "south": {"uv": [0, 3, 14, 4], "texture": "#base"}, - "down": {"uv": [0, 0, 14, 1], "texture": "#base"} + "north": {"uv": [0, 3, 14, 4], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0} } }, { "from": [1, 9, 3], "to": [2, 13, 18], "faces": { - "east": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "west": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "up": {"uv": [4, 0, 5, 15], "texture": "#base"} + "east": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [4, 0, 5, 15], "texture": "#base", "tintindex": 0} } }, { "from": [1, 8, 3], "to": [15, 9, 18], "faces": { - "east": {"uv": [0, 8, 15, 9], "texture": "#base"}, - "west": {"uv": [0, 2, 15, 3], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 13], "texture": "#base"}, - "down": {"uv": [0, 0, 16, 13], "texture": "#base"} + "east": {"uv": [0, 8, 15, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 15, 3], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 13], "texture": "#base", "tintindex": 0} } }, { "from": [14, 9, 3], "to": [15, 13, 18], "faces": { - "east": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "west": {"uv": [0, 4, 15, 8], "texture": "#base"}, - "up": {"uv": [4, 0, 5, 15], "texture": "#base"} + "east": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 4, 15, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [4, 0, 5, 15], "texture": "#base", "tintindex": 0} + } + }, + { + "name": "top", + "from": [1, 8, 18], + "to": [15, 13, 19], + "faces": { + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "south": {"uv": [0, 1, 14, 6], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [0, 0, 14, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 2], "texture": "#legs", "cullface": "south", "tintindex": 0} } }, { @@ -106,30 +119,17 @@ "down": {"uv": [3, 3, 7, 4], "texture": "#2", "cullface": "south"} } }, - { - "name": "top", - "from": [1, 8, 18], - "to": [15, 13, 19], - "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "south": {"uv": [0, 1, 14, 6], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [0, 0, 14, 2], "texture": "#legs", "cullface": "south"}, - "down": {"uv": [0, 0, 14, 2], "texture": "#legs", "cullface": "south"} - } - }, { "name": "top", "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -137,11 +137,11 @@ "from": [1, 2, 12], "to": [15, 7, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 14, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 14, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 14, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 14, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 14, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 14, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_left.json index e95936396..60521a2a5 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_left.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,11 +12,11 @@ "to": [12, 1, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -24,11 +24,11 @@ "to": [13, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 16, 14, 3], "texture": "#base"} + "north": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 16, 14, 3], "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -51,11 +51,11 @@ "to": [12, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -64,11 +64,11 @@ "to": [12, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -103,11 +103,11 @@ "to": [14, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -116,11 +116,11 @@ "to": [14, 7, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_left.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_left.json index eb4681d90..da86401af 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_left.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_left.json @@ -2,118 +2,118 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { "from": [0, 0, 0], "to": [12, 1, 12], "faces": { - "north": {"uv": [0, 12, 12, 13], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 0, 13, 1], "texture": "#base"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "west": {"uv": [0, 13, 12, 14], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 12, 12, 13], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 13, 12, 14], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [1, 14, 13], "faces": { - "north": {"uv": [13, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 16, 1, 3], "texture": "#base"} + "north": {"uv": [13, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 16, 1, 3], "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 0], "to": [13, 14, 1], "faces": { - "north": {"uv": [0, 3, 12, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "south": {"uv": [0, 3, 12, 16], "texture": "#base"}, - "down": {"uv": [0, 16, 1, 3], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 3, 12, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 16, 1, 3], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { "from": [1, 1, 1], "to": [13, 8, 13], "faces": { - "east": {"uv": [0, 9, 12, 16], "texture": "#base"}, - "south": {"uv": [0, 9, 12, 16], "texture": "#base"}, - "up": {"uv": [0, 4, 12, 16], "rotation": 270, "texture": "#base"}, - "down": {"uv": [14, 2, 2, 14], "texture": "#base"} + "east": {"uv": [0, 9, 12, 16], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 9, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 4, 12, 16], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 2, 2, 14], "texture": "#base", "tintindex": 0} } }, { "from": [12, 13, 1], "to": [13, 14, 12], "faces": { - "east": {"uv": [0, 3, 11, 4], "texture": "#base"}, - "west": {"uv": [0, 3, 11, 4], "texture": "#base"} + "east": {"uv": [0, 3, 11, 4], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 11, 4], "texture": "#base", "tintindex": 0} } }, { "from": [11, 9, 4], "to": [12, 13, 18], "faces": { - "north": {"uv": [0, 3, 1, 7], "texture": "#base"}, - "east": {"uv": [0, 4, 14, 8], "texture": "#base"}, - "west": {"uv": [0, 4, 14, 8], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, - "down": {"uv": [3, 2, 2, 3], "texture": "#base"} + "north": {"uv": [0, 3, 1, 7], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 4, 14, 8], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 4, 14, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [3, 2, 2, 3], "texture": "#base", "tintindex": 0} } }, { "from": [1, 9, 4], "to": [2, 13, 18], "faces": { - "north": {"uv": [0, 0, 1, 4], "texture": "#base"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"}, - "down": {"uv": [3, 2, 2, 3], "texture": "#base"} + "north": {"uv": [0, 0, 1, 4], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 4], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 4], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [3, 2, 2, 3], "texture": "#base", "tintindex": 0} } }, { "from": [1, 8, 6], "to": [12, 9, 18], "faces": { - "north": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 11, 12], "rotation": 180, "texture": "#base"}, - "down": {"uv": [0, 0, 11, 10], "rotation": 180, "texture": "#base"} + "north": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 12], "rotation": 180, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 10], "rotation": 180, "texture": "#base", "tintindex": 0} } }, { "from": [1, 9, 6], "to": [12, 13, 7], "faces": { - "north": {"uv": [0, 0, 11, 4], "texture": "#base"}, - "south": {"uv": [0, 0, 11, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 11, 4], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 11, 4], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { "from": [1, 13, 12], "to": [12, 14, 13], "faces": { - "north": {"uv": [0, 0, 11, 1], "texture": "#base"}, - "south": {"uv": [1, 7, 12, 8], "texture": "#base"}, - "down": {"uv": [3, 2, 2, 3], "texture": "#base"} + "north": {"uv": [0, 0, 11, 1], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 7, 12, 8], "texture": "#base", "tintindex": 0}, + "down": {"uv": [3, 2, 2, 3], "texture": "#base", "tintindex": 0} } }, { "from": [12, 8, 12], "to": [13, 15, 13], "faces": { - "east": {"uv": [0, 2, 1, 9], "texture": "#base"}, - "south": {"uv": [11, 2, 12, 9], "texture": "#base"} + "east": {"uv": [0, 2, 1, 9], "texture": "#base", "tintindex": 0}, + "south": {"uv": [11, 2, 12, 9], "texture": "#base", "tintindex": 0} } }, { @@ -121,12 +121,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "texture": "#legs", "tintindex": 0} } }, { @@ -146,12 +146,12 @@ "from": [1, 8, 18], "to": [12, 13, 19], "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south"}, - "east": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [0, 0, 11, 1], "texture": "#legs", "cullface": "south"}, - "down": {"uv": [0, 0, 11, 1], "texture": "#legs", "cullface": "south"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "texture": "#legs", "cullface": "south", "tintindex": 0} } }, { @@ -159,11 +159,11 @@ "from": [1, 2, 12], "to": [12, 7, 14], "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -184,12 +184,12 @@ "to": [14, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "west": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -198,11 +198,11 @@ "to": [14, 7, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "east": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_right.json index 888a568e2..4741302d6 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_open_right.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,11 +12,11 @@ "to": [16, 1, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 13, 12, 14], "texture": "#base", "cullface": "west"}, - "east": {"uv": [0, 12, 12, 13], "texture": "#base", "cullface": "north"}, - "south": {"uv": [1, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 13, 12, 14], "texture": "#base", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 12, 12, 13], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [1, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -24,11 +24,11 @@ "to": [16, 14, 1], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "east": {"uv": [13, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "down": {"uv": [0, 16, 1, 3], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "east": {"uv": [13, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 16, 1, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -36,10 +36,10 @@ "to": [16, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "east": {"uv": [0, 3, 12, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 12, 16], "texture": "#base"}, - "down": {"uv": [0, 16, 1, 3], "texture": "#base"} + "east": {"uv": [0, 3, 12, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 12, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 16, 1, 3], "texture": "#base", "tintindex": 0} } }, { @@ -47,10 +47,10 @@ "to": [15, 8, 13], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "south": {"uv": [0, 9, 12, 16], "texture": "#base"}, - "west": {"uv": [0, 9, 12, 16], "texture": "#base"}, - "up": {"uv": [0, 4, 12, 16], "texture": "#base"}, - "down": {"uv": [14, 2, 2, 14], "rotation": 270, "texture": "#base"} + "south": {"uv": [0, 9, 12, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 9, 12, 16], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 4, 12, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [14, 2, 2, 14], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -58,8 +58,8 @@ "to": [15, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 3, 11, 4], "texture": "#base"}, - "south": {"uv": [0, 3, 11, 4], "texture": "#base"} + "north": {"uv": [0, 3, 11, 4], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 3, 11, 4], "texture": "#base", "tintindex": 0} } }, { @@ -67,11 +67,11 @@ "to": [12, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 4, 14, 8], "texture": "#base"}, - "east": {"uv": [0, 3, 1, 7], "texture": "#base"}, - "south": {"uv": [0, 4, 14, 8], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, - "down": {"uv": [3, 2, 2, 3], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 4, 14, 8], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 3, 1, 7], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 4, 14, 8], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base", "tintindex": 0}, + "down": {"uv": [3, 2, 2, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -79,11 +79,11 @@ "to": [12, 13, 2], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "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"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#base"}, - "down": {"uv": [3, 2, 2, 3], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 14, 4], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 1, 4], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 14, 4], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base", "tintindex": 0}, + "down": {"uv": [3, 2, 2, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -91,11 +91,11 @@ "to": [10, 9, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "east": {"uv": [0, 0, 12, 13], "texture": "#base"}, - "south": {"uv": [0, 0, 12, 1], "texture": "#base"}, - "up": {"uv": [0, 0, 11, 12], "rotation": 270, "texture": "#base"}, - "down": {"uv": [0, 0, 11, 10], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 13], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 12], "rotation": 270, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 10], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -103,9 +103,9 @@ "to": [10, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "east": {"uv": [0, 0, 11, 4], "texture": "#base"}, - "west": {"uv": [0, 0, 11, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#base"} + "east": {"uv": [0, 0, 11, 4], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 11, 4], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 1, 1], "texture": "#base", "tintindex": 0} } }, { @@ -113,9 +113,9 @@ "to": [4, 14, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "east": {"uv": [0, 0, 11, 1], "texture": "#base"}, - "west": {"uv": [1, 7, 12, 8], "texture": "#base"}, - "down": {"uv": [3, 2, 2, 3], "rotation": 270, "texture": "#base"} + "east": {"uv": [0, 0, 11, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 7, 12, 8], "texture": "#base", "tintindex": 0}, + "down": {"uv": [3, 2, 2, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -123,8 +123,8 @@ "to": [4, 15, 13], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "south": {"uv": [0, 2, 1, 9], "texture": "#base"}, - "west": {"uv": [11, 2, 12, 9], "texture": "#base"} + "south": {"uv": [0, 2, 1, 9], "texture": "#base", "tintindex": 0}, + "west": {"uv": [11, 2, 12, 9], "texture": "#base", "tintindex": 0} } }, { @@ -133,12 +133,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -160,12 +160,12 @@ "to": [-2, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "east": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 1, 11, 6], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "cullface": "south"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "cullface": "south"} + "north": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "south": {"uv": [0, 0, 1, 5], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 6], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 1], "rotation": 90, "texture": "#legs", "cullface": "south", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 1], "rotation": 270, "texture": "#legs", "cullface": "south", "tintindex": 0} } }, { @@ -174,11 +174,11 @@ "to": [4, 7, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "west": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -200,12 +200,12 @@ "to": [15, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 14, 5], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -214,11 +214,11 @@ "to": [15, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14.75, 7.5, 5.75]}, "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_right.json b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_right.json index 10b265317..4aba34287 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_drawer/kitchen_drawer_outer_corner_right.json @@ -2,9 +2,9 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,11 +12,11 @@ "to": [16, 1, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "east": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north"}, - "south": {"uv": [1, 0, 13, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 14, 1], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 0, 14, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [1, 0, 13, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 14, 1], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#base", "cullface": "down", "tintindex": 0} } }, { @@ -24,11 +24,11 @@ "to": [16, 14, 13], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west"}, - "east": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 13, 16], "texture": "#base"}, - "west": {"uv": [0, 3, 14, 16], "texture": "#base"}, - "down": {"uv": [0, 16, 14, 3], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 3, 13, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 13, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 16, 14, 3], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -51,11 +51,11 @@ "to": [4, 13, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "west": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -64,11 +64,11 @@ "to": [4, 7, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "north": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "west": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -103,11 +103,11 @@ "to": [15, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -116,11 +116,11 @@ "to": [15, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.75, 0]}, "faces": { - "east": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "south": {"uv": [0, 1, 11, 6], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 5], "texture": "#legs"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 11, 2], "texture": "#legs"} + "east": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 1, 11, 6], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 5], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 11, 2], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink.json b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink.json index cccf0541c..36530d737 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink.json @@ -3,9 +3,9 @@ "textures": { "sink": "block/light_gray_concrete", "hardware": "block/gray_concrete", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -150,74 +150,74 @@ "from": [0, 14, 0], "to": [2, 16, 16], "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [2, 14, 13], "faces": { - "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 2, 16], "texture": "#base"}, - "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [14, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [14, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [14, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [14, 14, 2], "faces": { - "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north"} + "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0} } }, { "from": [2, 1, 12], "to": [14, 14, 13], "faces": { - "south": {"uv": [2, 3, 14, 16], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "texture": "#base"} + "south": {"uv": [2, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [2, 14, 0], "to": [14, 16, 2], "faces": { - "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { "from": [2, 14, 12], "to": [14, 16, 16], "faces": { - "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 12, 4], "texture": "#legs"} + "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 4], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_full.json b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_full.json index 4b8cbcbb1..ef55b6ae3 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_full.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_full.json @@ -151,74 +151,74 @@ "from": [0, 14, 0], "to": [2, 16, 16], "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [2, 14, 13], "faces": { - "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 2, 16], "texture": "#base"}, - "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [14, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [14, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [14, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [14, 14, 2], "faces": { - "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north"} + "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0} } }, { "from": [2, 1, 12], "to": [14, 14, 13], "faces": { - "south": {"uv": [2, 3, 14, 16], "texture": "#base"}, - "down": {"uv": [2, 3, 14, 4], "texture": "#base"} + "south": {"uv": [2, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [2, 3, 14, 4], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [2, 14, 0], "to": [14, 16, 2], "faces": { - "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { "from": [2, 14, 12], "to": [14, 16, 16], "faces": { - "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 12, 4], "texture": "#legs"} + "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 4], "texture": "#legs", "tintindex": 0} } }, { @@ -226,10 +226,10 @@ "to": [16, 16, 16], "faces": { "north": {"uv": [14, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [14, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level1.json b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level1.json index 26174273e..0001d1fe2 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level1.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level1.json @@ -4,9 +4,9 @@ "sink": "block/light_gray_concrete", "hardware": "block/gray_concrete", "fluid": "block/water_still", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -144,88 +144,89 @@ "from": [0, 14, 0], "to": [2, 16, 16], "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [2, 14, 13], "faces": { - "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 2, 16], "texture": "#base"}, - "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [14, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [14, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [14, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [14, 14, 2], "faces": { - "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north"} + "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0} } }, { "from": [2, 1, 12], "to": [14, 14, 13], "faces": { - "south": {"uv": [2, 3, 14, 16], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "texture": "#base"} + "south": {"uv": [2, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [2, 14, 0], "to": [14, 16, 2], "faces": { - "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { "from": [2, 14, 12], "to": [14, 16, 16], "faces": { - "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 12, 4], "texture": "#legs"} + "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 4], "texture": "#legs", "tintindex": 0} } }, { "from": [14, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [14, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [14, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "north": {"uv": [14, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { + "name": "water", "from": [2, 12, 2], "to": [14, 13, 11.5], "faces": { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level2.json b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level2.json index c759fbfaa..51a9ab83d 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level2.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_sink/kitchen_sink_level2.json @@ -4,9 +4,9 @@ "sink": "block/light_gray_concrete", "hardware": "block/gray_concrete", "fluid": "block/water_still", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -151,85 +151,85 @@ "from": [0, 14, 0], "to": [2, 16, 16], "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "west", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { "from": [0, 1, 0], "to": [2, 14, 13], "faces": { - "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north"}, - "south": {"uv": [0, 3, 2, 16], "texture": "#base"}, - "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [14, 3, 16, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "south": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [14, 1, 0], "to": [16, 14, 13], "faces": { - "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north"}, - "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east"}, - "south": {"uv": [14, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 2, 16], "texture": "#base"} + "north": {"uv": [0, 3, 2, 16], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [1, 3, 14, 16], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [14, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 16], "texture": "#base", "tintindex": 0} } }, { "from": [2, 1, 0], "to": [14, 14, 2], "faces": { - "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north"} + "north": {"uv": [2, 3, 14, 16], "texture": "#base", "cullface": "north", "tintindex": 0} } }, { "from": [2, 1, 12], "to": [14, 14, 13], "faces": { - "south": {"uv": [2, 3, 14, 16], "texture": "#base"}, - "down": {"uv": [0, 0, 12, 1], "texture": "#base"} + "south": {"uv": [2, 3, 14, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 1], "texture": "#base", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [16, 1, 12], "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north"}, - "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#base"}, - "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down"} + "north": {"uv": [0, 0, 16, 1], "texture": "#base", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 1], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 12, 1], "texture": "#base", "cullface": "west", "tintindex": 0}, + "down": {"uv": [0, 0, 16, 12], "texture": "#base", "cullface": "down", "tintindex": 0} } }, { "from": [2, 14, 0], "to": [14, 16, 2], "faces": { - "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up"} + "north": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "up": {"uv": [2, 0, 14, 2], "texture": "#legs", "cullface": "up", "tintindex": 0} } }, { "from": [2, 14, 12], "to": [14, 16, 16], "faces": { - "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 12, 4], "texture": "#legs"} + "south": {"uv": [0, 0, 12, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [1, 12, 13, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 12, 4], "texture": "#legs", "tintindex": 0} } }, { "from": [14, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [14, 0, 16, 2], "texture": "#legs", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south"}, - "up": {"uv": [14, 0, 16, 16], "texture": "#legs", "cullface": "up"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#legs"} + "north": {"uv": [14, 0, 16, 2], "texture": "#legs", "cullface": "north", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 2], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "south", "tintindex": 0}, + "up": {"uv": [14, 0, 16, 16], "texture": "#legs", "cullface": "up", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small.json b/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small.json index 9ea81dd7c..b916bdadf 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small.json @@ -2,21 +2,21 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [0, 6, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 16, 11], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 11], "texture": "#base"}, - "south": {"uv": [0, 1, 16, 11], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 11], "texture": "#base"}, - "up": {"uv": [0, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 16, 11], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 11], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 16, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 11], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "from": [1, 7, 13], "to": [15, 15, 14], "faces": { - "north": {"uv": [1, 1, 15, 9], "texture": "#legs"}, - "east": {"uv": [1, 1, 2, 9], "texture": "#legs"}, - "south": {"uv": [1, 1, 15, 9], "texture": "#legs"}, - "west": {"uv": [1, 1, 2, 9], "texture": "#legs"}, - "up": {"uv": [1, 1, 15, 2], "texture": "#legs"}, - "down": {"uv": [1, 1, 15, 2], "texture": "#legs"} + "north": {"uv": [1, 1, 15, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 15, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small_open.json b/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small_open.json index 95df025e4..6ebc8e532 100644 --- a/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small_open.json +++ b/common/src/main/resources/assets/pfm/models/block/kitchen_wall_drawer_small/kitchen_wall_drawer_small_open.json @@ -2,79 +2,79 @@ "credit": "By UnlikePaladin", "textures": { "2": "block/stone", - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks", + "base": "block/oak_planks" }, "elements": [ { "from": [15, 6, 0], "to": [16, 16, 13], "faces": { - "north": {"uv": [0, 1, 1, 11], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 11], "texture": "#base"}, - "south": {"uv": [15, 1, 16, 11], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 11], "texture": "#base"}, - "up": {"uv": [15, 3, 16, 16], "texture": "#base"}, - "down": {"uv": [15, 3, 16, 16], "texture": "#base"} + "north": {"uv": [0, 1, 1, 11], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 11], "texture": "#base", "tintindex": 0}, + "south": {"uv": [15, 1, 16, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 11], "texture": "#base", "tintindex": 0}, + "up": {"uv": [15, 3, 16, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [15, 3, 16, 16], "texture": "#base", "tintindex": 0} } }, { "from": [7.5, 7, 1], "to": [8.5, 15, 12], "faces": { - "north": {"uv": [0, 1, 1, 9], "texture": "#base"}, - "east": {"uv": [0, 2, 11, 10], "texture": "#base"}, - "south": {"uv": [15, 2, 16, 10], "texture": "#base"}, - "west": {"uv": [0, 2, 11, 10], "texture": "#base"}, - "up": {"uv": [15, 3, 16, 14], "texture": "#base"}, - "down": {"uv": [15, 3, 16, 14], "texture": "#base"} + "north": {"uv": [0, 1, 1, 9], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 2, 11, 10], "texture": "#base", "tintindex": 0}, + "south": {"uv": [15, 2, 16, 10], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 2, 11, 10], "texture": "#base", "tintindex": 0}, + "up": {"uv": [15, 3, 16, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [15, 3, 16, 14], "texture": "#base", "tintindex": 0} } }, { "from": [1, 15, 1], "to": [15, 16, 13], "faces": { - "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, - "east": {"uv": [1, 1, 13, 2], "texture": "#base"}, - "south": {"uv": [1, 1, 15, 2], "texture": "#base"}, - "west": {"uv": [2, 1, 14, 2], "texture": "#base"}, - "up": {"uv": [1, 4, 15, 16], "texture": "#base"}, - "down": {"uv": [1, 4, 15, 16], "texture": "#base"} + "north": {"uv": [1, 1, 15, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 1, 14, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 4, 15, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 4, 15, 16], "texture": "#base", "tintindex": 0} } }, { "from": [1, 6, 1], "to": [15, 7, 13], "faces": { - "north": {"uv": [1, 1, 15, 2], "texture": "#base"}, - "east": {"uv": [1, 1, 13, 2], "texture": "#base"}, - "south": {"uv": [1, 10, 15, 11], "texture": "#base"}, - "west": {"uv": [1, 1, 13, 2], "texture": "#base"}, - "up": {"uv": [1, 3, 15, 15], "texture": "#base"}, - "down": {"uv": [1, 3, 15, 15], "texture": "#base"} + "north": {"uv": [1, 1, 15, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 10, 15, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 1, 13, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 3, 15, 15], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 3, 15, 15], "texture": "#base", "tintindex": 0} } }, { "from": [1, 6, 0], "to": [15, 16, 1], "faces": { - "north": {"uv": [1, 1, 15, 11], "texture": "#base"}, - "south": {"uv": [1, 1, 15, 11], "texture": "#base"}, - "up": {"uv": [1, 3, 15, 4], "texture": "#base"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#base"} + "north": {"uv": [1, 1, 15, 11], "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 11], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 3, 15, 4], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base", "tintindex": 0} } }, { "from": [0, 6, 0], "to": [1, 16, 13], "faces": { - "north": {"uv": [15, 1, 16, 11], "texture": "#base"}, - "east": {"uv": [0, 1, 13, 11], "texture": "#base"}, - "south": {"uv": [0, 1, 1, 11], "texture": "#base"}, - "west": {"uv": [0, 1, 13, 11], "texture": "#base"}, - "up": {"uv": [0, 3, 1, 16], "texture": "#base"}, - "down": {"uv": [0, 3, 1, 16], "texture": "#base"} + "north": {"uv": [15, 1, 16, 11], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 1, 13, 11], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 1, 1, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 11], "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 3, 1, 16], "texture": "#base", "tintindex": 0} } }, { @@ -83,12 +83,12 @@ "to": [1, 15, 20], "rotation": {"angle": 0, "axis": "y", "origin": [1, 10.75, 13]}, "faces": { - "north": {"uv": [1, 1, 2, 9], "texture": "#legs"}, - "east": {"uv": [1, 1, 8, 9], "texture": "#legs"}, - "south": {"uv": [1, 1, 2, 9], "texture": "#legs"}, - "west": {"uv": [1, 1, 8, 9], "texture": "#legs"}, - "up": {"uv": [1, 1, 8, 2], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [1, 1, 8, 2], "rotation": 270, "texture": "#legs"} + "north": {"uv": [1, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 8, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [1, 1, 2, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 8, 9], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [1, 1, 8, 2], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [1, 1, 8, 2], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -111,12 +111,12 @@ "to": [16, 15, 20], "rotation": {"angle": 0, "axis": "y", "origin": [15, 10.75, 13]}, "faces": { - "north": {"uv": [8, 1, 9, 9], "texture": "#legs"}, - "east": {"uv": [8, 1, 15, 9], "texture": "#legs"}, - "south": {"uv": [8, 1, 9, 9], "texture": "#legs"}, - "west": {"uv": [8, 1, 15, 9], "texture": "#legs"}, - "up": {"uv": [8, 1, 15, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [8, 1, 15, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [8, 1, 9, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [8, 1, 15, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [8, 1, 9, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [8, 1, 15, 9], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [8, 1, 15, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [8, 1, 15, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { diff --git a/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool.json b/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool.json index b58662a36..1294401c2 100644 --- a/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool.json +++ b/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool.json @@ -11,10 +11,10 @@ "to": [8, 11, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "south": {"uv": [2, 4, 7, 15], "texture": "#side"}, - "west": {"uv": [3, 3, 8, 14], "texture": "#side"}, - "up": {"uv": [11, 11, 16, 16], "rotation": 90, "texture": "#top"}, - "down": {"uv": [11, 0, 16, 5], "rotation": 270, "texture": "#top", "cullface": "down"} + "south": {"uv": [2, 4, 7, 15], "texture": "#side", "tintindex": 0}, + "west": {"uv": [3, 3, 8, 14], "texture": "#side", "tintindex": 0}, + "up": {"uv": [11, 11, 16, 16], "rotation": 90, "texture": "#top", "tintindex": 0}, + "down": {"uv": [11, 0, 16, 5], "rotation": 270, "texture": "#top", "cullface": "down", "tintindex": 0} } }, { @@ -22,10 +22,10 @@ "to": [8, 11, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 1, 7, 12], "texture": "#side"}, - "west": {"uv": [3, 3, 8, 14], "texture": "#side"}, - "up": {"uv": [0, 11, 5, 16], "rotation": 90, "texture": "#top"}, - "down": {"uv": [0, 0, 5, 5], "rotation": 270, "texture": "#top", "cullface": "down"} + "north": {"uv": [2, 1, 7, 12], "texture": "#side", "tintindex": 0}, + "west": {"uv": [3, 3, 8, 14], "texture": "#side", "tintindex": 0}, + "up": {"uv": [0, 11, 5, 16], "rotation": 90, "texture": "#top", "tintindex": 0}, + "down": {"uv": [0, 0, 5, 5], "rotation": 270, "texture": "#top", "cullface": "down", "tintindex": 0} } }, { @@ -33,10 +33,10 @@ "to": [13, 11, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 1, 7, 12], "texture": "#side"}, - "east": {"uv": [0, 0, 5, 11], "texture": "#side"}, - "up": {"uv": [0, 0, 5, 5], "rotation": 90, "texture": "#top"}, - "down": {"uv": [0, 11, 5, 16], "rotation": 270, "texture": "#top", "cullface": "down"} + "north": {"uv": [2, 1, 7, 12], "texture": "#side", "tintindex": 0}, + "east": {"uv": [0, 0, 5, 11], "texture": "#side", "tintindex": 0}, + "up": {"uv": [0, 0, 5, 5], "rotation": 90, "texture": "#top", "tintindex": 0}, + "down": {"uv": [0, 11, 5, 16], "rotation": 270, "texture": "#top", "cullface": "down", "tintindex": 0} } }, { @@ -44,8 +44,8 @@ "to": [9, 11.001, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [7, 7, 9, 9], "rotation": 90, "texture": "#top"}, - "down": {"uv": [7, 7, 9, 9], "rotation": 270, "texture": "#top", "cullface": "down"} + "up": {"uv": [7, 7, 9, 9], "rotation": 90, "texture": "#top", "tintindex": 0}, + "down": {"uv": [7, 7, 9, 9], "rotation": 270, "texture": "#top", "cullface": "down", "tintindex": 0} } }, { @@ -53,10 +53,10 @@ "to": [13, 11, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 0, 5, 11], "texture": "#side"}, - "south": {"uv": [2, 4, 7, 15], "texture": "#side"}, - "up": {"uv": [11, 0, 16, 5], "rotation": 90, "texture": "#top"}, - "down": {"uv": [11, 11, 16, 16], "rotation": 270, "texture": "#top", "cullface": "down"} + "east": {"uv": [0, 0, 5, 11], "texture": "#side", "tintindex": 0}, + "south": {"uv": [2, 4, 7, 15], "texture": "#side", "tintindex": 0}, + "up": {"uv": [11, 0, 16, 5], "rotation": 90, "texture": "#top", "tintindex": 0}, + "down": {"uv": [11, 11, 16, 16], "rotation": 270, "texture": "#top", "cullface": "down", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool_tucked.json b/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool_tucked.json index e8464c4ff..2ce0aabb5 100644 --- a/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/log_stool/log_stool_tucked.json @@ -11,10 +11,10 @@ "to": [16, 11, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "south": {"uv": [2, 4, 7, 15], "texture": "#1"}, - "west": {"uv": [3, 3, 8, 14], "texture": "#1"}, - "up": {"uv": [11, 11, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [11, 0, 16, 5], "rotation": 270, "texture": "#0", "cullface": "down"} + "south": {"uv": [2, 4, 7, 15], "texture": "#1", "tintindex": 0}, + "west": {"uv": [3, 3, 8, 14], "texture": "#1", "tintindex": 0}, + "up": {"uv": [11, 11, 16, 16], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [11, 0, 16, 5], "rotation": 270, "texture": "#0", "cullface": "down", "tintindex": 0} } }, { @@ -22,10 +22,10 @@ "to": [16, 11, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 1, 7, 12], "texture": "#1"}, - "west": {"uv": [3, 3, 8, 14], "texture": "#1"}, - "up": {"uv": [0, 11, 5, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 5, 5], "rotation": 270, "texture": "#0", "cullface": "down"} + "north": {"uv": [2, 1, 7, 12], "texture": "#1", "tintindex": 0}, + "west": {"uv": [3, 3, 8, 14], "texture": "#1", "tintindex": 0}, + "up": {"uv": [0, 11, 5, 16], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 5, 5], "rotation": 270, "texture": "#0", "cullface": "down", "tintindex": 0} } }, { @@ -33,10 +33,10 @@ "to": [21, 11, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 1, 7, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 5, 11], "texture": "#1", "cullface": "east"}, - "up": {"uv": [0, 0, 5, 5], "rotation": 90, "texture": "#0", "cullface": "east"}, - "down": {"uv": [0, 11, 5, 16], "rotation": 270, "texture": "#0", "cullface": "down"} + "north": {"uv": [2, 1, 7, 12], "texture": "#1", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 0, 5, 11], "texture": "#1", "cullface": "east", "tintindex": 0}, + "up": {"uv": [0, 0, 5, 5], "rotation": 90, "texture": "#0", "cullface": "east", "tintindex": 0}, + "down": {"uv": [0, 11, 5, 16], "rotation": 270, "texture": "#0", "cullface": "down", "tintindex": 0} } }, { @@ -44,10 +44,10 @@ "to": [21, 11, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 0, 5, 11], "texture": "#1", "cullface": "east"}, - "south": {"uv": [2, 4, 7, 15], "texture": "#1", "cullface": "east"}, - "up": {"uv": [11, 0, 16, 5], "rotation": 90, "texture": "#0", "cullface": "east"}, - "down": {"uv": [11, 11, 16, 16], "rotation": 270, "texture": "#0", "cullface": "down"} + "east": {"uv": [0, 0, 5, 11], "texture": "#1", "cullface": "east", "tintindex": 0}, + "south": {"uv": [2, 4, 7, 15], "texture": "#1", "cullface": "east", "tintindex": 0}, + "up": {"uv": [11, 0, 16, 5], "rotation": 90, "texture": "#0", "cullface": "east", "tintindex": 0}, + "down": {"uv": [11, 11, 16, 16], "rotation": 270, "texture": "#0", "cullface": "down", "tintindex": 0} } }, { @@ -55,8 +55,8 @@ "to": [17, 11.001, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [7, 7, 9, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [7, 7, 9, 9], "rotation": 270, "texture": "#0", "cullface": "down"} + "up": {"uv": [7, 7, 9, 9], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [7, 7, 9, 9], "rotation": 270, "texture": "#0", "cullface": "down", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/log_table/log_table.json b/common/src/main/resources/assets/pfm/models/block/log_table/log_table.json index 15a95ad96..942adfa73 100644 --- a/common/src/main/resources/assets/pfm/models/block/log_table/log_table.json +++ b/common/src/main/resources/assets/pfm/models/block/log_table/log_table.json @@ -12,12 +12,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { @@ -25,12 +25,12 @@ "to": [4.5, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 6], "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 6], "texture": "#legs"} + "north": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "to": [14, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 6], "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 6], "texture": "#legs"} + "north": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_left.json b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_left.json index 7df2cb278..60b5053d1 100644 --- a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_left.json +++ b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [8.5, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 6], "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 6], "texture": "#legs"} + "north": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_legs.json b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_legs.json index 83bdf76ae..2f410d260 100644 --- a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_legs.json +++ b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_legs.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [4.5, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 6], "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 6], "texture": "#legs"} + "north": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [14, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 6], "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 6], "texture": "#legs"} + "north": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 6], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_middle.json b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_middle.json index 9b1b361c9..2438e8ba2 100644 --- a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_middle.json @@ -11,12 +11,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_right.json b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_right.json index 8bf18504a..a03bcd4ca 100644 --- a/common/src/main/resources/assets/pfm/models/block/log_table/log_table_right.json +++ b/common/src/main/resources/assets/pfm/models/block/log_table/log_table_right.json @@ -10,12 +10,12 @@ "to": [10, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "south": {"uv": [0, 0, 3, 13], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 13], "texture": "#legs"}, - "up": {"uv": [0, 0, 3, 6], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 3, 6], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 13], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 13], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 6], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 6], "rotation": 180, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool.json b/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool.json index 8bed79290..9b7c04db4 100644 --- a/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool.json +++ b/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool.json @@ -11,10 +11,10 @@ "to": [9, 10, 9.125], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 9], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 9], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 9], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 9], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 9], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 9], "texture": "#legs", "tintindex": 0} } }, { @@ -22,12 +22,12 @@ "to": [11, 1, 11.125], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#legs"}, - "south": {"uv": [0, 0, 6, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 6, 6], "texture": "#legs"}, - "down": {"uv": [0, 0, 6, 6], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 6, 1], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 1], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 6, 1], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 1], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 6, 6], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 6, 6], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -35,12 +35,12 @@ "to": [11.5, 12, 11.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 7, 2], "texture": "#base"}, - "east": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "south": {"uv": [0, 0, 7, 2], "texture": "#base"}, - "west": {"uv": [1, 5, 10, 7], "texture": "#base"}, - "up": {"uv": [1, 1, 8, 8], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 1, 8, 8], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 7, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 7, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 5, 10, 7], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 8, 8], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 1, 8, 8], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -48,11 +48,11 @@ "to": [6.5, 15, 11.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 2, 5], "texture": "#base"}, - "east": {"uv": [1, 2, 8, 5], "texture": "#base"}, - "south": {"uv": [0, 2, 2, 5], "texture": "#base"}, - "west": {"uv": [1, 2, 8, 5], "texture": "#base"}, - "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 2, 2, 5], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 2, 8, 5], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 5], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 2, 8, 5], "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool_tucked.json b/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool_tucked.json index 5fd2a869d..652d392e3 100644 --- a/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/modern_stool/modern_stool_tucked.json @@ -11,10 +11,10 @@ "to": [17, 10, 9.125], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 9], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 9], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 9], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 9], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 9], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 9], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 9], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 9], "texture": "#legs", "tintindex": 0} } }, { @@ -22,12 +22,12 @@ "to": [19, 1, 11.125], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 1], "texture": "#legs"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 6, 1], "texture": "#legs"}, - "west": {"uv": [0, 0, 6, 1], "texture": "#legs"}, - "up": {"uv": [0, 0, 6, 6], "texture": "#legs"}, - "down": {"uv": [0, 0, 6, 6], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 6, 1], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 1], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 6, 1], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 6, 1], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 6, 6], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 6, 6], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -35,12 +35,12 @@ "to": [19.5, 12, 11.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 7, 2], "texture": "#base"}, - "east": {"uv": [0, 0, 9, 2], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 7, 2], "texture": "#base"}, - "west": {"uv": [1, 5, 10, 7], "texture": "#base"}, - "up": {"uv": [1, 1, 8, 8], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 1, 8, 8], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 7, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 9, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 7, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 5, 10, 7], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 8, 8], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 1, 8, 8], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -48,11 +48,11 @@ "to": [14.5, 15, 11.625], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 2, 5], "texture": "#base"}, - "east": {"uv": [1, 2, 8, 5], "texture": "#base"}, - "south": {"uv": [0, 2, 2, 5], "texture": "#base"}, - "west": {"uv": [1, 2, 8, 5], "texture": "#base"}, - "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base"} + "north": {"uv": [0, 2, 2, 5], "texture": "#base", "tintindex": 0}, + "east": {"uv": [1, 2, 8, 5], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 2, 2, 5], "texture": "#base", "tintindex": 0}, + "west": {"uv": [1, 2, 8, 5], "texture": "#base", "tintindex": 0}, + "up": {"uv": [6, 1, 11, 2], "rotation": 90, "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_left.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_left.json index 72c43f956..0457e0641 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_left.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_left.json @@ -1,7 +1,7 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks" + "0": "block/oak_planks" }, "elements": [ { @@ -9,10 +9,10 @@ "to": [3, 0, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 3, 8], "texture": "#0"}, - "east": {"uv": [0, 2, 3, 8], "texture": "#0"}, - "south": {"uv": [0, 2, 3, 8], "texture": "#0"}, - "west": {"uv": [0, 2, 3, 8], "texture": "#0"} + "north": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_right.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_right.json index 8cd120694..0c7490dd1 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_right.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/foot/simple_bed_foot_right.json @@ -1,7 +1,7 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks" + "0": "block/oak_planks" }, "elements": [ { @@ -9,10 +9,10 @@ "to": [16, 0, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 3, 8], "texture": "#0"}, - "east": {"uv": [0, 2, 3, 8], "texture": "#0"}, - "south": {"uv": [0, 2, 3, 8], "texture": "#0"}, - "west": {"uv": [0, 2, 3, 8], "texture": "#0"} + "north": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 2, 3, 8], "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/head/simple_bed_head.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/head/simple_bed_head.json index cb6c596bf..32982ab87 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/head/simple_bed_head.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/bunk/head/simple_bed_head.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,11 +10,11 @@ "to": [16, 0, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#0"}, - "east": {"uv": [0, 2, 3, 4], "texture": "#0"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#0"}, - "west": {"uv": [0, 2, 3, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 2, 16, 4], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 2, 3, 4], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 2, 16, 4], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 2, 3, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -22,9 +22,9 @@ "to": [13, 2, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 10], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 10, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 10, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 10], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -32,10 +32,10 @@ "to": [16, 2, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -43,10 +43,10 @@ "to": [3, 2, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot.json index 796e510fa..378760f40 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot.json @@ -1,7 +1,7 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks" + "0": "block/oak_planks" }, "elements": [ { @@ -9,9 +9,9 @@ "to": [16, 5, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "west": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0"} + "east": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -19,12 +19,12 @@ "to": [16, 10, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 8], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 8], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 7], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 16, 8], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 8], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 8], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 8], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 7], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_left.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_left.json index 6a49f2064..927224b90 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_left.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,11 +10,11 @@ "to": [3, 2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_right.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_right.json index f342b9fb6..e0dd7cabd 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_right.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/foot/simple_bed_foot_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,11 +10,11 @@ "to": [16, 2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/full/simple_bed.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/full/simple_bed.json index 913298b05..fd1e08204 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/full/simple_bed.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/full/simple_bed.json @@ -9,86 +9,86 @@ "from": [29, 2, 0], "to": [32, 14, 16], "faces": { - "north": {"uv": [0, 0, 3, 12], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 12], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 12], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 3], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 3, 16], "texture": "#0"} + "north": {"uv": [0, 0, 3, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 3], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0} } }, { "from": [29, 0, 13], "to": [32, 2, 16], "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "texture": "#0", "tintindex": 0} } }, { "from": [29, 0, 0], "to": [32, 2, 3], "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "texture": "#0", "tintindex": 0} } }, { "from": [16, 2, 0], "to": [29, 5, 16], "faces": { - "north": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "south": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "texture": "#0"} + "north": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "texture": "#0", "tintindex": 0} } }, { "from": [3, 2, 0], "to": [16, 5, 16], "faces": { - "north": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "south": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "texture": "#0"} + "north": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "texture": "#0", "tintindex": 0} } }, { "from": [0, 0, 0], "to": [3, 2, 3], "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "texture": "#0", "tintindex": 0} } }, { "from": [0, 0, 13], "to": [3, 2, 16], "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "texture": "#0", "tintindex": 0} } }, { "from": [0, 2, 0], "to": [3, 10, 16], "faces": { - "north": {"uv": [0, 0, 3, 8], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 8], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#0"}, - "up": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 3, 16], "texture": "#0"} + "north": {"uv": [0, 0, 3, 8], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 16, 8], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 8], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 16, 8], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 16], "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head.json index 9f01bf646..a29b6b9fe 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [16, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 12], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 12], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 3], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 16, 12], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 12], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 16, 12], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 12], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 16, 3], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } }, { @@ -23,9 +23,9 @@ "to": [16, 5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "east": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "west": {"uv": [0, 1, 13, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0"} + "east": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1, 13, 4], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 16], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_left.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_left.json index d904cac86..2c407f162 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_left.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,11 +10,11 @@ "to": [3, 2, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_right.json b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_right.json index 107001055..a05290a82 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_right.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bed/template/head/simple_bed_head_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,11 +10,11 @@ "to": [16, 2, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 3, 2], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder.json b/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder.json index eae66e1c5..0d7033f04 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [12, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [12, 8, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "to": [12, 13, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "to": [14, 15, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -62,12 +62,12 @@ "to": [4, 15, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder_top.json b/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder_top.json index 9c4bbf5b9..67536e43a 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder_top.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_bunk_ladder/simple_ladder_top.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "0": "minecraft:block/oak_planks", - "particle": "minecraft:block/oak_planks" + "0": "block/oak_planks", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [12, 4, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [12, 9, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "to": [12, 14, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "to": [14, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0", "tintindex": 0} } }, { @@ -62,12 +62,12 @@ "to": [4, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 16], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#0", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool.json b/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool.json index ee34c4d37..98c0de57b 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [5.5, 10, 5.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "to": [12.5, 10, 5.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "to": [12.5, 10, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "to": [12.5, 12, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "east": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "south": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "west": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "up": {"uv": [1, 1, 10, 10], "texture": "#base"}, - "down": {"uv": [1, 1, 10, 10], "texture": "#base"} + "north": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "south": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 10, 10], "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 1, 10, 10], "texture": "#base", "tintindex": 0} } }, { @@ -63,12 +63,12 @@ "to": [5.5, 10, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool_tucked.json b/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool_tucked.json index 1b1215e9d..e0df92334 100644 --- a/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool_tucked.json +++ b/common/src/main/resources/assets/pfm/models/block/simple_stool/simple_stool_tucked.json @@ -11,11 +11,11 @@ "to": [20.5, 10, 5.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -23,11 +23,11 @@ "to": [20.5, 10, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "cullface": "east", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -35,11 +35,11 @@ "to": [13.5, 10, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } }, { @@ -47,12 +47,12 @@ "to": [20.5, 12, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "east": {"uv": [0, 0, 9, 2], "texture": "#base", "cullface": "east"}, - "south": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "west": {"uv": [0, 0, 9, 2], "texture": "#base"}, - "up": {"uv": [1, 1, 10, 10], "rotation": 90, "texture": "#base"}, - "down": {"uv": [1, 1, 10, 10], "rotation": 270, "texture": "#base"} + "north": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [0, 0, 9, 2], "texture": "#base", "cullface": "east", "tintindex": 0}, + "south": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "west": {"uv": [0, 0, 9, 2], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 10, 10], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [1, 1, 10, 10], "rotation": 270, "texture": "#base", "tintindex": 0} } }, { @@ -60,11 +60,11 @@ "to": [13.5, 10, 5.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down"} + "north": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 10], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "cullface": "down", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic.json index 87cd1e3c8..5ac82e6ae 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,12 +12,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { @@ -25,12 +25,12 @@ "to": [14, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "to": [14, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -51,12 +51,12 @@ "to": [4, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -77,12 +77,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -90,12 +90,12 @@ "to": [4, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_base.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_base.json index 9b1b361c9..2438e8ba2 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_base.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_base.json @@ -11,12 +11,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_north.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_north.json index 78fb48134..aac1f9b00 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_north.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_north.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 9], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 11], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_south.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_south.json index 01fed7985..67b9cfe4f 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_south.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_east_west_south.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,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"} + "north": {"uv": [1, 0, 3, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 9], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 11], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east.json index a03a45239..8cb889b26 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "to": [14, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east_corner.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east_corner.json index ad96c33df..52446e87f 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_east_corner.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east.json index 3b7c49428..d26e13532 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,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"} + "north": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 4, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 0, 4, 16], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_bottom.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_bottom.json index c474cd7a1..3007fd067 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_bottom.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_bottom.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_top.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_top.json index 77db7251a..57d64d3fe 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_top.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_east_top.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west.json index 5ca9e8be0..975be1dc5 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 0, 4, 16], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 0, 4, 16], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_bottom.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_bottom.json index 2bbf4add0..5718e6de3 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_bottom.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_bottom.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_top.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_top.json index bfc60e1e1..fdf18e3be 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_top.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_south_west_top.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "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"} + "north": {"uv": [1, 0, 3, 12], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [2, 1, 4, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [2, 2, 4, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 3, 2, 15], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west.json index 0a5ff2b0e..d0f778a73 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "to": [4, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west_corner.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west_corner.json index 640c11296..6f2ebae0a 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_north_west_corner.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east.json index d8d5acce6..04c6144cc 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "to": [14, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east_corner.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east_corner.json index b32349be6..eaffaee45 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_east_corner.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west.json index df4b182b5..ef4725a0b 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,12 @@ "to": [4, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west_corner.json b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west_corner.json index 15790b553..92a315ea5 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west_corner.json +++ b/common/src/main/resources/assets/pfm/models/block/table_basic/table_basic_south_west_corner.json @@ -1,9 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +10,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"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic.json b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic.json index 80271de4d..e32051206 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic.json +++ b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } }, { @@ -24,12 +24,12 @@ "to": [14, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -37,12 +37,12 @@ "to": [14, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -50,12 +50,12 @@ "to": [4, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -63,12 +63,12 @@ "to": [4, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_middle.json b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_middle.json index 11cf09b66..49b856215 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_middle.json @@ -10,12 +10,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one.json b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one.json index 3ec3161a8..e8ba600fa 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one.json +++ b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [4, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one_uved.json b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one_uved.json index 1b42063cf..8ae258cdc 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one_uved.json +++ b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_one_uved.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "legs": "minecraft:block/oak_log", - "particle": "minecraft:block/oak_planks" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [14, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two.json b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two.json index 1435b656c..b8e6d7fd0 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two.json +++ b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two.json @@ -1,7 +1,7 @@ { "credit": "By UnlikePaladin", "textures": { - "legs": "minecraft:block/oak_log" + "legs": "block/oak_log" }, "elements": [ { @@ -9,12 +9,12 @@ "to": [14, 15, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two_uved.json b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two_uved.json index a56bad0f1..2d252770d 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two_uved.json +++ b/common/src/main/resources/assets/pfm/models/block/table_classic/table_classic_two_uved.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [4, 15, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 15], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 15], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner.json b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner.json index d253dd994..cb8d50807 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner.json +++ b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner.json @@ -1,9 +1,9 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "minecraft:block/oak_planks", - "base": "minecraft:block/oak_planks", - "legs": "minecraft:block/oak_log" + "particle": "block/oak_planks", + "base": "block/oak_planks", + "legs": "block/oak_log" }, "elements": [ { @@ -12,12 +12,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 0, 13, 14], "rotation": 90, "texture": "#base", "tintindex": 0} } }, { @@ -25,12 +25,12 @@ "to": [14, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -38,12 +38,12 @@ "to": [14, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -51,12 +51,12 @@ "to": [15, 14, 9], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -64,12 +64,12 @@ "to": [3, 14, 9], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -77,12 +77,12 @@ "to": [4, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -90,12 +90,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -103,12 +103,12 @@ "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"} + "north": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -116,12 +116,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -129,12 +129,12 @@ "to": [4, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_base.json b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_base.json index 385686513..b4639d449 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_base.json +++ b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_base.json @@ -11,12 +11,12 @@ "to": [16, 16, 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"} + "north": {"uv": [0, 0, 14, 2], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "south": {"uv": [1, 1, 15, 3], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 1, 7, 14], "rotation": 90, "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 1, 15, 14], "texture": "#base", "tintindex": 0}, + "down": {"uv": [0, 1, 14, 14], "texture": "#base", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_left.json b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_left.json index 7daae3017..378821b62 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_left.json +++ b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_left.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [15, 14, 9], "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 6.83333, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [14, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 6.83333, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "to": [14, 2, 12], "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 6.83333, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 8], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "to": [13, 4, 9], "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 6.83333, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [1, 1, 3, 3], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 270, "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 14], "rotation": 270, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [1, 1, 3, 3], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 14], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 14], "rotation": 270, "texture": "#legs", "tintindex": 0} } }, { @@ -62,12 +62,12 @@ "to": [14, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 6.83333, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_legs.json b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_legs.json index eb22be7f7..9ce9ba01f 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_legs.json +++ b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_legs.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [14, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [14, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "to": [15, 14, 9], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "to": [3, 14, 9], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -62,12 +62,12 @@ "to": [4, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -75,12 +75,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -88,12 +88,12 @@ "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"} + "north": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -101,12 +101,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -114,12 +114,12 @@ "to": [4, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json index fe43da1d2..205890fba 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json +++ b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_middle.json @@ -9,12 +9,12 @@ "to": [16, 4, 9], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 3], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs", "tintindex": 0} } } ], diff --git a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_right.json b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_right.json index a63aa94d8..944ef0993 100644 --- a/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_right.json +++ b/common/src/main/resources/assets/pfm/models/block/table_modern_dinner/table_modern_dinner_right.json @@ -1,8 +1,8 @@ { "credit": "By UnlikePaladin", "textures": { - "particle": "block/oak_planks", - "legs": "block/oak_log" + "legs": "block/oak_log", + "particle": "block/oak_planks" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [3, 14, 9], "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 12], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 12], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -23,12 +23,12 @@ "to": [4, 14, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 3]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } }, { @@ -36,12 +36,12 @@ "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"} + "north": {"uv": [0, 0, 2, 2], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 8], "rotation": 270, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 8], "rotation": 180, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 8], "texture": "#legs", "tintindex": 0} } }, { @@ -49,12 +49,12 @@ "to": [16, 4, 9], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, - "east": {"uv": [1, 1, 3, 3], "rotation": 90, "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs"}, - "west": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#legs"}, - "up": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs"}, - "down": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs"} + "north": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "east": {"uv": [1, 1, 3, 3], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 1, 2, 14], "rotation": 90, "texture": "#legs", "tintindex": 0} } }, { @@ -62,12 +62,12 @@ "to": [4, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 13]}, "faces": { - "north": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "east": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "south": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "west": {"uv": [0, 0, 2, 14], "texture": "#legs"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#legs"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#legs"} + "north": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "east": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "south": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "west": {"uv": [0, 0, 2, 14], "texture": "#legs", "tintindex": 0}, + "up": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0}, + "down": {"uv": [0, 0, 2, 2], "texture": "#legs", "tintindex": 0} } } ], diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/ColorRegistryImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/ColorRegistryImpl.java index 6b0acf149..bda873caa 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/ColorRegistryImpl.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/client/fabric/ColorRegistryImpl.java @@ -20,4 +20,12 @@ public static void registerBlockToRenderLayer(Block block, RenderLayer renderLay public static void registerItemColor(Item item, ItemColorProvider colorProvider) { ColorProviderRegistry.ITEM.register(colorProvider, item); } + + public static BlockColorProvider getBlockColor(Block block) { + return ColorProviderRegistry.BLOCK.get(block); + } + + public static ItemColorProvider getItemColor(Item item) { + return ColorProviderRegistry.ITEM.get(item); + } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/BlockColorsExtension.java b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/BlockColorsExtension.java new file mode 100644 index 000000000..d51632c99 --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/BlockColorsExtension.java @@ -0,0 +1,11 @@ +package com.unlikepaladin.pfm.client.forge; + +import net.minecraft.block.Block; +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraftforge.registries.IRegistryDelegate; + +import java.util.Map; + +public interface BlockColorsExtension { + Map, BlockColorProvider> getColorMap(); +} diff --git a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryForge.java b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryForge.java index 0218c52e1..d7158d84b 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryForge.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryForge.java @@ -1,29 +1,23 @@ package com.unlikepaladin.pfm.client.forge; -import com.unlikepaladin.pfm.blocks.*; import com.unlikepaladin.pfm.client.ColorRegistry; -import com.unlikepaladin.pfm.data.FurnitureBlock; -import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems; -import net.minecraft.block.Block; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayers; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ColorHandlerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import java.util.ArrayList; -import java.util.List; - @Mod.EventBusSubscriber(modid = "pfm", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class ColorRegistryForge { @SubscribeEvent public static void registerBlockColors(ColorHandlerEvent.Block event){ + ColorRegistryImpl.blockColors = event.getBlockColors(); ColorRegistry.registerBlockColors(); ColorRegistryImpl.BLOCK_COLOR_PROVIDER_MAP.forEach((block, blockColorProvider) -> event.getBlockColors().registerColorProvider(blockColorProvider, block)); } @SubscribeEvent public static void registerItemColors(ColorHandlerEvent.Item event){ + ColorRegistryImpl.itemColors = event.getItemColors(); ColorRegistry.registerItemColors(); ColorRegistryImpl.ITEM_COLOR_PROVIDER_MAP.forEach((item, colorProvider) -> event.getItemColors().register(colorProvider, item)); } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryImpl.java index 02d51b76e..63ab5d58b 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryImpl.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ColorRegistryImpl.java @@ -2,7 +2,9 @@ import net.minecraft.block.Block; import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.item.ItemColorProvider; +import net.minecraft.client.color.item.ItemColors; import net.minecraft.client.render.RenderLayer; import net.minecraft.item.Item; @@ -14,6 +16,8 @@ public class ColorRegistryImpl { public static final Map BLOCK_RENDER_LAYER_MAP = new HashMap<>(); public static final Map ITEM_COLOR_PROVIDER_MAP = new HashMap<>(); + public static BlockColors blockColors; + public static ItemColors itemColors; public static void registerBlockColor(Block block, BlockColorProvider blockColorProvider) { BLOCK_COLOR_PROVIDER_MAP.put(block, blockColorProvider); @@ -26,4 +30,18 @@ public static void registerBlockToRenderLayer(Block block, RenderLayer renderLay public static void registerItemColor(Item item, ItemColorProvider colorProvider) { ITEM_COLOR_PROVIDER_MAP.put(item, colorProvider); } + + public static BlockColorProvider getBlockColor(Block block) { + if (BLOCK_COLOR_PROVIDER_MAP.containsKey(block)) { + return BLOCK_COLOR_PROVIDER_MAP.get(block); + } + return ((BlockColorsExtension) blockColors).getColorMap().get(block.delegate); + } + + public static ItemColorProvider getItemColor(Item item) { + if (ITEM_COLOR_PROVIDER_MAP.containsKey(item)) { + return ITEM_COLOR_PROVIDER_MAP.get(item); + } + return ((ItemColorsExtension) itemColors).getColorMap().get(item.delegate); + } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ItemColorsExtension.java b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ItemColorsExtension.java new file mode 100644 index 000000000..b3e21c3d8 --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/client/forge/ItemColorsExtension.java @@ -0,0 +1,13 @@ +package com.unlikepaladin.pfm.client.forge; + +import net.minecraft.block.Block; +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.item.ItemColorProvider; +import net.minecraft.item.Item; +import net.minecraftforge.registries.IRegistryDelegate; + +import java.util.Map; + +public interface ItemColorsExtension { + Map, ItemColorProvider> getColorMap(); +} diff --git a/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/BlockColorsAccessor.java b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/BlockColorsAccessor.java new file mode 100644 index 000000000..d4ff60d69 --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/BlockColorsAccessor.java @@ -0,0 +1,25 @@ +package com.unlikepaladin.pfm.mixin.forge; + +import com.unlikepaladin.pfm.client.forge.BlockColorsExtension; +import net.minecraft.block.Block; +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.block.BlockColors; +import net.minecraftforge.registries.IRegistryDelegate; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.HashMap; +import java.util.Map; + +@Mixin(BlockColors.class) +public class BlockColorsAccessor implements BlockColorsExtension { + + @Shadow + private final Map, BlockColorProvider> f_92571_ = new HashMap<>(); + + @Override + public Map, BlockColorProvider> getColorMap() { + return f_92571_; + } +} diff --git a/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/ItemColorsAccessor.java b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/ItemColorsAccessor.java new file mode 100644 index 000000000..f60cf22bf --- /dev/null +++ b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/ItemColorsAccessor.java @@ -0,0 +1,28 @@ +package com.unlikepaladin.pfm.mixin.forge; + +import com.unlikepaladin.pfm.client.forge.BlockColorsExtension; +import com.unlikepaladin.pfm.client.forge.ItemColorsExtension; +import net.minecraft.block.Block; +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.block.BlockColors; +import net.minecraft.client.color.item.ItemColorProvider; +import net.minecraft.client.color.item.ItemColors; +import net.minecraft.item.Item; +import net.minecraftforge.registries.IRegistryDelegate; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import java.util.HashMap; +import java.util.Map; + +@Mixin(ItemColors.class) +public class ItemColorsAccessor implements ItemColorsExtension { + + @Shadow + private final Map, ItemColorProvider> f_92674_ = new HashMap<>(); + + @Override + public Map, ItemColorProvider> getColorMap() { + return f_92674_; + } +} diff --git a/forge/src/main/resources/pfm.mixins.json b/forge/src/main/resources/pfm.mixins.json index 0ba7b8dd2..e29351321 100755 --- a/forge/src/main/resources/pfm.mixins.json +++ b/forge/src/main/resources/pfm.mixins.json @@ -4,6 +4,8 @@ "package": "com.unlikepaladin.pfm.mixin.forge", "compatibilityLevel": "JAVA_8", "client": [ + "BlockColorsAccessor", + "ItemColorsAccessor", "ItemRendererMixin", "PFMModelLoaderMixin", "PFMRenderLayersForgeMixin" From d84fbe4a9ca5bda1d4210c3af635ad3e4701dce7 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sat, 12 Oct 2024 21:53:59 -0600 Subject: [PATCH 2/4] Shower can now be toggled on and off with the hand by clicking Added book entries for toaster, shower and bathtub --- .../pfm/blocks/BasicShowerHeadBlock.java | 27 +++++++++++++--- .../blockentities/ShowerHeadBlockEntity.java | 6 ++-- .../pfm/runtime/data/PFMRecipeProvider.java | 8 ++--- .../en_us/categories/bathtub_category.json | 5 +++ .../en_us/categories/shower_category.json | 5 +++ .../en_us/categories/toaster_category.json | 5 +++ .../en_us/entries/bathtub_crafting_entry.json | 15 +++++++++ .../en_us/entries/bathtub_usage_entry.json | 15 +++++++++ .../en_us/entries/shower_crafting_entry.json | 16 ++++++++++ .../en_us/entries/shower_usage_entry.json | 15 +++++++++ .../en_us/entries/sink_crafting_entry.json | 4 +-- .../en_us/entries/toaster_crafting_entry.json | 15 +++++++++ .../en_us/entries/toaster_recipe_entry.json | 32 +++++++++++++++++++ .../en_us/entries/toaster_usage_entry.json | 15 +++++++++ 14 files changed, 171 insertions(+), 12 deletions(-) create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/bathtub_category.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/shower_category.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/toaster_category.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_crafting_entry.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_usage_entry.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_crafting_entry.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_usage_entry.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_crafting_entry.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_recipe_entry.json create mode 100644 common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_usage_entry.json diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicShowerHeadBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicShowerHeadBlock.java index 4c5360ff0..f6bacec33 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicShowerHeadBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicShowerHeadBlock.java @@ -1,16 +1,19 @@ package com.unlikepaladin.pfm.blocks; import com.unlikepaladin.pfm.blocks.blockentities.ShowerHeadBlockEntity; +import com.unlikepaladin.pfm.items.LightSwitchItem; +import com.unlikepaladin.pfm.items.ShowerHandleItem; import com.unlikepaladin.pfm.registry.BlockEntities; import dev.architectury.injectables.annotations.ExpectPlatform; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.ShapeContext; +import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; @@ -70,6 +73,22 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po }; } + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (player.getStackInHand(hand).getItem() instanceof ShowerHandleItem) + return super.onUse(state, world, pos, player, hand, hit); + + if (world.isClient) { + return ActionResult.SUCCESS; + } + if (world.getBlockEntity(pos) instanceof ShowerHeadBlockEntity) { + ShowerHeadBlockEntity showerHeadBlockEntity = (ShowerHeadBlockEntity) world.getBlockEntity(pos); + showerHeadBlockEntity.setOpen(!showerHeadBlockEntity.isOpen()); + world.updateListeners(pos, state, state, Block.NOTIFY_LISTENERS); + } + return super.onUse(state, world, pos, player, hand, hit); + } + @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { return checkType(type, BlockEntities.SHOWER_HEAD_BLOCK_ENTITY, ShowerHeadBlockEntity::tick); diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java index 6c48279a1..4022dc994 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java @@ -39,9 +39,11 @@ public void readNbt(NbtCompound nbt) { super.readNbt(nbt); } + public boolean isOpen() { + return isOpen; + } + public void setOpen(boolean isOpen) { - if (isOpen){ - } this.isOpen = isOpen; } 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 9aeb415d5..e0407f8fb 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 @@ -604,8 +604,8 @@ else if (block == PaladinFurnitureModBlocksItems.WHITE_MODERN_PENDANT) } if (!generatedRecipes.contains(getId(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HEAD))) { - offerShowerHeadRecipe(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HEAD, Ingredient.ofItems(Blocks.LIGHT_GRAY_CONCRETE), exporter); - offerShowerHandleRecipe(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HANDLE_ITEM, Ingredient.ofItems(Blocks.LIGHT_GRAY_CONCRETE), exporter); + offerShowerHeadRecipe(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HEAD, Ingredient.ofItems(Items.WATER_BUCKET), exporter); + offerShowerHandleRecipe(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HANDLE_ITEM, Ingredient.ofItems(Blocks.LEVER), exporter); generatedRecipes.add(getId(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HEAD)); generatedRecipes.add(Registry.ITEM.getId(PaladinFurnitureModBlocksItems.BASIC_SHOWER_HANDLE_ITEM)); } @@ -912,11 +912,11 @@ public static void offerBathtubRecipe(ItemConvertible output, Ingredient base, C } public static void offerShowerHeadRecipe(ItemConvertible output, Ingredient base, Consumer exporter) { - FurnitureRecipeJsonFactory.create(output, 1).group("bathroom").criterion("has_" + getItemPath(base), conditionsFromIngredient(base)).input(base, 3).input(Items.WATER_BUCKET, 1).input(Items.IRON_INGOT, 1).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + FurnitureRecipeJsonFactory.create(output, 1).group("bathroom").criterion("has_" + getItemPath(base), conditionsFromIngredient(base)).input(base, 1).input(Items.REDSTONE, 1).input(Items.IRON_INGOT, 1).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); } public static void offerShowerHandleRecipe(ItemConvertible output, Ingredient base, Consumer exporter) { - FurnitureRecipeJsonFactory.create(output, 1).group("bathroom").criterion("has_" + getItemPath(base), conditionsFromIngredient(base)).input(base, 4).input(Items.REDSTONE, 1).input(Items.IRON_INGOT, 1).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + FurnitureRecipeJsonFactory.create(output, 1).group("bathroom").criterion("has_" + getItemPath(base), conditionsFromIngredient(base)).input(base, 2).input(Items.REDSTONE, 1).input(Items.IRON_INGOT, 1).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); } public static void offerShowerTowelRecipe(ItemConvertible output, Ingredient base, Consumer exporter) { diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/bathtub_category.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/bathtub_category.json new file mode 100644 index 000000000..7e5a220c1 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/bathtub_category.json @@ -0,0 +1,5 @@ +{ + "name": "Bathtub", + "description": "Everything related to the mod's bathtub", + "icon": "pfm:basic_bathtub" +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/shower_category.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/shower_category.json new file mode 100644 index 000000000..20d242775 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/shower_category.json @@ -0,0 +1,5 @@ +{ + "name": "Shower", + "description": "Everything related to the mod's shower", + "icon": "pfm:basic_shower_head" +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/toaster_category.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/toaster_category.json new file mode 100644 index 000000000..51eaeed68 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/categories/toaster_category.json @@ -0,0 +1,5 @@ +{ + "name": "Toaster", + "description": "Everything related to the mod's toaster", + "icon": "pfm:iron_toaster" +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_crafting_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_crafting_entry.json new file mode 100644 index 000000000..ac947c3b0 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_crafting_entry.json @@ -0,0 +1,15 @@ +{ + "name": "Crafting: Bathtub", + "icon": "minecraft:water_bucket", + "category": "pfm:bathtub_category", + "pages": [ + { + "type": "patchouli:text", + "text": "The bathtub can be crafted with quartz, a stone button and a bucket." + }, + { + "type": "pfm:furniturerecipetemplate", + "recipe": "pfm:basic_bathtub" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_usage_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_usage_entry.json new file mode 100644 index 000000000..db2586242 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/bathtub_usage_entry.json @@ -0,0 +1,15 @@ +{ + "name": "Usage: Bathtub", + "icon": "pfm:basic_bathtub", + "category": "pfm:bathtub_category", + "pages": [ + { + "type": "patchouli:text", + "text": "The bathtub works mostly like a cauldron, it can be filled with a water bucket or bottle, or if there's a water source one block underground you can grab that water too. It can be used to remove dye off of armor and shulker boxes, it can extinguish fire and it outputs a comparator signal as well. During the day you can also sit in it, and at night sleep in it." + }, + { + "type": "patchouli:empty", + "draw_filler": "false" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_crafting_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_crafting_entry.json new file mode 100644 index 000000000..fa06872e1 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_crafting_entry.json @@ -0,0 +1,16 @@ +{ + "name": "Crafting: Shower Items", + "icon": "minecraft:basic_shower_head", + "category": "pfm:shower_category", + "pages": [ + { + "type": "patchouli:text", + "text": "The handle can be crafted with 2 levers, 1 redstone and 1 iron ingot. To craft the head, you'll need 1 water bucket, 1 redstone and an iron ingot." + }, + { + "type": "pfm:furniturerecipe2template", + "recipe": "pfm:basic_shower_head", + "recipe2": "pfm:basic_shower_handle" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_usage_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_usage_entry.json new file mode 100644 index 000000000..582c709ef --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/shower_usage_entry.json @@ -0,0 +1,15 @@ +{ + "name": "Usage: Shower Items", + "icon": "pfm:basic_shower_handle", + "category": "pfm:shower_category", + "pages": [ + { + "type": "patchouli:text", + "text": "The shower is mostly decorational, to turn the head on, you can right click on it, or connect it to a shower handle. To link them, place the head down, then right click on it with the handle, once you've placed the handle down it will be connected." + }, + { + "type": "patchouli:empty", + "draw_filler": "false" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/sink_crafting_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/sink_crafting_entry.json index a28999569..7240399fd 100644 --- a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/sink_crafting_entry.json +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/sink_crafting_entry.json @@ -5,12 +5,12 @@ "pages": [ { "type": "patchouli:text", - "text": "There are many variations of the kitchen sink, you'll need planks, logs, or stones depending on which type you're crafting, an iron ingot and a bucket. To get the different wood types just replace the oak with the wood type you want the sink to be." + "text": "There are 2 sink styles, one of them with many variations to match kitchen counters, you'll need quartz, or planks, logs, or stone depending on which sink type you're crafting, and an iron ingot and a bucket. To get the different wood or stone types just replace the oak with the wood material you want to use for crafting." }, { "type": "pfm:furniturerecipe2template", "recipe": "pfm:oak_kitchen_sink", - "recipe2": "pfm:stripped_oak_kitchen_sink" + "recipe2": "pfm:basic_sink" }, { "type": "pfm:furniturerecipe2template", diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_crafting_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_crafting_entry.json new file mode 100644 index 000000000..1c04ac2bd --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_crafting_entry.json @@ -0,0 +1,15 @@ +{ + "name": "Crafting: Toaster", + "icon": "minecraft:iron_ingot", + "category": "pfm:toaster_category", + "pages": [ + { + "type": "patchouli:text", + "text": "To craft the toaster you will need redstone dust, iron, and iron, put these in the Wood Working Table to craft one." + }, + { + "type": "pfm:furniturerecipetemplate", + "recipe": "pfm:iron_toaster" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_recipe_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_recipe_entry.json new file mode 100644 index 000000000..31940b06f --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_recipe_entry.json @@ -0,0 +1,32 @@ +{ + "name": "Recipes: Toaster", + "icon": "minecraft:baked_potato", + "category": "pfm:toaster_category", + "pages": [ + { + "type": "patchouli:text", + "text": "The toaster unlike a furnace or smoker does not need any fuel but any smoker recipes will work." + }, + { + "type": "pfm:stoverecipe2template", + "recipe": "minecraft:baked_potato_from_smoking", + "recipe2": "minecraft:cooked_beef_from_smoking", + "recipe3": "minecraft:cooked_chicken_from_smoking", + "customicon": "pfm:iron_toaster" + }, + { + "type": "pfm:stoverecipe2template", + "recipe": "minecraft:cooked_cod_from_smoking", + "recipe2": "minecraft:cooked_salmon_from_smoking", + "recipe3": "minecraft:cooked_mutton_from_smoking", + "customicon": "pfm:iron_toaster" + }, + { + "type": "pfm:stoverecipe2template", + "recipe": "minecraft:cooked_rabbit_from_smoking", + "recipe2": "minecraft:dried_kelp_from_smoking", + "recipe3": "", + "customicon": "pfm:iron_toaster" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_usage_entry.json b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_usage_entry.json new file mode 100644 index 000000000..533fcf4c2 --- /dev/null +++ b/common/src/main/resources/data/pfm/patchouli_books/guide_book/en_us/entries/toaster_usage_entry.json @@ -0,0 +1,15 @@ +{ + "name": "Usage: Toaster", + "icon": "minecraft:redstone", + "category": "pfm:toaster_category", + "pages": [ + { + "type": "patchouli:text", + "text": "The use the toaster right click on it with what you want to toast. This will insert the item, into it, you can then shift right click it to start toasting, once done right click to get your toasted food back." + }, + { + "type": "patchouli:empty", + "draw_filler": "false" + } + ] +} \ No newline at end of file From 2d9ca272df4e2d91a3c3aa34f15f7a6be6c21133 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sat, 12 Oct 2024 22:19:41 -0600 Subject: [PATCH 3/4] Fix the wooden parts of lamps being dyed the wrong color --- .../unlikepaladin/pfm/client/ColorRegistry.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 e2a59a2fb..2a84f7bf6 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/client/ColorRegistry.java @@ -4,6 +4,9 @@ import com.unlikepaladin.pfm.blocks.*; import com.unlikepaladin.pfm.blocks.blockentities.LampBlockEntity; import com.unlikepaladin.pfm.data.FurnitureBlock; +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.registry.PaladinFurnitureModBlocksItems; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.block.Block; @@ -16,6 +19,7 @@ import net.minecraft.client.render.RenderLayers; import net.minecraft.item.Item; import net.minecraft.util.DyeColor; +import net.minecraft.util.Identifier; import java.util.ArrayList; import java.util.List; @@ -31,11 +35,15 @@ public static void registerBlockColors(){ registerBlockColor(PaladinFurnitureModBlocksItems.BASIC_BATHTUB, addWaterColor()); registerBlockColor(PaladinFurnitureModBlocksItems.BASIC_LAMP, (state, world, pos, tintIndex) -> { BlockEntity entity = world.getBlockEntity(pos); - if (entity != null) { + if (entity != null && tintIndex == 1) { if (entity instanceof LampBlockEntity) { DyeColor color = ((LampBlockEntity)entity).getPFMColor(); return color.getFireworkColor(); } + } else if (entity != null && tintIndex == 0) { + if (getBlockColor(((LampBlockEntity)entity).getVariant().getLogBlock()) != null) { + return getBlockColor(((LampBlockEntity)entity).getVariant().getLogBlock()).getColor(state, world, pos, tintIndex); + } } return 0xFFFFFF; }); @@ -72,8 +80,13 @@ public static void registerBlockRenderLayers() { public static void registerItemColors() { registerItemColor(PaladinFurnitureModBlocksItems.BASIC_BATHTUB.asItem(), (stack, index) -> index == 1 ? 0x3c44a9 : 0xFFFFFF); registerItemColor(PaladinFurnitureModBlocksItems.BASIC_LAMP_ITEM, (stack, tintIndex) -> { - if (stack.hasNbt()) { + if (stack.hasNbt() && tintIndex == 1) { return DyeColor.byName(stack.getSubNbt("BlockEntityTag").getString("color"), DyeColor.WHITE).getMapColor().color; + } else if (stack.hasNbt() && tintIndex == 0) { + WoodVariant variantBase = WoodVariantRegistry.getVariant(Identifier.tryParse(stack.getSubNbt("BlockEntityTag").getString("variant"))); + if (getItemColor(variantBase.getLogBlock().asItem()) != null) { + return getItemColor(variantBase.getLogBlock().asItem()).getColor(stack, tintIndex); + } } return 0xFFFFFF; }); From 5d76f3d587e4fbe0497eee8c55e3b15c00c32045 Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:17:41 -0600 Subject: [PATCH 4/4] Fix tooltips not working on Config screen on 1.19.3+ --- .../screens/widget/PFMOptionListWidget.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 1f0c46d02..8a897890f 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 @@ -24,6 +24,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.*; +import net.minecraft.util.Formatting; import java.util.*; import java.util.function.Consumer; @@ -149,24 +150,24 @@ public class BooleanEntry private final ButtonWidget valueButton; private final ButtonWidget resetButton; - private final Supplier supplier; + private final Tooltip supplier; int index; boolean hasChanges = false; BooleanEntry(final BooleanConfigOption configOption, final Text optionName, int index) { this.configOption = configOption; this.optionName = optionName; this.index = index; - this.supplier = () -> { - final MutableText sideText = configOption.getSide() == Side.CLIENT ? Text.translatable("pfm.option.client").setStyle(Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34)) : Text.translatable("pfm.option.server").setStyle((Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34))); - final MutableText styledTooltip = ((MutableText)configOption.getToolTip()).setStyle(Style.EMPTY.withItalic(true)); - return sideText.append(Text.literal("\n")).append(styledTooltip); - }; + final MutableText sideText = configOption.getSide() == Side.CLIENT ? Text.translatable("pfm.option.client").setStyle(Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34)) : Text.translatable("pfm.option.server").setStyle((Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34))); + final MutableText styledTooltip = ((MutableText)configOption.getToolTip()).setStyle(Style.EMPTY.withItalic(true).withBold(false).withColor(Formatting.WHITE)); + final Text tooltipText = sideText.append(Text.literal("\n")).append(styledTooltip); + this.supplier = Tooltip.of(tooltipText); + this.valueButton = ButtonWidget.builder(optionName, button -> { PFMOptionListWidget.this.parent.focusedConfigOption = configOption; PFMOptionListWidget.this.newConfigValues.put(configOption, !PFMOptionListWidget.this.newConfigValues.get(configOption)); hasChanges = !hasChanges; PFMOptionListWidget.this.hasChanges.set(index, hasChanges); - }).tooltip(Tooltip.of(supplier.get())).dimensions(0,0,75,20).narrationSupplier(textSupplier -> this.supplier.get()).build(); + }).tooltip(supplier).dimensions(0,0,75,20).narrationSupplier(Supplier::get).build(); this.resetButton = ButtonWidget.builder(Text.translatable("controls.reset"), button -> { PFMOptionListWidget.this.newConfigValues.put(configOption, configOption.getDefaultValue()); @@ -219,24 +220,23 @@ public class ButtonEntry private final Text optionName; private final ButtonWidget button; - private final Supplier supplier; + private final Tooltip supplier; private final Side side; ButtonEntry(Side side, final Text optionName, Text buttonText, Text tooltip, ButtonWidget.PressAction pressAction) { this.optionName = optionName; this.side = side; - this.supplier = () -> { - final MutableText sideText = side == Side.CLIENT ? Text.translatable("pfm.option.client").setStyle(Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34)) : Text.translatable("pfm.option.server").setStyle((Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34))); - final MutableText styledTooltip = ((MutableText)tooltip).setStyle(Style.EMPTY.withItalic(true)); - return sideText.append(Text.literal("\n")).append(styledTooltip); - }; + final MutableText sideText = side == Side.CLIENT ? Text.translatable("pfm.option.client").setStyle(Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34)) : Text.translatable("pfm.option.server").setStyle((Style.EMPTY.withItalic(false).withBold(true).withColor(0xf77f34))); + final MutableText styledTooltip = ((MutableText)tooltip).setStyle(Style.EMPTY.withItalic(true).withBold(false).withColor(Formatting.WHITE)); + final Text tooltipText = sideText.append(Text.literal("\n")).append(styledTooltip); + this.supplier = Tooltip.of(tooltipText); - this.button = new ButtonWidget(0, 0, 135, 20, buttonText, pressAction, textSupplier -> supplier.get()){ + this.button = new ButtonWidget(0, 0, 135, 20, buttonText, pressAction, Supplier::get){ @Override protected MutableText getNarrationMessage() { return (MutableText) optionName; } }; - button.setTooltip(Tooltip.of(supplier.get())); + button.setTooltip(supplier); } @Override