diff --git a/build.gradle b/build.gradle index 9bd01742..a317eca7 100644 --- a/build.gradle +++ b/build.gradle @@ -99,6 +99,9 @@ mixin { sourceSets.main.resources { srcDir 'src/generated/resources' } repositories { + maven { + url = "https://api.modrinth.com/maven" + } // Put repositories for dependencies here // ForgeGradle automatically adds the Forge maven and Maven Central for you @@ -116,6 +119,7 @@ dependencies { // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + implementation fg.deobf("maven.modrinth:midnightlib:${midnightlib_version}") // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime @@ -146,6 +150,7 @@ tasks.named('processResources', ProcessResources).configure { loader_version_range: loader_version_range, mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, mod_authors: mod_authors, mod_description: mod_description, + midnightlib_version: midnightlib_version, ] inputs.properties replaceProperties diff --git a/gradle.properties b/gradle.properties index b56d6ea4..3c7d448f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ mappings_channel=official mappings_version=1.20.1 minecraft_version = 1.20.1 -mod_version = 1.0.1 +mod_version = 1.1.1 forge_version = 47.1.0 forgegradle_version = 5.1.+ @@ -21,3 +21,5 @@ mod_description=A mod focused on adding new building blocks with customizability minecraft_version_range=[1.20.1,1.21) forge_version_range=[47,) loader_version_range=[47,) + +midnightlib_version = 1.4.2-forge diff --git a/src/main/java/com/starfish_studios/bbb/BBBConfig.java b/src/main/java/com/starfish_studios/bbb/BBBConfig.java new file mode 100644 index 00000000..500a5ebc --- /dev/null +++ b/src/main/java/com/starfish_studios/bbb/BBBConfig.java @@ -0,0 +1,9 @@ +package com.starfish_studios.bbb; + +import eu.midnightdust.lib.config.MidnightConfig; + +public class BBBConfig extends MidnightConfig { + @Entry(category = "text") public static boolean disableShiftTooltips = false; + @Entry(category = "text") public static boolean alwaysShowFrameHitboxes = false; + @Entry(category = "text") public static boolean disableFrameCrouchHitbox = false; +} diff --git a/src/main/java/com/starfish_studios/bbb/BBBVanillaIntegration.java b/src/main/java/com/starfish_studios/bbb/BBBVanillaIntegration.java index b6d71526..5ecf02ae 100644 --- a/src/main/java/com/starfish_studios/bbb/BBBVanillaIntegration.java +++ b/src/main/java/com/starfish_studios/bbb/BBBVanillaIntegration.java @@ -4,20 +4,19 @@ import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; import com.starfish_studios.bbb.registry.BBBBlocks; +import eu.midnightdust.lib.config.MidnightConfig; import net.minecraft.world.item.HoneycombItem; import net.minecraft.world.level.block.Block; import java.util.function.Supplier; public class BBBVanillaIntegration { - public static final Supplier> WAXABLES = Suppliers.memoize(() -> { - return ImmutableBiMap.builder() - .put(BBBBlocks.CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_CUT_COPPER_LAYER.get()) - .put(BBBBlocks.EXPOSED_CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_EXPOSED_CUT_COPPER_LAYER.get()) - .put(BBBBlocks.WEATHERED_CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_WEATHERED_CUT_COPPER_LAYER.get()) - .put(BBBBlocks.OXIDIZED_CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_OXIDIZED_CUT_COPPER_LAYER.get()) - .build(); - }); + public static final Supplier> WAXABLES = Suppliers.memoize(() -> ImmutableBiMap.builder() + .put(BBBBlocks.CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_CUT_COPPER_LAYER.get()) + .put(BBBBlocks.EXPOSED_CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_EXPOSED_CUT_COPPER_LAYER.get()) + .put(BBBBlocks.WEATHERED_CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_WEATHERED_CUT_COPPER_LAYER.get()) + .put(BBBBlocks.OXIDIZED_CUT_COPPER_LAYER.get(), BBBBlocks.WAXED_OXIDIZED_CUT_COPPER_LAYER.get()) + .build()); public static void init() { ImmutableBiMap.Builder biMap = ImmutableBiMap.builder().putAll(HoneycombItem.WAXABLES.get()); diff --git a/src/main/java/com/starfish_studios/bbb/BuildingButBetter.java b/src/main/java/com/starfish_studios/bbb/BuildingButBetter.java index a59d374a..539c9f02 100644 --- a/src/main/java/com/starfish_studios/bbb/BuildingButBetter.java +++ b/src/main/java/com/starfish_studios/bbb/BuildingButBetter.java @@ -6,6 +6,7 @@ import com.starfish_studios.bbb.registry.BBBCreativeModeTab; import com.starfish_studios.bbb.registry.BBBItems; import com.starfish_studios.bbb.registry.BBBSoundEvents; +import eu.midnightdust.lib.config.MidnightConfig; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.common.Mod; @@ -19,6 +20,8 @@ public class BuildingButBetter { public static final String MOD_ID = "bbb"; public BuildingButBetter() { + MidnightConfig.init(BuildingButBetter.MOD_ID, BBBConfig.class); + IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); IEventBus eventBus = MinecraftForge.EVENT_BUS; diff --git a/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java b/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java index 0aaf7a53..6c30b250 100644 --- a/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java +++ b/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java @@ -1,16 +1,14 @@ package com.starfish_studios.bbb.block; +import com.starfish_studios.bbb.BBBConfig; import com.starfish_studios.bbb.block.properties.BBBBlockStateProperties; import com.starfish_studios.bbb.block.properties.FrameStickDirection; -import com.starfish_studios.bbb.registry.BBBItems; import com.starfish_studios.bbb.registry.BBBTags; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Items; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; @@ -27,12 +25,13 @@ import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.EntityCollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; public class FrameBlock extends Block implements SimpleWaterloggedBlock { - public static final BooleanProperty SIDES = BooleanProperty.create("sides"); + public static final BooleanProperty CORNERS = BooleanProperty.create("corners"); public static final EnumProperty FRAME_CENTER = BBBBlockStateProperties.FRAME_CENTER; public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; @@ -41,18 +40,39 @@ public class FrameBlock extends Block implements SimpleWaterloggedBlock { public static final BooleanProperty BOTTOM = BBBBlockStateProperties.BOTTOM; public static final BooleanProperty LEFT = BBBBlockStateProperties.LEFT; public static final BooleanProperty RIGHT = BBBBlockStateProperties.RIGHT; + private static final VoxelShape NORTH = Block.box(0, 0, 8, 16, 16, 16); private static final VoxelShape EAST = Block.box(0, 0, 0, 8, 16, 16); private static final VoxelShape SOUTH = Block.box(0, 0, 0, 16, 16, 8); private static final VoxelShape WEST = Block.box(8, 0, 0, 16, 16, 16); - private static final VoxelShape TOP_NORTH_AABB = Block.box(0, 15, 13, 16, 16, 16); - private static final VoxelShape TOP_EAST_AABB = Block.box(0, 15, 0, 3, 16, 16); - private static final VoxelShape TOP_SOUTH_AABB = Block.box(0, 15, 0, 16, 16, 3); - private static final VoxelShape TOP_WEST_AABB = Block.box(13, 15, 0, 16, 16, 16); - private static final VoxelShape BOTTOM_NORTH_AABB = Block.box(0, -1, 13, 16, 0, 16); - private static final VoxelShape BOTTOM_EAST_AABB = Block.box(0, -1, 0, 3, 0, 16); - private static final VoxelShape BOTTOM_SOUTH_AABB = Block.box(0, -1, 0, 16, 0, 3); - private static final VoxelShape BOTTOM_WEST_AABB = Block.box(13, -1, 0, 16, 0, 16); + + + private static final VoxelShape NORTH_RIGHT_AABB = Block.box(0, 0, 13, 1, 16, 16); + private static final VoxelShape NORTH_LEFT_AABB = Block.box(15, 0, 13, 16, 16, 16); + private static final VoxelShape NORTH_TOP_AABB = Block.box(0, 15, 13, 16, 16, 16); + private static final VoxelShape NORTH_BOTTOM_AABB = Block.box(0, -1, 13, 16, 0, 16); + private static final VoxelShape NORTH_CENTER_AABB = Block.box(4, 0, 13, 12, 16, 16); + + private static final VoxelShape WEST_LEFT_AABB = Block.box(13, 0, 0, 16, 16, 1); + private static final VoxelShape WEST_RIGHT_AABB = Block.box(13, 0, 15, 16, 16, 16); + private static final VoxelShape WEST_TOP_AABB = Block.box(13, 15, 0, 16, 16, 16); + private static final VoxelShape WEST_BOTTOM_AABB = Block.box(13, -1, 0, 16, 0, 16); + private static final VoxelShape WEST_CENTER_AABB = Block.box(13, 0, 4, 16, 16, 12); + + private static final VoxelShape SOUTH_LEFT_AABB = Block.box(0, 0, 0, 1, 16, 3); + private static final VoxelShape SOUTH_RIGHT_AABB = Block.box(15, 0, 0, 16, 16, 3); + private static final VoxelShape SOUTH_TOP_AABB = Block.box(0, 15, 0, 16, 16, 3); + private static final VoxelShape SOUTH_BOTTOM_AABB = Block.box(0, -1, 0, 16, 0, 3); + private static final VoxelShape SOUTH_CENTER_AABB = Block.box(4, 0, 0, 12, 16, 3); + + + private static final VoxelShape EAST_LEFT_AABB = Block.box(0, 0, 15, 3, 16, 16); + private static final VoxelShape EAST_RIGHT_AABB = Block.box(0, 0, 0, 3, 16, 1); + private static final VoxelShape EAST_TOP_AABB = Block.box(0, 15, 0, 3, 16, 16); + private static final VoxelShape EAST_BOTTOM_AABB = Block.box(0, -1, 0, 3, 0, 16); + private static final VoxelShape EAST_CENTER_AABB = Block.box(0, 0, 4, 3, 16, 12); + + public FrameBlock(Properties properties) { super(properties); @@ -63,13 +83,15 @@ public FrameBlock(Properties properties) { .setValue(BOTTOM, true) .setValue(LEFT, true) .setValue(RIGHT, true) - .setValue(SIDES, true) + .setValue(CORNERS, true) .setValue(FRAME_CENTER, FrameStickDirection.NONE)); } @Override public InteractionResult use(BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult) { if (player.getItemInHand(interactionHand).is(BBBTags.BBBItemTags.HAMMERS)) { + // TODO: This cycles through the frame center options, rotating it sort of like an Item Frame + // region FRAME CENTER CYCLING if (blockState.getValue(FRAME_CENTER) == FrameStickDirection.NONE) { blockState = blockState.setValue(FRAME_CENTER, FrameStickDirection.VERTICAL); } else if (blockState.getValue(FRAME_CENTER) == FrameStickDirection.VERTICAL) { @@ -84,6 +106,7 @@ public InteractionResult use(BlockState blockState, Level level, BlockPos blockP level.setBlock(blockPos, blockState, 3); level.playSound(player, blockPos, Blocks.SCAFFOLDING.getSoundType(level.getBlockState(blockPos)).getPlaceSound(), player.getSoundSource(), 1.0F, 1.0F); return InteractionResult.SUCCESS; + // endregion } else return InteractionResult.PASS; } @@ -97,23 +120,81 @@ public void attack(BlockState blockState, Level level, BlockPos blockPos, Player } } + @Override public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) { - return switch (blockState.getValue(FACING)) { - case EAST -> EAST; - case SOUTH -> SOUTH; - case WEST -> WEST; - default -> NORTH; - }; + if (collisionContext instanceof EntityCollisionContext entityContext && entityContext.getEntity() instanceof Player player && player.isHolding(stack -> + stack.is(BBBTags.BBBItemTags.FRAMES) || + stack.is(BBBTags.BBBItemTags.HAMMERS) || player.isShiftKeyDown() && !BBBConfig.disableFrameCrouchHitbox) || BBBConfig.alwaysShowFrameHitboxes) { + return switch (blockState.getValue(FACING)) { + case EAST -> EAST; + case SOUTH -> SOUTH; + case WEST -> WEST; + default -> NORTH; + }; + } + VoxelShape shape = Shapes.empty(); + + if (blockState.getValue(FACING) == Direction.NORTH) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, NORTH_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, NORTH_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, NORTH_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, NORTH_BOTTOM_AABB); + } else if (blockState.getValue(FACING) == Direction.EAST) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, EAST_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, EAST_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, EAST_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, EAST_BOTTOM_AABB); + } else if (blockState.getValue(FACING) == Direction.SOUTH) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, SOUTH_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, SOUTH_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, SOUTH_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, SOUTH_BOTTOM_AABB); + } else if (blockState.getValue(FACING) == Direction.WEST) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, WEST_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, WEST_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, WEST_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, WEST_BOTTOM_AABB); + } + return shape; } + @Override public VoxelShape getCollisionShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) { - return switch (blockState.getValue(FACING)) { - case NORTH -> Shapes.or(blockState.getValue(TOP) ? TOP_NORTH_AABB : Shapes.empty(), blockState.getValue(BOTTOM) ? BOTTOM_NORTH_AABB : Shapes.empty()); - case EAST -> Shapes.or(blockState.getValue(TOP) ? TOP_EAST_AABB : Shapes.empty(), blockState.getValue(BOTTOM) ? BOTTOM_EAST_AABB : Shapes.empty()); - case SOUTH -> Shapes.or(blockState.getValue(TOP) ? TOP_SOUTH_AABB : Shapes.empty(), blockState.getValue(BOTTOM) ? BOTTOM_SOUTH_AABB : Shapes.empty()); - case WEST -> Shapes.or(blockState.getValue(TOP) ? TOP_WEST_AABB : Shapes.empty(), blockState.getValue(BOTTOM) ? BOTTOM_WEST_AABB : Shapes.empty()); - default -> Shapes.empty(); - }; + VoxelShape shape = Shapes.empty(); + + if (blockState.getValue(FRAME_CENTER) != FrameStickDirection.NONE) { + if (blockState.getValue(FACING) == Direction.NORTH) { + if (blockState.getValue(FRAME_CENTER) != FrameStickDirection.NONE) return Shapes.or(shape, NORTH_CENTER_AABB); + } else if (blockState.getValue(FACING) == Direction.EAST) { + if (blockState.getValue(FRAME_CENTER) != FrameStickDirection.NONE) return Shapes.or(shape, EAST_CENTER_AABB); + } else if (blockState.getValue(FACING) == Direction.SOUTH) { + if (blockState.getValue(FRAME_CENTER) != FrameStickDirection.NONE) return Shapes.or(shape, SOUTH_CENTER_AABB); + } else if (blockState.getValue(FACING) == Direction.WEST) { + if (blockState.getValue(FRAME_CENTER) != FrameStickDirection.NONE) return Shapes.or(shape, WEST_CENTER_AABB); + } + } + if (blockState.getValue(FACING) == Direction.NORTH) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, NORTH_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, NORTH_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, NORTH_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, NORTH_BOTTOM_AABB); + } else if (blockState.getValue(FACING) == Direction.EAST) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, EAST_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, EAST_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, EAST_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, EAST_BOTTOM_AABB); + } else if (blockState.getValue(FACING) == Direction.SOUTH) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, SOUTH_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, SOUTH_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, SOUTH_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, SOUTH_BOTTOM_AABB); + } else if (blockState.getValue(FACING) == Direction.WEST) { + if (blockState.getValue(LEFT)) shape = Shapes.or(shape, WEST_LEFT_AABB); + if (blockState.getValue(RIGHT)) shape = Shapes.or(shape, WEST_RIGHT_AABB); + if (blockState.getValue(TOP)) shape = Shapes.or(shape, WEST_TOP_AABB); + if (blockState.getValue(BOTTOM)) shape = Shapes.or(shape, WEST_BOTTOM_AABB); + } + return shape; } public boolean propagatesSkylightDown(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) { @@ -139,7 +220,7 @@ public FluidState getFluidState(BlockState state) { @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { - builder.add(FACING, WATERLOGGED, TOP, BOTTOM, LEFT, RIGHT, SIDES, FRAME_CENTER); + builder.add(FACING, WATERLOGGED, TOP, BOTTOM, LEFT, RIGHT, CORNERS, FRAME_CENTER); } @Override diff --git a/src/main/java/com/starfish_studios/bbb/item/DescriptionBlockItem.java b/src/main/java/com/starfish_studios/bbb/item/DescriptionBlockItem.java index 3025526b..9f39bb76 100644 --- a/src/main/java/com/starfish_studios/bbb/item/DescriptionBlockItem.java +++ b/src/main/java/com/starfish_studios/bbb/item/DescriptionBlockItem.java @@ -1,5 +1,6 @@ package com.starfish_studios.bbb.item; +import com.starfish_studios.bbb.BBBConfig; import com.starfish_studios.bbb.registry.BBBTags; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; @@ -19,81 +20,91 @@ public DescriptionBlockItem(Block block, Properties properties) { @Override public void appendHoverText(ItemStack stack, Level level, List tooltip, TooltipFlag flagIn) { + if (!BBBConfig.disableShiftTooltips) { - if (stack.is(BBBTags.BBBItemTags.LANTERNS)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE) - .append(Component.translatable("description.bbb.lantern1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.lantern2").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } + if (stack.is(BBBTags.BBBItemTags.LANTERNS)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE) + .append(Component.translatable("description.bbb.lantern1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.lantern2").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } - if (stack.is(BBBTags.BBBItemTags.STONE_FENCES)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.stone_fence1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.stone_fence2").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.stone_fence3").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.stone_fence4").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } + if (stack.is(BBBTags.BBBItemTags.STONE_FENCES)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.stone_fence1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.stone_fence2").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.stone_fence3").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.stone_fence4").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } - if (stack.is(BBBTags.BBBItemTags.MOULDINGS)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.moulding1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.moulding2").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } + if (stack.is(BBBTags.BBBItemTags.MOULDINGS)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.moulding1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.moulding2").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } - if (stack.is(BBBTags.BBBItemTags.SUPPORTS)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.support1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.support2").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } + if (stack.is(BBBTags.BBBItemTags.SUPPORTS)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.support1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.support2").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } else if (stack.is(BBBTags.BBBItemTags.PALLETS)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.pallet1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.pallet2").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.pallet3").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.pallet4").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("description.bbb.pallet5").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } else if (stack.is(BBBTags.BBBItemTags.LADDERS)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.ladder1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.ladder2").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } else if (stack.is(BBBTags.BBBItemTags.COLUMNS)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.column1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.column2").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } else if (stack.is(BBBTags.BBBItemTags.LAYERS)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.layer1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.layer2").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.layer3").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.layer4").withStyle(ChatFormatting.GRAY)); + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } else if (stack.is(BBBTags.BBBItemTags.FRAMES)) { + if (Screen.hasShiftDown()) { + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.frame1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.frame2").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.frame3").withStyle(ChatFormatting.GRAY))); - else if (stack.is(BBBTags.BBBItemTags.PALLETS)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.pallet1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.pallet2").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.pallet3").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.pallet4").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("description.bbb.pallet5").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + if (!BBBConfig.disableFrameCrouchHitbox) { + if (!BBBConfig.alwaysShowFrameHitboxes) { + tooltip.add(Component.literal("\uE000 ").append(Component.translatable("description.bbb.frameConfig1").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.frameConfig2").withStyle(ChatFormatting.GRAY)); + } else { + tooltip.add(Component.literal("\uE000 ").append(Component.translatable("description.bbb.frameConfig3").withStyle(ChatFormatting.GRAY))); + } + } else { + tooltip.add(Component.literal("\uE000 ").append(Component.translatable("description.bbb.frameConfig4").withStyle(ChatFormatting.GRAY))); + tooltip.add(Component.translatable("description.bbb.frameConfig5").withStyle(ChatFormatting.GRAY)); + } + } else + tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + } } - - else if (stack.is(BBBTags.BBBItemTags.LADDERS)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.ladder1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.ladder2").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } - - else if (stack.is(BBBTags.BBBItemTags.COLUMNS)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.column1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.column2").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } - - else if (stack.is(BBBTags.BBBItemTags.LAYERS)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.layer1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.layer2").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.layer3").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.layer4").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } - - else if (stack.is(BBBTags.BBBItemTags.FRAMES)) { - if (Screen.hasShiftDown()) { - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.frame1").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.frame2").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.frame3").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.bbb.frame4").withStyle(ChatFormatting.GRAY))); - tooltip.add(Component.translatable("description.bbb.frame5").withStyle(ChatFormatting.GRAY)); - } else tooltip.add(Component.literal("[").append(Component.translatable("key.keyboard.left.shift")).append(Component.literal("]")).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - } - else { super.appendHoverText(stack, level, tooltip, flagIn); } diff --git a/src/main/java/com/starfish_studios/bbb/mixin/HangingEntityMixin.java b/src/main/java/com/starfish_studios/bbb/mixin/HangingEntityMixin.java new file mode 100644 index 00000000..72f8c938 --- /dev/null +++ b/src/main/java/com/starfish_studios/bbb/mixin/HangingEntityMixin.java @@ -0,0 +1,38 @@ +package com.starfish_studios.bbb.mixin; + +import com.starfish_studios.bbb.block.FrameBlock; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.decoration.HangingEntity; +import net.minecraft.world.level.Level; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(HangingEntity.class) +public class HangingEntityMixin extends Entity { + public HangingEntityMixin(EntityType entityType, Level level) { + super(entityType, level); + } + + @Inject(method = "survives", at = @At("HEAD"), cancellable = true) + public void survives(CallbackInfoReturnable cir) { + if (this.level().getBlockState(this.blockPosition()).getBlock() instanceof FrameBlock) { + cir.setReturnValue(true); + } + } + + public void defineSynchedData() { + + } + + public void readAdditionalSaveData(CompoundTag compoundTag) { + + } + + public void addAdditionalSaveData(CompoundTag compoundTag) { + + } +} diff --git a/src/main/java/com/starfish_studios/bbb/mixin/PaintingMixin.java b/src/main/java/com/starfish_studios/bbb/mixin/PaintingMixin.java deleted file mode 100644 index 10db18bb..00000000 --- a/src/main/java/com/starfish_studios/bbb/mixin/PaintingMixin.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.starfish_studios.bbb.mixin; - -import net.minecraft.world.entity.decoration.Painting; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; - -@Mixin(Painting.class) -public class PaintingMixin { - @Unique - public boolean survives() { - return true; - } -} diff --git a/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java b/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java index 5d50772e..460da91a 100644 --- a/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java +++ b/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java @@ -146,7 +146,7 @@ public class BBBBlocks { public static final RegistryObject MANGROVE_BEAM = BLOCKS.register("mangrove_beam", () -> new RotatedPillarBlock(BlockBehaviour.Properties.copy((Blocks.STRIPPED_MANGROVE_LOG)))); public static final RegistryObject MANGROVE_BEAM_STAIRS = BLOCKS.register("mangrove_beam_stairs", () -> new StairBlock((Blocks.MANGROVE_PLANKS.defaultBlockState()), BlockBehaviour.Properties.copy(Blocks.MANGROVE_PLANKS))); public static final RegistryObject MANGROVE_BEAM_SLAB = BLOCKS.register("mangrove_beam_slab", () -> new FacingSlabBlock(BlockBehaviour.Properties.copy((Blocks.MANGROVE_PLANKS)))); - public static final RegistryObject BAMBOO_BEAM = BLOCKS.register("bamboo_beam", () -> new RotatedPillarBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO)))); + public static final RegistryObject BAMBOO_BEAM = BLOCKS.register("bamboo_beam", () -> new RotatedPillarBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_PLANKS)))); public static final RegistryObject BAMBOO_BEAM_STAIRS = BLOCKS.register("bamboo_beam_stairs", () -> new StairBlock((Blocks.BAMBOO_PLANKS.defaultBlockState()), BlockBehaviour.Properties.copy(Blocks.BAMBOO_PLANKS))); public static final RegistryObject BAMBOO_BEAM_SLAB = BLOCKS.register("bamboo_beam_slab", () -> new FacingSlabBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_PLANKS)))); public static final RegistryObject CHERRY_BEAM = BLOCKS.register("cherry_beam", () -> new RotatedPillarBlock(BlockBehaviour.Properties.copy((Blocks.STRIPPED_CHERRY_LOG)))); diff --git a/src/main/resources/assets/bbb/blockstates/acacia_frame.json b/src/main/resources/assets/bbb/blockstates/acacia_frame.json index bc408909..a6153a9b 100644 --- a/src/main/resources/assets/bbb/blockstates/acacia_frame.json +++ b/src/main/resources/assets/bbb/blockstates/acacia_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/acacia_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/bamboo_frame.json b/src/main/resources/assets/bbb/blockstates/bamboo_frame.json index 7e903f5e..b4601963 100644 --- a/src/main/resources/assets/bbb/blockstates/bamboo_frame.json +++ b/src/main/resources/assets/bbb/blockstates/bamboo_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/bamboo_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/birch_frame.json b/src/main/resources/assets/bbb/blockstates/birch_frame.json index 59e5506d..e96c719b 100644 --- a/src/main/resources/assets/bbb/blockstates/birch_frame.json +++ b/src/main/resources/assets/bbb/blockstates/birch_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/birch_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/blackstone_frame.json b/src/main/resources/assets/bbb/blockstates/blackstone_frame.json new file mode 100644 index 00000000..e93d19fd --- /dev/null +++ b/src/main/resources/assets/bbb/blockstates/blackstone_frame.json @@ -0,0 +1,552 @@ +{ + "multipart": [ + { + "when": { + "top": "true", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top", + "uvlock": false + } + }, + { + "when": { + "bottom": "true", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom", + "uvlock": false + } + }, + { + "when": { + "left": "true", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_left", + "uvlock": false + } + }, + { + "when": { + "right": "true", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_right", + "uvlock": false + } + }, + { + "when": { + "left": "true", + "top": "true", + "facing": "north", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_left_corner", + "uvlock": false + } + }, + { + "when": { + "right": "true", + "top": "true", + "facing": "north", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_right_corner", + "uvlock": false + } + }, + { + "when": { + "left": "true", + "bottom": "true", + "facing": "north", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_left_corner", + "uvlock": false + } + }, + { + "when": { + "right": "true", + "bottom": "true", + "facing": "north", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_right_corner", + "uvlock": false + } + }, + { + "when": { + "top": "true", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "bottom": "true", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "left": "true", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_left", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "right": "true", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_right", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "left": "true", + "top": "true", + "facing": "east", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_left_corner", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "right": "true", + "top": "true", + "facing": "east", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_right_corner", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "left": "true", + "bottom": "true", + "facing": "east", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_left_corner", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "right": "true", + "bottom": "true", + "facing": "east", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_right_corner", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "top": "true", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "bottom": "true", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "left": "true", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_left", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "right": "true", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_right", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "left": "true", + "top": "true", + "facing": "south", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_left_corner", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "right": "true", + "top": "true", + "facing": "south", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_right_corner", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "left": "true", + "bottom": "true", + "facing": "south", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_left_corner", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "right": "true", + "bottom": "true", + "facing": "south", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_right_corner", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "top": "true", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "bottom": "true", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "left": "true", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_left", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "right": "true", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_right", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "left": "true", + "top": "true", + "facing": "west", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_left_corner", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "right": "true", + "top": "true", + "facing": "west", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_top_right_corner", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "left": "true", + "bottom": "true", + "facing": "west", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_left_corner", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "right": "true", + "bottom": "true", + "facing": "west", + "corners": "true" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_bottom_right_corner", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "center": "vertical", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_vertical", + "uvlock": false + } + }, + { + "when": { + "center": "vertical", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_vertical", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "center": "vertical", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_vertical", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "center": "vertical", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_vertical", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "center": "horizontal", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_horizontal", + "uvlock": false + } + }, + { + "when": { + "center": "horizontal", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_horizontal", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "center": "horizontal", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_horizontal", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "center": "horizontal", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_horizontal", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "center": "left", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_left", + "uvlock": false + } + }, + { + "when": { + "center": "left", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_left", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "center": "left", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_left", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "center": "left", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_left", + "uvlock": false, + "y": 270 + } + }, + { + "when": { + "center": "right", + "facing": "north" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_right", + "uvlock": false + } + }, + { + "when": { + "center": "right", + "facing": "east" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_right", + "uvlock": false, + "y": 90 + } + }, + { + "when": { + "center": "right", + "facing": "south" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_right", + "uvlock": false, + "y": 180 + } + }, + { + "when": { + "center": "right", + "facing": "west" + }, + "apply": { + "model": "bbb:block/frame/stone/blackstone_diagonal_right", + "uvlock": false, + "y": 270 + } + } + ] +} diff --git a/src/main/resources/assets/bbb/blockstates/cherry_frame.json b/src/main/resources/assets/bbb/blockstates/cherry_frame.json index 345eaf77..d2a08161 100644 --- a/src/main/resources/assets/bbb/blockstates/cherry_frame.json +++ b/src/main/resources/assets/bbb/blockstates/cherry_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/cherry_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/crimson_frame.json b/src/main/resources/assets/bbb/blockstates/crimson_frame.json index 042d06b7..5e3cedec 100644 --- a/src/main/resources/assets/bbb/blockstates/crimson_frame.json +++ b/src/main/resources/assets/bbb/blockstates/crimson_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/crimson_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/dark_oak_frame.json b/src/main/resources/assets/bbb/blockstates/dark_oak_frame.json index b46339ff..3ea4d0f8 100644 --- a/src/main/resources/assets/bbb/blockstates/dark_oak_frame.json +++ b/src/main/resources/assets/bbb/blockstates/dark_oak_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/dark_oak_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/jungle_frame.json b/src/main/resources/assets/bbb/blockstates/jungle_frame.json index 74bba278..ad09a7e4 100644 --- a/src/main/resources/assets/bbb/blockstates/jungle_frame.json +++ b/src/main/resources/assets/bbb/blockstates/jungle_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/jungle_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/mangrove_frame.json b/src/main/resources/assets/bbb/blockstates/mangrove_frame.json index 17859246..5bfbb569 100644 --- a/src/main/resources/assets/bbb/blockstates/mangrove_frame.json +++ b/src/main/resources/assets/bbb/blockstates/mangrove_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/mangrove_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/oak_frame.json b/src/main/resources/assets/bbb/blockstates/oak_frame.json index ab08fa74..865d5104 100644 --- a/src/main/resources/assets/bbb/blockstates/oak_frame.json +++ b/src/main/resources/assets/bbb/blockstates/oak_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/oak_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/spruce_frame.json b/src/main/resources/assets/bbb/blockstates/spruce_frame.json index bccdddd8..1ff33b4f 100644 --- a/src/main/resources/assets/bbb/blockstates/spruce_frame.json +++ b/src/main/resources/assets/bbb/blockstates/spruce_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/spruce_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/blockstates/warped_frame.json b/src/main/resources/assets/bbb/blockstates/warped_frame.json index e1547fc9..9a0a23c8 100644 --- a/src/main/resources/assets/bbb/blockstates/warped_frame.json +++ b/src/main/resources/assets/bbb/blockstates/warped_frame.json @@ -44,7 +44,8 @@ "when": { "left": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_left_corner", @@ -55,7 +56,8 @@ "when": { "right": "true", "top": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_right_corner", @@ -66,7 +68,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_left_corner", @@ -77,7 +80,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "north" + "facing": "north", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_right_corner", @@ -132,7 +136,8 @@ "when": { "left": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_left_corner", @@ -144,7 +149,8 @@ "when": { "right": "true", "top": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_right_corner", @@ -156,7 +162,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_left_corner", @@ -168,7 +175,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "east" + "facing": "east", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_right_corner", @@ -224,7 +232,8 @@ "when": { "left": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_left_corner", @@ -236,7 +245,8 @@ "when": { "right": "true", "top": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_right_corner", @@ -248,7 +258,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_left_corner", @@ -260,7 +271,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "south" + "facing": "south", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_right_corner", @@ -316,7 +328,8 @@ "when": { "left": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_left_corner", @@ -328,7 +341,8 @@ "when": { "right": "true", "top": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_top_right_corner", @@ -340,7 +354,8 @@ "when": { "left": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_left_corner", @@ -352,7 +367,8 @@ "when": { "right": "true", "bottom": "true", - "facing": "west" + "facing": "west", + "corners": "true" }, "apply": { "model": "bbb:block/frame/warped_bottom_right_corner", diff --git a/src/main/resources/assets/bbb/lang/en_us.json b/src/main/resources/assets/bbb/lang/en_us.json index 06e39bde..8f1e0237 100644 --- a/src/main/resources/assets/bbb/lang/en_us.json +++ b/src/main/resources/assets/bbb/lang/en_us.json @@ -4,6 +4,15 @@ "subtitles.block.layer.remove_layer": "Layer removed", + "bbb.midnightconfig.title": "Building But Better Config", + "bbb.midnightconfig.alwaysShowFrameHitboxes": "Always show Frame hitboxes", + "bbb.midnightconfig.alwaysShowFrameHitboxes.tooltip": "§8§o[?]§7§o If enabled, larger hitboxes for Frames will always be shown, rather than only when crouching.", + "bbb.midnightconfig.disableFrameCrouchHitbox": "Disable crouch hitbox for Frames", + "bbb.midnightconfig.disableFrameCrouchHitbox.tooltip": "§8§o[!]§7§o This does §lNOT §7§ocompletely remove them - they will still show when holding Frames and Hammers.", + + "bbb.midnightconfig.disableShiftTooltips": "Disable Shift tooltips", + "bbb.midnightconfig.disableShiftTooltips.tooltip": "§8§o[?]§7§o If enabled, tooltips will be removed from all items.", + "item.bbb.hammer": "Hammer", "block.bbb.stone_fence": "Stone Fence", @@ -260,8 +269,11 @@ "description.bbb.frame1": "Right-Click with a Hammer", "description.bbb.frame2": "to cycle through center supports.", "description.bbb.frame3": "Punch to remove center support.", - "description.bbb.frame4": "Automatically connects", - "description.bbb.frame5": "to other Frames.", + "description.bbb.frameConfig1": "Crouch or hold Hammers/Frames", + "description.bbb.frameConfig2": "to expand the Frame's hitbox.", + "description.bbb.frameConfig3": "Frame hitboxes are always shown.", + "description.bbb.frameConfig4": "Hold a Hammer or Frames", + "description.bbb.frameConfig5": "to expand the Frame's hitbox.", "description.bbb.pallet1": "Right-Click with a Hammer", "description.bbb.pallet2": "to add/remove layers.", diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_bottom.json b/src/main/resources/assets/bbb/models/block/frame/acacia_bottom.json index 29eaa1e4..6960789f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/acacia", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_left_corner.json index ea15410c..6403b922 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/acacia", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_right_corner.json index 917bdcc0..e3988301 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/acacia", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal.json deleted file mode 100644 index dd767406..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/acacia_frame_sticks", - "particle": "minecraft:block/acacia_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_left.json index 022c7cf4..3e5b077f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/acacia_frame_sticks", - "particle": "minecraft:block/acacia_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/acacia_sticks", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_right.json index dd767406..e142ee59 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/acacia_frame_sticks", - "particle": "minecraft:block/acacia_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/acacia_sticks", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_frame.json b/src/main/resources/assets/bbb/models/block/frame/acacia_frame.json deleted file mode 100644 index 1f8fece0..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/acacia_frame_inventory.json deleted file mode 100644 index 0388ddee..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/acacia_horizontal.json index fec560e6..7c38d726 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/acacia_frame", - "particle": "minecraft:block/acacia_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/acacia_sticks", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_inventory.json b/src/main/resources/assets/bbb/models/block/frame/acacia_inventory.json new file mode 100644 index 00000000..18d128e9 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/acacia", + "particle": "block/acacia_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_left.json b/src/main/resources/assets/bbb/models/block/frame/acacia_left.json index 04afa0cf..0533c630 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/acacia_frame", + "texture": "bbb:block/frame/acacia", "particle": "block/acacia_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_middle.json b/src/main/resources/assets/bbb/models/block/frame/acacia_middle.json deleted file mode 100644 index 67448468..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_right.json b/src/main/resources/assets/bbb/models/block/frame/acacia_right.json index e8e65d88..380ed653 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/acacia_frame", + "texture": "bbb:block/frame/acacia", "particle": "block/acacia_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_top.json b/src/main/resources/assets/bbb/models/block/frame/acacia_top.json index e3c397a1..6e4853a1 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/acacia", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/acacia_top_left_corner.json index 3dadc0e4..3853ead8 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/acacia", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/acacia_top_right_corner.json index de2b8bc5..ecf7fe2d 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/acacia_planks", - "texture": "bbb:block/frame/acacia_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/acacia", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/acacia_vertical.json b/src/main/resources/assets/bbb/models/block/frame/acacia_vertical.json index 6f877821..814ec6f2 100644 --- a/src/main/resources/assets/bbb/models/block/frame/acacia_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/acacia_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/acacia_frame", - "particle": "minecraft:block/acacia_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/acacia_sticks", + "particle": "block/acacia_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom.json index 0ecd795f..fd7ee10e 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/bamboo", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_left_corner.json index 44190c24..ce7a2996 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/bamboo", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_right_corner.json index 1daaedea..da1ebccb 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/bamboo", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal.json deleted file mode 100644 index 17797824..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/bamboo_frame_sticks", - "particle": "minecraft:block/bamboo_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_left.json index 16385bb3..15d33b5f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/bamboo_frame_sticks", - "particle": "minecraft:block/bamboo_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/bamboo_sticks", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_right.json index 17797824..775a82cb 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/bamboo_frame_sticks", - "particle": "minecraft:block/bamboo_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/bamboo_sticks", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_frame.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_frame.json deleted file mode 100644 index a5e7f4ba..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_frame_inventory.json deleted file mode 100644 index 99f41e23..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_horizontal.json index a9869e90..eb5f9178 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/bamboo_frame", - "particle": "minecraft:block/bamboo_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/bamboo_sticks", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_inventory.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_inventory.json new file mode 100644 index 00000000..6c924ff3 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/bamboo", + "particle": "block/bamboo_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_left.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_left.json index 6c207470..4312daa9 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/bamboo_frame", + "texture": "bbb:block/frame/bamboo", "particle": "block/bamboo_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_middle.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_middle.json deleted file mode 100644 index f18c0c8c..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_right.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_right.json index d31e5352..35e6ec55 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/bamboo_frame", + "texture": "bbb:block/frame/bamboo", "particle": "block/bamboo_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_top.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_top.json index cb1745e5..93efa810 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/bamboo", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_top_left_corner.json index 41f1f877..1268f5b1 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/bamboo", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_top_right_corner.json index 7ab54e70..0de26f56 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/bamboo_planks", - "texture": "bbb:block/frame/bamboo_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/bamboo", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/bamboo_vertical.json b/src/main/resources/assets/bbb/models/block/frame/bamboo_vertical.json index c7688d40..2f52e446 100644 --- a/src/main/resources/assets/bbb/models/block/frame/bamboo_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/bamboo_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/bamboo_frame", - "particle": "minecraft:block/bamboo_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/bamboo_sticks", + "particle": "block/bamboo_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_bottom.json b/src/main/resources/assets/bbb/models/block/frame/birch_bottom.json index 41e69886..1241d755 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/birch", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/birch_bottom_left_corner.json index 8d5c449f..5b43f2f3 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/birch", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/birch_bottom_right_corner.json index 7c860411..87f994f5 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/birch", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/birch_diagonal.json deleted file mode 100644 index 59e3268d..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/birch_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/birch_frame_sticks", - "particle": "minecraft:block/birch_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_left.json index 9dc30586..917dac21 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/birch_frame_sticks", - "particle": "minecraft:block/birch_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/birch_sticks", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_right.json index 59e3268d..df68a771 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/birch_frame_sticks", - "particle": "minecraft:block/birch_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/birch_sticks", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_frame.json b/src/main/resources/assets/bbb/models/block/frame/birch_frame.json deleted file mode 100644 index bf0ff3e2..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/birch_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/birch_frame_inventory.json deleted file mode 100644 index bbe6e10c..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/birch_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/birch_horizontal.json index 53149d6a..25b2703b 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/birch_frame", - "particle": "minecraft:block/birch_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/birch_sticks", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_inventory.json b/src/main/resources/assets/bbb/models/block/frame/birch_inventory.json new file mode 100644 index 00000000..159dd167 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/birch_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/birch", + "particle": "block/birch_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_left.json b/src/main/resources/assets/bbb/models/block/frame/birch_left.json index de6b706e..df854db4 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/birch_frame", + "texture": "bbb:block/frame/birch", "particle": "block/birch_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_middle.json b/src/main/resources/assets/bbb/models/block/frame/birch_middle.json deleted file mode 100644 index 76ac3b05..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/birch_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_right.json b/src/main/resources/assets/bbb/models/block/frame/birch_right.json index dad7420a..f3b4b5b0 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/birch_frame", + "texture": "bbb:block/frame/birch", "particle": "block/birch_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_top.json b/src/main/resources/assets/bbb/models/block/frame/birch_top.json index d44dc1b5..0c890604 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/birch", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/birch_top_left_corner.json index e0244611..e214ec39 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/birch", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/birch_top_right_corner.json index 1d4d71b9..9f2dce5c 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/birch_planks", - "texture": "bbb:block/frame/birch_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/birch", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/birch_vertical.json b/src/main/resources/assets/bbb/models/block/frame/birch_vertical.json index 042ccb36..ab26bf19 100644 --- a/src/main/resources/assets/bbb/models/block/frame/birch_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/birch_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/birch_frame", - "particle": "minecraft:block/birch_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/birch_sticks", + "particle": "block/birch_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_bottom.json b/src/main/resources/assets/bbb/models/block/frame/cherry_bottom.json index 736cd581..ffc908ed 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/cherry", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_left_corner.json index 7596aa76..22e14128 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/cherry", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_right_corner.json index aa995353..2ab38ac8 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/cherry", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal.json deleted file mode 100644 index 5422b8d4..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/cherry_frame_sticks", - "particle": "minecraft:block/cherry_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_left.json index 69ad2e4b..f7068cd5 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/cherry_frame_sticks", - "particle": "minecraft:block/cherry_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/cherry_sticks", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_right.json index 5422b8d4..613763c8 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/cherry_frame_sticks", - "particle": "minecraft:block/cherry_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/cherry_sticks", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_frame.json b/src/main/resources/assets/bbb/models/block/frame/cherry_frame.json deleted file mode 100644 index 62d8029c..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/cherry_frame_inventory.json deleted file mode 100644 index ba88560e..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/cherry_horizontal.json index db11b078..c0e94438 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/cherry_frame", - "particle": "minecraft:block/cherry_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/cherry_sticks", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_inventory.json b/src/main/resources/assets/bbb/models/block/frame/cherry_inventory.json new file mode 100644 index 00000000..e44c1f8a --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/cherry", + "particle": "block/cherry_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_left.json b/src/main/resources/assets/bbb/models/block/frame/cherry_left.json index db8b280d..344261b1 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/cherry_frame", + "texture": "bbb:block/frame/cherry", "particle": "block/cherry_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_middle.json b/src/main/resources/assets/bbb/models/block/frame/cherry_middle.json deleted file mode 100644 index 91314cac..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_right.json b/src/main/resources/assets/bbb/models/block/frame/cherry_right.json index 04bb1d97..92da125c 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/cherry_frame", + "texture": "bbb:block/frame/cherry", "particle": "block/cherry_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_top.json b/src/main/resources/assets/bbb/models/block/frame/cherry_top.json index 786135fa..52056276 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/cherry", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/cherry_top_left_corner.json index a6578735..4453da5a 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/cherry", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/cherry_top_right_corner.json index b75de06f..4794b388 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/cherry_planks", - "texture": "bbb:block/frame/cherry_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/cherry", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/cherry_vertical.json b/src/main/resources/assets/bbb/models/block/frame/cherry_vertical.json index f5287c5c..133fc62e 100644 --- a/src/main/resources/assets/bbb/models/block/frame/cherry_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/cherry_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/cherry_frame", - "particle": "minecraft:block/cherry_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/cherry_sticks", + "particle": "block/cherry_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_bottom.json b/src/main/resources/assets/bbb/models/block/frame/crimson_bottom.json index 487212a1..212bb3fe 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/crimson", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_left_corner.json index 50826348..1ab8ae0b 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/crimson", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_right_corner.json index 17c95f8b..2408a8a7 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/crimson", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal.json deleted file mode 100644 index 2e295355..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/crimson_frame_sticks", - "particle": "minecraft:block/crimson_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_left.json index 02d356a7..e02aa436 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/crimson_frame_sticks", - "particle": "minecraft:block/crimson_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/crimson_sticks", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_right.json index 2e295355..738d4205 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/crimson_frame_sticks", - "particle": "minecraft:block/crimson_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/crimson_sticks", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_frame.json b/src/main/resources/assets/bbb/models/block/frame/crimson_frame.json deleted file mode 100644 index 246710b7..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/crimson_frame_inventory.json deleted file mode 100644 index 6ac5f5b1..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/crimson_horizontal.json index 8a4969cc..2de97e50 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/crimson_frame", - "particle": "minecraft:block/crimson_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/crimson_sticks", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_inventory.json b/src/main/resources/assets/bbb/models/block/frame/crimson_inventory.json new file mode 100644 index 00000000..39be81c5 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/crimson", + "particle": "block/crimson_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_left.json b/src/main/resources/assets/bbb/models/block/frame/crimson_left.json index f6545487..ed3b21b7 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/crimson_frame", + "texture": "bbb:block/frame/crimson", "particle": "block/crimson_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_middle.json b/src/main/resources/assets/bbb/models/block/frame/crimson_middle.json deleted file mode 100644 index 808bcbf5..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_right.json b/src/main/resources/assets/bbb/models/block/frame/crimson_right.json index ee6a31f7..c6d1f1c4 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/crimson_frame", + "texture": "bbb:block/frame/crimson", "particle": "block/crimson_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_top.json b/src/main/resources/assets/bbb/models/block/frame/crimson_top.json index 9b75f2fb..2f75b741 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/crimson", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/crimson_top_left_corner.json index 91577645..38efcaf9 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/crimson", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/crimson_top_right_corner.json index 570631d9..b3fbc52d 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/crimson_planks", - "texture": "bbb:block/frame/crimson_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/crimson", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/crimson_vertical.json b/src/main/resources/assets/bbb/models/block/frame/crimson_vertical.json index ce0fdaf1..3e200f41 100644 --- a/src/main/resources/assets/bbb/models/block/frame/crimson_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/crimson_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/crimson_frame", - "particle": "minecraft:block/crimson_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/crimson_sticks", + "particle": "block/crimson_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom.json index 89ec45f8..ef0313a9 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/dark_oak", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_left_corner.json index 1c133586..8c36b014 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/dark_oak", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_right_corner.json index 0daea410..b19b2cc2 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/dark_oak", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal.json deleted file mode 100644 index 46c487ce..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/dark_oak_frame_sticks", - "particle": "minecraft:block/dark_oak_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_left.json index 44fdd550..d2a856ae 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/dark_oak_frame_sticks", - "particle": "minecraft:block/dark_oak_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/dark_oak_sticks", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_right.json index 46c487ce..97804a65 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/dark_oak_frame_sticks", - "particle": "minecraft:block/dark_oak_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/dark_oak_sticks", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_frame.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_frame.json deleted file mode 100644 index a21f731e..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_frame_inventory.json deleted file mode 100644 index e7a88b09..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_horizontal.json index 4866717f..55e1f42c 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/dark_oak_frame", - "particle": "minecraft:block/dark_oak_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/dark_oak_sticks", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_inventory.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_inventory.json new file mode 100644 index 00000000..8a04c403 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/dark_oak", + "particle": "block/dark_oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_left.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_left.json index b01c8d43..e00ba491 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/dark_oak_frame", + "texture": "bbb:block/frame/dark_oak", "particle": "block/dark_oak_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_middle.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_middle.json deleted file mode 100644 index 6d19850a..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_right.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_right.json index b29872f0..5550e33d 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/dark_oak_frame", + "texture": "bbb:block/frame/dark_oak", "particle": "block/dark_oak_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_top.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_top.json index aabcdb97..f8ecc0b3 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/dark_oak", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_left_corner.json index 81be79bd..8ab42805 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/dark_oak", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_right_corner.json index 76231df8..2126f18d 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/dark_oak_planks", - "texture": "bbb:block/frame/dark_oak_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/dark_oak", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/dark_oak_vertical.json b/src/main/resources/assets/bbb/models/block/frame/dark_oak_vertical.json index 0dcb8942..befafc34 100644 --- a/src/main/resources/assets/bbb/models/block/frame/dark_oak_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/dark_oak_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/dark_oak_frame", - "particle": "minecraft:block/dark_oak_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/dark_oak_sticks", + "particle": "block/dark_oak_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_bottom.json b/src/main/resources/assets/bbb/models/block/frame/jungle_bottom.json index 7dcf8616..656a794a 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/jungle", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_left_corner.json index 92c3465a..3fdb9db3 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/jungle", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_right_corner.json index fcea38cc..e423f9e9 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/jungle", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal.json deleted file mode 100644 index 530c0ca2..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/jungle_frame_sticks", - "particle": "minecraft:block/jungle_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_left.json index 4b5f9fc5..56453167 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/jungle_frame_sticks", - "particle": "minecraft:block/jungle_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/jungle_sticks", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_right.json index 530c0ca2..d506de87 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/jungle_frame_sticks", - "particle": "minecraft:block/jungle_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/jungle_sticks", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_frame.json b/src/main/resources/assets/bbb/models/block/frame/jungle_frame.json deleted file mode 100644 index 1d4ac1bb..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/jungle_frame_inventory.json deleted file mode 100644 index ee65878f..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/jungle_horizontal.json index f7942f23..67759721 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/jungle_frame", - "particle": "minecraft:block/jungle_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/jungle_sticks", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_inventory.json b/src/main/resources/assets/bbb/models/block/frame/jungle_inventory.json new file mode 100644 index 00000000..683547a2 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/jungle", + "particle": "block/jungle_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_left.json b/src/main/resources/assets/bbb/models/block/frame/jungle_left.json index dc47ea4a..5e05ba85 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/jungle_frame", + "texture": "bbb:block/frame/jungle", "particle": "block/jungle_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_middle.json b/src/main/resources/assets/bbb/models/block/frame/jungle_middle.json deleted file mode 100644 index 4eb7e0d7..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_right.json b/src/main/resources/assets/bbb/models/block/frame/jungle_right.json index 2795ef56..2754072f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/jungle_frame", + "texture": "bbb:block/frame/jungle", "particle": "block/jungle_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_top.json b/src/main/resources/assets/bbb/models/block/frame/jungle_top.json index aa46c25e..ad3ddc3f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/jungle", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/jungle_top_left_corner.json index 4874c2a5..e94d855e 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/jungle", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/jungle_top_right_corner.json index 7250a73a..6befd7e0 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/jungle_planks", - "texture": "bbb:block/frame/jungle_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/jungle", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/jungle_vertical.json b/src/main/resources/assets/bbb/models/block/frame/jungle_vertical.json index 9c6f749e..8b39df5b 100644 --- a/src/main/resources/assets/bbb/models/block/frame/jungle_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/jungle_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/jungle_frame", - "particle": "minecraft:block/jungle_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/jungle_sticks", + "particle": "block/jungle_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom.json index a99cc3bc..cc849317 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/mangrove", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_left_corner.json index 27062e9e..a273cb9a 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/mangrove", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_right_corner.json index b039d37d..adbffee1 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/mangrove", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal.json deleted file mode 100644 index 02efec5e..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/mangrove_frame_sticks", - "particle": "minecraft:block/mangrove_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_left.json index 36555fa0..91fa7f68 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/mangrove_frame_sticks", - "particle": "minecraft:block/mangrove_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/mangrove_sticks", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_right.json index 02efec5e..00dc1a5c 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/mangrove_frame_sticks", - "particle": "minecraft:block/mangrove_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/mangrove_sticks", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_frame.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_frame.json deleted file mode 100644 index e2e596f1..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_frame_inventory.json deleted file mode 100644 index 9171f744..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_horizontal.json index e970faaf..c41d9564 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/mangrove_frame", - "particle": "minecraft:block/mangrove_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/mangrove_sticks", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_inventory.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_inventory.json new file mode 100644 index 00000000..fdb75ccc --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/mangrove", + "particle": "block/mangrove_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_left.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_left.json index 583cb896..24a7083b 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/mangrove_frame", + "texture": "bbb:block/frame/mangrove", "particle": "block/mangrove_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_middle.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_middle.json deleted file mode 100644 index 72868d74..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_right.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_right.json index d25d4a78..6e05f6fa 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/mangrove_frame", + "texture": "bbb:block/frame/mangrove", "particle": "block/mangrove_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_top.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_top.json index 9ff7ae22..50d53f60 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/mangrove", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_top_left_corner.json index edd2fc83..f07ecd3c 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/mangrove", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_top_right_corner.json index 10cb77d1..b28c3fae 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/mangrove_planks", - "texture": "bbb:block/frame/mangrove_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/mangrove", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/mangrove_vertical.json b/src/main/resources/assets/bbb/models/block/frame/mangrove_vertical.json index 7801e5ad..921c9af1 100644 --- a/src/main/resources/assets/bbb/models/block/frame/mangrove_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/mangrove_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/mangrove_frame", - "particle": "minecraft:block/mangrove_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/mangrove_sticks", + "particle": "block/mangrove_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_bottom.json b/src/main/resources/assets/bbb/models/block/frame/oak_bottom.json index ab7a9f4e..a8d9cbfe 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_bottom.json @@ -1,32 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [-0.01, -4.01, 12.99], - "to": [16.01, 0.01, 16.01], - "rotation": {"angle": 0, "axis": "z", "origin": [8, -2, -1.5]}, - "faces": { - "north": {"uv": [2.5, 2, 10.5, 0], "texture": "#texture"}, - "east": {"uv": [5, 9, 6.5, 7], "texture": "#texture"}, - "south": {"uv": [2.5, 4, 10.5, 2], "texture": "#texture"}, - "west": {"uv": [6.5, 9, 8, 7], "texture": "#texture"}, - "up": {"uv": [10.5, 7, 2.5, 5.5], "texture": "#texture"}, - "down": {"uv": [10.5, 4, 2.5, 5.5], "texture": "#texture"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/oak_bottom_left_corner.json index 71e17f39..04b0cac8 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_bottom_left_corner.json @@ -1,46 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [15.99, -4.01, 12.99], - "to": [21.01, 0.01, 16.01], - "rotation": {"angle": 0, "axis": "z", "origin": [8, -2, -1.5]}, - "faces": { - "north": {"uv": [0, 2, 2.5, 0], "texture": "#texture"}, - "east": {"uv": [5, 9, 6.5, 7], "texture": "#texture"}, - "south": {"uv": [2.5, 4, 0, 2], "texture": "#texture"}, - "west": {"uv": [6.5, 9, 8, 7], "texture": "#texture"}, - "up": {"uv": [2.5, 7, 0, 5.5], "texture": "#texture"}, - "down": {"uv": [2.5, 4, 0, 5.5], "texture": "#texture"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/oak_bottom_right_corner.json index f07db812..d175b573 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_bottom_right_corner.json @@ -1,46 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [-5.01, -4.01, 12.99], - "to": [0.01, 0.01, 16.01], - "rotation": {"angle": 0, "axis": "z", "origin": [8, -2, -1.5]}, - "faces": { - "north": {"uv": [2.5, 2, 0, 0], "texture": "#texture"}, - "east": {"uv": [8, 9, 6.5, 7], "texture": "#texture"}, - "south": {"uv": [0, 4, 2.5, 2], "texture": "#texture"}, - "west": {"uv": [6.5, 9, 5, 7], "texture": "#texture"}, - "up": {"uv": [0, 7, 2.5, 5.5], "texture": "#texture"}, - "down": {"uv": [0, 4, 2.5, 5.5], "texture": "#texture"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_left.json index 26cc78fa..d3f054a2 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_left.json @@ -1,39 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/oak_frame_sticks", - "particle": "minecraft:block/oak_planks" - }, - "elements": [ - { - "from": [7.00176, -3.31676, 14], - "to": [9.00176, 19.31324, 16], - "rotation": {"angle": -45, "axis": "z", "origin": [8.00176, 7.99824, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 11.5], "texture": "#1"}, - "east": {"uv": [1, 0, 2, 11.5], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 11.5], "texture": "#1"}, - "west": {"uv": [1, 0, 2, 11.5], "texture": "#1"}, - "up": {"uv": [3, 1, 2, 0], "texture": "#1"}, - "down": {"uv": [3, 1, 2, 2], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - }, - { - "name": "bone2", - "origin": [16, -16, 0], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak_sticks", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_right.json index 3a34a80d..84dcdf1b 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_diagonal_right.json @@ -1,39 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/oak_frame_sticks", - "particle": "minecraft:block/oak_planks" - }, - "elements": [ - { - "from": [7.00176, -3.31676, 14], - "to": [9.00176, 19.31324, 16], - "rotation": {"angle": 45, "axis": "z", "origin": [8.00176, 7.99824, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 11.5], "texture": "#1"}, - "east": {"uv": [1, 0, 2, 11.5], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 11.5], "texture": "#1"}, - "west": {"uv": [1, 0, 2, 11.5], "texture": "#1"}, - "up": {"uv": [3, 1, 2, 0], "texture": "#1"}, - "down": {"uv": [3, 1, 2, 2], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - }, - { - "name": "bone2", - "origin": [16, -16, 0], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak_sticks", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_frame.json b/src/main/resources/assets/bbb/models/block/frame/oak_frame.json deleted file mode 100644 index d3ff5f37..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/oak_frame.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [-5, 16, -3], - "to": [21, 20, 0], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, -1.5]}, - "faces": { - "north": {"uv": [0, 0, 13, 2], "texture": "#texture"}, - "east": {"uv": [5, 7, 6.5, 9], "texture": "#texture"}, - "south": {"uv": [0, 2, 13, 4], "texture": "#texture"}, - "west": {"uv": [6.5, 7, 8, 9], "texture": "#texture"}, - "up": {"uv": [13, 5.5, 0, 4], "texture": "#texture"}, - "down": {"uv": [13, 5.5, 0, 7], "texture": "#texture"} - } - }, - { - "from": [-5, -4, -3], - "to": [21, 0, 0], - "rotation": {"angle": 0, "axis": "z", "origin": [8, -2, -1.5]}, - "faces": { - "north": {"uv": [0, 2, 13, 0], "texture": "#texture"}, - "east": {"uv": [5, 9, 6.5, 7], "texture": "#texture"}, - "south": {"uv": [0, 4, 13, 2], "texture": "#texture"}, - "west": {"uv": [6.5, 9, 8, 7], "texture": "#texture"}, - "up": {"uv": [13, 7, 0, 5.5], "texture": "#texture"}, - "down": {"uv": [13, 4, 0, 5.5], "texture": "#texture"} - } - }, - { - "from": [-3, 0, -2], - "to": [0, 16, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [0, 7, 1.5, 15], "texture": "#texture"}, - "east": {"uv": [3, 7, 4, 15], "texture": "#texture"}, - "south": {"uv": [1.5, 7, 3, 15], "texture": "#texture"}, - "west": {"uv": [4, 7, 5, 15], "texture": "#texture"} - } - }, - { - "from": [16, 0, -2], - "to": [19, 16, 0], - "faces": { - "north": {"uv": [1.5, 7, 0, 15], "texture": "#texture"}, - "east": {"uv": [5, 7, 4, 15], "texture": "#texture"}, - "south": {"uv": [3, 7, 1.5, 15], "texture": "#texture"}, - "west": {"uv": [4, 7, 3, 15], "texture": "#texture"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/oak_horizontal.json index b1ddf6a6..7a92fe06 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_horizontal.json @@ -1,23 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/oak_frame", - "particle": "minecraft:block/oak_planks" - }, - "elements": [ - { - "from": [0, 7, 14], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 15]}, - "faces": { - "north": {"uv": [0, 7, 1, 15], "rotation": 90, "texture": "#texture"}, - "east": {"uv": [9, 7, 8, 8], "rotation": 270, "texture": "#texture"}, - "south": {"uv": [1, 7, 0, 15], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [9, 7, 8, 8], "rotation": 270, "texture": "#texture"}, - "up": {"uv": [3, 7, 4, 15], "rotation": 270, "texture": "#texture"}, - "down": {"uv": [4, 7, 5, 15], "rotation": 270, "texture": "#texture"} - } - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak_sticks", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_inventory.json b/src/main/resources/assets/bbb/models/block/frame/oak_inventory.json new file mode 100644 index 00000000..5e6455f0 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/oak_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_left.json b/src/main/resources/assets/bbb/models/block/frame/oak_left.json index 4b14e243..f1200bbe 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_left.json @@ -1,23 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/oak_frame", + "texture": "bbb:block/frame/oak", "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [15.99, -0.01, 13.99], - "to": [19.01, 16.01, 16.01], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -8]}, - "faces": { - "north": {"uv": [1.5, 7, 0, 15], "texture": "#texture"}, - "east": {"uv": [5, 7, 4, 15], "texture": "#texture"}, - "south": {"uv": [0, 7, 1.5, 15], "texture": "#texture"}, - "west": {"uv": [4, 7, 3, 15], "texture": "#texture"}, - "up": {"uv": [8, 7, 9.48, 7.98], "texture": "#texture"}, - "down": {"uv": [8, 7, 9.48, 7.98], "texture": "#texture"} - } - } - ] -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_middle.json b/src/main/resources/assets/bbb/models/block/frame/oak_middle.json deleted file mode 100644 index c07477d7..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/oak_middle.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [7, 0, 14], - "to": [9, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -8]}, - "faces": { - "north": {"uv": [0, 7, 1, 15], "texture": "#texture"}, - "east": {"uv": [3, 7, 4, 15], "texture": "#texture"}, - "south": {"uv": [1, 7, 0, 15], "texture": "#texture"}, - "west": {"uv": [4, 7, 5, 15], "texture": "#texture"}, - "up": {"uv": [9, 7, 8, 8], "texture": "#texture"}, - "down": {"uv": [9, 7, 8, 8], "texture": "#texture"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_right.json b/src/main/resources/assets/bbb/models/block/frame/oak_right.json index 099c43a8..de64f3a2 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_right.json @@ -1,23 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/oak_frame", + "texture": "bbb:block/frame/oak", "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [-3.01, -0.01, 13.99], - "to": [0.01, 16.01, 16.01], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -8]}, - "faces": { - "north": {"uv": [0, 7, 1.5, 15], "texture": "#texture"}, - "east": {"uv": [3, 7, 4, 15], "texture": "#texture"}, - "south": {"uv": [1.5, 7, 0, 15], "texture": "#texture"}, - "west": {"uv": [4, 7, 5, 15], "texture": "#texture"}, - "up": {"uv": [9.48, 7, 8, 7.98], "texture": "#texture"}, - "down": {"uv": [9.48, 7, 8, 7.98], "texture": "#texture"} - } - } - ] -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_top.json b/src/main/resources/assets/bbb/models/block/frame/oak_top.json index 8da8f75a..7c34c183 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_top.json @@ -1,32 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [-0.01, 15.99, 12.99], - "to": [16.01, 20.01, 16.01], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, -1.5]}, - "faces": { - "north": {"uv": [2.5, 0, 10.5, 2], "texture": "#texture"}, - "east": {"uv": [5, 7, 6.5, 9], "texture": "#texture"}, - "south": {"uv": [2.5, 2, 10.5, 4], "texture": "#texture"}, - "west": {"uv": [6.5, 7, 8, 9], "texture": "#texture"}, - "up": {"uv": [10.5, 5.5, 2.5, 4], "texture": "#texture"}, - "down": {"uv": [10.5, 5.5, 2.5, 7], "texture": "#texture"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/oak_top_left_corner.json index 94817504..761e55ad 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_top_left_corner.json @@ -1,46 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [15.99, 15.99, 12.99], - "to": [21.01, 20.01, 16.01], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, -1.5]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 2], "texture": "#texture"}, - "east": {"uv": [5, 7, 6.5, 9], "texture": "#texture"}, - "south": {"uv": [2.5, 2, 0, 4], "texture": "#texture"}, - "west": {"uv": [6.5, 7, 8, 9], "texture": "#texture"}, - "up": {"uv": [2.5, 5.5, 0, 4], "texture": "#texture"}, - "down": {"uv": [2.5, 5.5, 0, 7], "texture": "#texture"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/oak_top_right_corner.json index 573dab68..a0b0a2e2 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_top_right_corner.json @@ -1,46 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" - }, - "elements": [ - { - "from": [-5.01, 15.99, 12.99], - "to": [0.01, 20.01, 16.01], - "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, -1.5]}, - "faces": { - "north": {"uv": [2.5, 0, 0, 2], "texture": "#texture"}, - "east": {"uv": [8, 7, 6.5, 9], "texture": "#texture"}, - "south": {"uv": [0, 2, 2.5, 4], "texture": "#texture"}, - "west": {"uv": [6.5, 7, 5, 9], "texture": "#texture"}, - "up": {"uv": [0, 5.5, 2.5, 4], "texture": "#texture"}, - "down": {"uv": [0, 5.5, 2.5, 7], "texture": "#texture"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0] - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_vertical.json b/src/main/resources/assets/bbb/models/block/frame/oak_vertical.json index 668a2768..4bc0d8ef 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/oak_vertical.json @@ -1,23 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/oak_frame", - "particle": "minecraft:block/oak_planks" - }, - "elements": [ - { - "from": [7, 0, 14], - "to": [9, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -8]}, - "faces": { - "north": {"uv": [0, 7, 1, 15], "texture": "#texture"}, - "east": {"uv": [3, 7, 4, 15], "texture": "#texture"}, - "south": {"uv": [1, 7, 0, 15], "texture": "#texture"}, - "west": {"uv": [4, 7, 5, 15], "texture": "#texture"}, - "up": {"uv": [9, 7, 8, 8], "texture": "#texture"}, - "down": {"uv": [9, 7, 8, 8], "texture": "#texture"} - } - } - ] -} \ No newline at end of file + "texture": "bbb:block/frame/oak_sticks", + "particle": "block/oak_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_bottom.json b/src/main/resources/assets/bbb/models/block/frame/spruce_bottom.json index 44c6391b..865f1da8 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/spruce", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_left_corner.json index 84b6ad67..24e75a9d 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/spruce", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_right_corner.json index 2cdee8d3..8d54eaa8 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/spruce", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal.json deleted file mode 100644 index 055cc6e5..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/spruce_frame_sticks", - "particle": "minecraft:block/spruce_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_left.json index 2a06a747..548b5685 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/spruce_frame_sticks", - "particle": "minecraft:block/spruce_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/spruce_sticks", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_right.json index 055cc6e5..056eac7a 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/spruce_frame_sticks", - "particle": "minecraft:block/spruce_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/spruce_sticks", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_frame.json b/src/main/resources/assets/bbb/models/block/frame/spruce_frame.json deleted file mode 100644 index 8c9bc3cb..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/spruce_frame_inventory.json deleted file mode 100644 index bee8307a..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/spruce_horizontal.json index 3f31c6fb..b1b4c88c 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/spruce_frame", - "particle": "minecraft:block/spruce_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/spruce_sticks", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_inventory.json b/src/main/resources/assets/bbb/models/block/frame/spruce_inventory.json new file mode 100644 index 00000000..e6fb5750 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/spruce", + "particle": "block/spruce_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_left.json b/src/main/resources/assets/bbb/models/block/frame/spruce_left.json index 24b80181..ec2478b0 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/spruce_frame", + "texture": "bbb:block/frame/spruce", "particle": "block/spruce_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_middle.json b/src/main/resources/assets/bbb/models/block/frame/spruce_middle.json deleted file mode 100644 index 4a94a937..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_right.json b/src/main/resources/assets/bbb/models/block/frame/spruce_right.json index 63506598..6a5d72ed 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/spruce_frame", + "texture": "bbb:block/frame/spruce", "particle": "block/spruce_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_top.json b/src/main/resources/assets/bbb/models/block/frame/spruce_top.json index 0cebac36..cbd097c5 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/spruce", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/spruce_top_left_corner.json index ebc2ebf6..e168a141 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/spruce", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/spruce_top_right_corner.json index 4d3a40e4..c6a66d98 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/spruce_planks", - "texture": "bbb:block/frame/spruce_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/spruce", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/spruce_vertical.json b/src/main/resources/assets/bbb/models/block/frame/spruce_vertical.json index e4c14b61..d069ce9a 100644 --- a/src/main/resources/assets/bbb/models/block/frame/spruce_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/spruce_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/spruce_frame", - "particle": "minecraft:block/spruce_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/spruce_sticks", + "particle": "block/spruce_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_bottom.json b/src/main/resources/assets/bbb/models/block/frame/warped_bottom.json index b5bb7d7c..5e011cfe 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_bottom.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_bottom.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom", "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - -0.01, - -4.01, - 12.99 - ], - "to": [ - 16.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/warped", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/warped_bottom_left_corner.json index a08b2372..d1587674 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_bottom_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_bottom_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_left_corner", "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - 15.99, - -4.01, - 12.99 - ], - "to": [ - 21.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 2.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 0, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/warped", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/warped_bottom_right_corner.json index dd09832b..7af7d65f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_bottom_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_bottom_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/bottom_right_corner", "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - -5.01, - -4.01, - 12.99 - ], - "to": [ - 0.01, - 0.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 0, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 2.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 5, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/warped", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_diagonal.json b/src/main/resources/assets/bbb/models/block/frame/warped_diagonal.json deleted file mode 100644 index 485cc51b..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/warped_diagonal.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "1": "bbb:block/frame/warped_frame_sticks", - "particle": "minecraft:block/warped_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_left.json b/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_left.json index 685fa327..2614f0da 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_left.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_left", "textures": { - "1": "bbb:block/frame/warped_frame_sticks", - "particle": "minecraft:block/warped_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": -45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/warped_sticks", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_right.json b/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_right.json index 485cc51b..cfb87f77 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_diagonal_right.json @@ -1,116 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/diagonal_right", "textures": { - "1": "bbb:block/frame/warped_frame_sticks", - "particle": "minecraft:block/warped_planks" - }, - "elements": [ - { - "from": [ - 7.00176, - -3.31676, - 14 - ], - "to": [ - 9.00176, - 19.31324, - 16 - ], - "rotation": { - "angle": 45, - "axis": "z", - "origin": [ - 8.00176, - 7.99824, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 0, - 0, - 1, - 11.5 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 1, - 0, - 2, - 11.5 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 3, - 1, - 2, - 0 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 3, - 1, - 2, - 2 - ], - "texture": "#1" - } - } - } - ], - "groups": [ - { - "name": "bone", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "bone2", - "origin": [ - 16, - -16, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/warped_sticks", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_frame.json b/src/main/resources/assets/bbb/models/block/frame/warped_frame.json deleted file mode 100644 index b06b4f3c..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/warped_frame.json +++ /dev/null @@ -1,294 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - -5, - 16, - -3 - ], - "to": [ - 21, - 20, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 13, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 13, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -5, - -4, - -3 - ], - "to": [ - 21, - 0, - 0 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - -2, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 2, - 13, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 4, - 13, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 13, - 7, - 0, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 13, - 4, - 0, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -3, - 0, - -2 - ], - "to": [ - 0, - 16, - 0 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 0, - 0 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 16, - 0, - -2 - ], - "to": [ - 19, - 16, - 0 - ], - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_frame_inventory.json b/src/main/resources/assets/bbb/models/block/frame/warped_frame_inventory.json deleted file mode 100644 index 1db9e136..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/warped_frame_inventory.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - -0.02, - 11.98, - 5.98 - ], - "to": [ - 16.02, - 16.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - -0.02, - -0.02, - 5.98 - ], - "to": [ - 16.02, - 4.02, - 9.02 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 2, - 10.5, - 0 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 9, - 6.5, - 7 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 4, - 10.5, - 2 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 9, - 8, - 7 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 7, - 2.5, - 5.5 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 4, - 2.5, - 5.5 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 2, - 0, - 7 - ], - "to": [ - 5, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - } - } - }, - { - "from": [ - 11, - 0, - 7 - ], - "to": [ - 14, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 3, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 75, - 45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - 2, - 3 - ] - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_horizontal.json b/src/main/resources/assets/bbb/models/block/frame/warped_horizontal.json index 0fcb337f..87e9d296 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_horizontal.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_horizontal.json @@ -1,96 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/horizontal", "textures": { - "texture": "bbb:block/frame/warped_frame", - "particle": "minecraft:block/warped_planks" - }, - "elements": [ - { - "from": [ - 0, - 7, - 14 - ], - "to": [ - 16, - 9, - 16 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 8, - 15 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "rotation": 90, - "texture": "#texture" - }, - "east": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "west": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "rotation": 270, - "texture": "#texture" - }, - "up": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "rotation": 270, - "texture": "#texture" - }, - "down": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "rotation": 270, - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/warped_sticks", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_inventory.json b/src/main/resources/assets/bbb/models/block/frame/warped_inventory.json new file mode 100644 index 00000000..fa4ccc44 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/frame/warped_inventory.json @@ -0,0 +1,7 @@ +{ + "parent": "bbb:block/template/frame/inventory", + "textures": { + "texture": "bbb:block/frame/warped", + "particle": "block/warped_planks" + } +} diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_left.json b/src/main/resources/assets/bbb/models/block/frame/warped_left.json index 8393a6ab..d79a0d16 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_left.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_left.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/left", "textures": { - "texture": "bbb:block/frame/warped_frame", + "texture": "bbb:block/frame/warped", "particle": "block/warped_planks" - }, - "elements": [ - { - "from": [ - 15.99, - -0.01, - 13.99 - ], - "to": [ - 19.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 3, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 8, - 7, - 9.48, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_middle.json b/src/main/resources/assets/bbb/models/block/frame/warped_middle.json deleted file mode 100644 index 2c6fab65..00000000 --- a/src/main/resources/assets/bbb/models/block/frame/warped_middle.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] -} diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_right.json b/src/main/resources/assets/bbb/models/block/frame/warped_right.json index 72791679..a7eb0771 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_right.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_right.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/right", "textures": { - "texture": "bbb:block/frame/warped_frame", + "texture": "bbb:block/frame/warped", "particle": "block/warped_planks" - }, - "elements": [ - { - "from": [ - -3.01, - -0.01, - 13.99 - ], - "to": [ - 0.01, - 16.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1.5, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1.5, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9.48, - 7, - 8, - 7.98 - ], - "texture": "#texture" - } - } - } - ] + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_top.json b/src/main/resources/assets/bbb/models/block/frame/warped_top.json index 74cf09c7..8731fb5c 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_top.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_top.json @@ -1,105 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top", "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - -0.01, - 15.99, - 12.99 - ], - "to": [ - 16.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 10.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 10.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 10.5, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/warped", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_top_left_corner.json b/src/main/resources/assets/bbb/models/block/frame/warped_top_left_corner.json index 296a0774..8fe0a4bf 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_top_left_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_top_left_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_left_corner", "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - 15.99, - 15.99, - 12.99 - ], - "to": [ - 21.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 2.5, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 5, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 2.5, - 2, - 0, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 8, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 2.5, - 5.5, - 0, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 2.5, - 5.5, - 0, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - } - ] + "texture": "bbb:block/frame/warped", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_top_right_corner.json b/src/main/resources/assets/bbb/models/block/frame/warped_top_right_corner.json index 678ebdbc..2aaa9d8f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_top_right_corner.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_top_right_corner.json @@ -1,127 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/top_right_corner", "textures": { - "particle": "minecraft:block/warped_planks", - "texture": "bbb:block/frame/warped_frame" - }, - "elements": [ - { - "from": [ - -5.01, - 15.99, - 12.99 - ], - "to": [ - 0.01, - 20.01, - 16.01 - ], - "rotation": { - "angle": 0, - "axis": "z", - "origin": [ - 8, - 18, - -1.5 - ] - }, - "faces": { - "north": { - "uv": [ - 2.5, - 0, - 0, - 2 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 8, - 7, - 6.5, - 9 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 0, - 2, - 2.5, - 4 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 6.5, - 7, - 5, - 9 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 0, - 5.5, - 2.5, - 4 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 0, - 5.5, - 2.5, - 7 - ], - "texture": "#texture" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [] - }, - { - "name": "group", - "origin": [ - 0, - 0, - 0 - ], - "color": 0, - "nbt": "{}", - "children": [ - 0 - ] - } - ] + "texture": "bbb:block/frame/warped", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/frame/warped_vertical.json b/src/main/resources/assets/bbb/models/block/frame/warped_vertical.json index e6a0fd2c..ac3cf9f0 100644 --- a/src/main/resources/assets/bbb/models/block/frame/warped_vertical.json +++ b/src/main/resources/assets/bbb/models/block/frame/warped_vertical.json @@ -1,90 +1,7 @@ { - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], + "parent": "bbb:block/template/frame/vertical", "textures": { - "texture": "bbb:block/frame/warped_frame", - "particle": "minecraft:block/warped_planks" - }, - "elements": [ - { - "from": [ - 7, - 0, - 14 - ], - "to": [ - 9, - 16, - 16 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 0, - -8 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 7, - 1, - 15 - ], - "texture": "#texture" - }, - "east": { - "uv": [ - 3, - 7, - 4, - 15 - ], - "texture": "#texture" - }, - "south": { - "uv": [ - 1, - 7, - 0, - 15 - ], - "texture": "#texture" - }, - "west": { - "uv": [ - 4, - 7, - 5, - 15 - ], - "texture": "#texture" - }, - "up": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - }, - "down": { - "uv": [ - 9, - 7, - 8, - 8 - ], - "texture": "#texture" - } - } - } - ] + "texture": "bbb:block/frame/warped_sticks", + "particle": "block/warped_planks" + } } diff --git a/src/main/resources/assets/bbb/models/block/template/frame/bottom.json b/src/main/resources/assets/bbb/models/block/template/frame/bottom.json new file mode 100644 index 00000000..264fbc4a --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/bottom.json @@ -0,0 +1,31 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [-0.025, -4.025, 12.975], + "to": [16.025, 0.025, 16.025], + "rotation": {"angle": 0, "axis": "z", "origin": [8, -2, -1.5]}, + "faces": { + "north": {"uv": [2.5, 2, 10.5, 0], "texture": "#texture"}, + "east": {"uv": [5, 9, 6.5, 7], "texture": "#texture"}, + "south": {"uv": [2.5, 4, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [6.5, 9, 8, 7], "texture": "#texture"}, + "up": {"uv": [10.5, 7, 2.5, 5.5], "texture": "#texture"}, + "down": {"uv": [10.5, 4, 2.5, 5.5], "texture": "#texture"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/bottom_left_corner.json new file mode 100644 index 00000000..1f383e9d --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/bottom_left_corner.json @@ -0,0 +1,46 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "particle": "minecraft:block/oak_planks", + "texture": "bbb:block/frame/oak" + }, + "elements": [ + { + "from": [15.99, -4.01, 12.99], + "to": [21.01, 0.01, 16.01], + "rotation": {"angle": 0, "axis": "z", "origin": [8, -2, -1.5]}, + "faces": { + "north": {"uv": [0, 2, 2.5, 0], "texture": "#texture"}, + "east": {"uv": [5, 9, 6.5, 7], "texture": "#texture"}, + "south": {"uv": [2.5, 4, 0, 2], "texture": "#texture"}, + "west": {"uv": [6.5, 9, 8, 7], "texture": "#texture"}, + "up": {"uv": [2.5, 7, 0, 5.5], "texture": "#texture"}, + "down": {"uv": [2.5, 4, 0, 5.5], "texture": "#texture"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/bottom_right_corner.json new file mode 100644 index 00000000..1a57dcdd --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/bottom_right_corner.json @@ -0,0 +1,43 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [-5.02, -4.02, 12.98], + "to": [0.02, 0.02, 16.02], + "rotation": {"angle": 0, "axis": "z", "origin": [8, -2, -1.5]}, + "faces": { + "north": {"uv": [2.5, 2, 0, 0], "texture": "#texture"}, + "east": {"uv": [8, 9, 6.5, 7], "texture": "#texture"}, + "south": {"uv": [0, 4, 2.5, 2], "texture": "#texture"}, + "west": {"uv": [6.5, 9, 5, 7], "texture": "#texture"}, + "up": {"uv": [0, 7, 2.5, 5.5], "texture": "#texture"}, + "down": {"uv": [0, 4, 2.5, 5.5], "texture": "#texture"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/diagonal_left.json b/src/main/resources/assets/bbb/models/block/template/frame/diagonal_left.json new file mode 100644 index 00000000..9da97d78 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/diagonal_left.json @@ -0,0 +1,37 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak_sticks", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [6.99176, -3.32676, 13.99], + "to": [9.01176, 19.32324, 16.01], + "rotation": {"angle": -45, "axis": "z", "origin": [8.00176, 7.99824, 15]}, + "faces": { + "north": {"uv": [0, 0, 1, 11.5], "texture": "#texture"}, + "east": {"uv": [1, 0, 2, 11.5], "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 11.5], "texture": "#texture"}, + "west": {"uv": [1, 0, 2, 11.5], "texture": "#texture"}, + "up": {"uv": [3, 1, 2, 0], "texture": "#texture"}, + "down": {"uv": [3, 1, 2, 2], "texture": "#texture"} + } + } + ], + "groups": [ + { + "name": "bone", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + }, + { + "name": "bone2", + "origin": [16, -16, 0], + "color": 0, + "children": [] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_diagonal.json b/src/main/resources/assets/bbb/models/block/template/frame/diagonal_right.json similarity index 57% rename from src/main/resources/assets/bbb/models/block/frame/oak_diagonal.json rename to src/main/resources/assets/bbb/models/block/template/frame/diagonal_right.json index 3a34a80d..5fa91b5f 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_diagonal.json +++ b/src/main/resources/assets/bbb/models/block/template/frame/diagonal_right.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "1": "bbb:block/frame/oak_frame_sticks", + "texture": "bbb:block/frame/oak_sticks", "particle": "minecraft:block/oak_planks" }, "elements": [ @@ -11,12 +11,12 @@ "to": [9.00176, 19.31324, 16], "rotation": {"angle": 45, "axis": "z", "origin": [8.00176, 7.99824, 15]}, "faces": { - "north": {"uv": [0, 0, 1, 11.5], "texture": "#1"}, - "east": {"uv": [1, 0, 2, 11.5], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 11.5], "texture": "#1"}, - "west": {"uv": [1, 0, 2, 11.5], "texture": "#1"}, - "up": {"uv": [3, 1, 2, 0], "texture": "#1"}, - "down": {"uv": [3, 1, 2, 2], "texture": "#1"} + "north": {"uv": [0, 0, 1, 11.5], "texture": "#texture"}, + "east": {"uv": [1, 0, 2, 11.5], "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 11.5], "texture": "#texture"}, + "west": {"uv": [1, 0, 2, 11.5], "texture": "#texture"}, + "up": {"uv": [3, 1, 2, 0], "texture": "#texture"}, + "down": {"uv": [3, 1, 2, 2], "texture": "#texture"} } } ], diff --git a/src/main/resources/assets/bbb/models/block/template/frame/horizontal.json b/src/main/resources/assets/bbb/models/block/template/frame/horizontal.json new file mode 100644 index 00000000..a89c1ce9 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/horizontal.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak_sticks", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [0, 7, 14], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, + "faces": { + "north": {"uv": [1, 1, 0, 9], "rotation": 90, "texture": "#texture"}, + "east": {"uv": [2, 0, 1, 1], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [1, 2.5, 0, 10.5], "rotation": 270, "texture": "#texture"}, + "west": {"uv": [2, 0, 1, 1], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [2, 2.5, 1, 10.5], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [2, 2.5, 1, 10.5], "rotation": 270, "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/frame/oak_frame_inventory.json b/src/main/resources/assets/bbb/models/block/template/frame/inventory.json similarity index 96% rename from src/main/resources/assets/bbb/models/block/frame/oak_frame_inventory.json rename to src/main/resources/assets/bbb/models/block/template/frame/inventory.json index f9796d8e..430a740b 100644 --- a/src/main/resources/assets/bbb/models/block/frame/oak_frame_inventory.json +++ b/src/main/resources/assets/bbb/models/block/template/frame/inventory.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "particle": "minecraft:block/oak_planks", - "texture": "bbb:block/frame/oak_frame" + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" }, "elements": [ { @@ -55,6 +55,7 @@ } } ], + "gui_light": "front", "display": { "thirdperson_righthand": { "rotation": [75, 45, 0], @@ -91,7 +92,6 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "nbt": "{}", "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/bbb/models/block/template/frame/left.json b/src/main/resources/assets/bbb/models/block/template/frame/left.json new file mode 100644 index 00000000..d01a9349 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/left.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [15.98, -0.02, 12.98], + "to": [19.02, 16.02, 16.02], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -8]}, + "faces": { + "north": {"uv": [1.5, 7, 0, 15], "texture": "#texture"}, + "east": {"uv": [2.5, 7, 4.01, 15.01], "texture": "#texture"}, + "south": {"uv": [1.5, 7, 0, 15], "texture": "#texture"}, + "west": {"uv": [2.5, 7, 4.01, 15.01], "texture": "#texture"}, + "up": {"uv": [8, 7, 9.48, 7.98], "texture": "#texture"}, + "down": {"uv": [8, 7, 9.48, 7.98], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/right.json b/src/main/resources/assets/bbb/models/block/template/frame/right.json new file mode 100644 index 00000000..e35dc8ac --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/right.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [-3.01, -0.01, 12.99], + "to": [0.01, 16.01, 16.01], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -8]}, + "faces": { + "north": {"uv": [1.51, 7, 0, 15.01], "texture": "#texture"}, + "east": {"uv": [5.01, 7, 3.5, 15.01], "texture": "#texture"}, + "south": {"uv": [1.51, 7, 0, 15.01], "texture": "#texture"}, + "west": {"uv": [5.01, 7, 3.5, 15.01], "texture": "#texture"}, + "up": {"uv": [9.48, 7, 8, 7.98], "texture": "#texture"}, + "down": {"uv": [9.48, 7, 8, 7.98], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom.json new file mode 100644 index 00000000..6fa24706 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [-0.019, -5.019, 11.981], + "to": [16.019, 0.019, 16.019], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 15]}, + "faces": { + "north": {"uv": [3.5, 0, 11.5, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [3.5, 0, 11.5, 2.5], "texture": "#texture"}, + "west": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "up": {"uv": [11.5, 4.5, 3.5, 2.5], "texture": "#texture"}, + "down": {"uv": [11.5, 4.5, 3.5, 2.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom_left_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom_left_corner.json new file mode 100644 index 00000000..6723058d --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom_left_corner.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [15.985, -5.015, 11.985], + "to": [23.015, 0.015, 16.015], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 15]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [11.5, 0, 15, 2.5], "texture": "#texture"}, + "west": {"uv": [9, 9.5, 7, 12], "texture": "#texture"}, + "up": {"uv": [0, 4.5, 3.5, 2.5], "texture": "#texture"}, + "down": {"uv": [0, 4.5, 3.5, 2.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom_right_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom_right_corner.json new file mode 100644 index 00000000..aab2cc76 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/bottom_right_corner.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [-7.005, -5.005, 11.995], + "to": [0.005, 0.005, 16.005], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 15]}, + "faces": { + "north": {"uv": [11.5, 0, 15, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [0, 0, 3.5, 2.5], "texture": "#texture"}, + "west": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "up": {"uv": [15, 4.5, 11.5, 2.5], "texture": "#texture"}, + "down": {"uv": [15, 4.5, 11.5, 2.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/diagonal_left.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/diagonal_left.json new file mode 100644 index 00000000..7fe23427 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/diagonal_left.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "particle": "bbb:block/frame/stone/oak", + "texture": "bbb:block/frame/stone/oak" + }, + "elements": [ + { + "from": [5.99176, -3.32676, 13.97], + "to": [10.01176, 19.32324, 15.99], + "rotation": {"angle": -45, "axis": "z", "origin": [8.00176, 7.99824, 15]}, + "faces": { + "north": {"uv": [14, 4.5, 16, 15.5], "texture": "#texture"}, + "east": {"uv": [13, 4.5, 14, 15.5], "texture": "#texture"}, + "south": {"uv": [16, 15.5, 14, 4.5], "texture": "#texture"}, + "west": {"uv": [13, 4.5, 14, 15.5], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#texture"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/diagonal_right.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/diagonal_right.json new file mode 100644 index 00000000..037b322a --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/diagonal_right.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "particle": "bbb:block/frame/stone/oak", + "texture": "bbb:block/frame/stone/oak" + }, + "elements": [ + { + "from": [5.99824, -3.31676, 13.98], + "to": [9.99824, 19.31324, 15.98], + "rotation": {"angle": 45, "axis": "z", "origin": [7.99824, 7.99824, 15]}, + "faces": { + "north": {"uv": [16, 15.5, 14, 4.5], "texture": "#texture"}, + "east": {"uv": [14, 15.5, 13, 4.5], "texture": "#texture"}, + "south": {"uv": [14, 4.5, 16, 15.5], "texture": "#texture"}, + "west": {"uv": [14, 15.5, 13, 4.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/horizontal.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/horizontal.json new file mode 100644 index 00000000..a560b3e6 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/horizontal.json @@ -0,0 +1,20 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/stone" + }, + "elements": [ + { + "from": [0, 6, 13.98], + "to": [16, 10, 15.98], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 14.98]}, + "faces": { + "north": {"uv": [14, 6.5, 16, 14], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [16, 14, 14, 6.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [13, 6.5, 14, 14], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [13, 6.5, 14, 14], "rotation": 90, "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/inventory.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/inventory.json new file mode 100644 index 00000000..b167f128 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/inventory.json @@ -0,0 +1,124 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/stone" + }, + "elements": [ + { + "from": [2.99, 14.99, 5.99], + "to": [13.01, 20.01, 10.01], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 9]}, + "faces": { + "north": {"uv": [5, 0, 10, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [5, 0, 10, 2.5], "texture": "#texture"}, + "west": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "up": {"uv": [10, 4.5, 5, 2.5], "texture": "#texture"}, + "down": {"uv": [10, 4.5, 5, 2.5], "texture": "#texture"} + } + }, + { + "from": [3, 0, 6], + "to": [13, 5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 9]}, + "faces": { + "north": {"uv": [5, 0, 10, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [5, 0, 10, 2.5], "texture": "#texture"}, + "west": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "up": {"uv": [10, 4.5, 5, 2.5], "texture": "#texture"}, + "down": {"uv": [10, 4.5, 5, 2.5], "texture": "#texture"} + } + }, + { + "from": [12.99, 1.99, 6.99], + "to": [17.01, 18.01, 10.01], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 6, 9]}, + "faces": { + "north": {"uv": [0, 4.5, 2, 12.5], "texture": "#texture"}, + "east": {"uv": [2, 4.5, 3.5, 12.5], "texture": "#texture"}, + "south": {"uv": [0, 4.5, 2, 12.5], "texture": "#texture"}, + "west": {"uv": [3.5, 4.5, 5, 12.5], "texture": "#texture"}, + "up": {"uv": [11, 11, 9, 9.5], "texture": "#texture"}, + "down": {"uv": [11, 9.5, 9, 11], "texture": "#texture"} + } + }, + { + "from": [12.98, 6.98, 5.98], + "to": [20.02, 13.02, 10.02], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 6, 9]}, + "faces": { + "north": {"uv": [5, 4.5, 8.5, 7.5], "texture": "#texture"}, + "east": {"uv": [8.5, 6.5, 10.5, 9.5], "texture": "#texture"}, + "south": {"uv": [5, 4.5, 8.5, 7.5], "texture": "#texture"}, + "west": {"uv": [5, 9.5, 7, 12.5], "texture": "#texture"}, + "up": {"uv": [8.5, 9.5, 5, 7.5], "texture": "#texture"}, + "down": {"uv": [12, 4.5, 8.5, 6.5], "texture": "#texture"} + } + }, + { + "from": [-1, 2, 7], + "to": [3, 18, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 6, 9]}, + "faces": { + "north": {"uv": [2, 4.5, 0, 12.5], "texture": "#texture"}, + "east": {"uv": [5, 4.5, 3.5, 12.5], "texture": "#texture"}, + "south": {"uv": [2, 4.5, 0, 12.5], "texture": "#texture"}, + "west": {"uv": [3.5, 4.5, 2, 12.5], "texture": "#texture"}, + "up": {"uv": [9, 11, 11, 9.5], "texture": "#texture"}, + "down": {"uv": [9, 9.5, 11, 11], "texture": "#texture"} + } + }, + { + "from": [-4.01, 6.99, 5.99], + "to": [3.01, 13.01, 10.01], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 6, 9]}, + "faces": { + "north": {"uv": [8.5, 4.5, 5, 7.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 5, 12.5], "texture": "#texture"}, + "south": {"uv": [5, 4.5, 8.5, 7.5], "texture": "#texture"}, + "west": {"uv": [10.5, 6.5, 8.5, 9.5], "texture": "#texture"}, + "up": {"uv": [5, 9.5, 8.5, 7.5], "texture": "#texture"}, + "down": {"uv": [8.5, 4.5, 12, 6.5], "texture": "#texture"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, -69.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -69.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, -1, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, -0.75, 0] + }, + "fixed": { + "translation": [0, -4, -2], + "scale": [1.999, 1.999, 1.999] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/left.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/left.json new file mode 100644 index 00000000..b9a2c4f8 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/left.json @@ -0,0 +1,36 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [15.982, -0.018, 11.982], + "to": [20.018, 16.018, 16.018], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 4, 15]}, + "faces": { + "north": {"uv": [0, 4.5, 2.01, 12.51], "texture": "#texture"}, + "east": {"uv": [2, 4.5, 4.01, 12.51], "texture": "#texture"}, + "south": {"uv": [2.01, 4.5, 0, 12.51], "texture": "#texture"}, + "west": {"uv": [5.51, 4.5, 3.5, 12.51], "texture": "#texture"}, + "up": {"uv": [11.01, 11.51, 9, 9.5], "texture": "#texture"}, + "down": {"uv": [11.01, 9.5, 9, 11.51], "texture": "#texture"} + } + }, + { + "from": [15.96, 4.96, 11.96], + "to": [23.04, 11.04, 16.04], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 4, 15]}, + "faces": { + "north": {"uv": [5, 4.5, 8.5, 7.5], "texture": "#texture"}, + "east": {"uv": [8.5, 6.5, 10.5, 9.5], "texture": "#texture"}, + "south": {"uv": [5, 4.5, 8.5, 7.5], "texture": "#texture"}, + "west": {"uv": [5, 9.5, 7, 12.5], "texture": "#texture"}, + "up": {"uv": [8.5, 9.5, 5, 7.5], "texture": "#texture"}, + "down": {"uv": [12, 4.5, 8.5, 6.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/right.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/right.json new file mode 100644 index 00000000..f26c63ba --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/right.json @@ -0,0 +1,36 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [-4.012, -0.012, 11.988], + "to": [0.012, 16.012, 16.012], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, 4, 15]}, + "faces": { + "north": {"uv": [2, 4.5, 0, 12.5], "texture": "#texture"}, + "east": {"uv": [5.5, 4.5, 3.5, 12.5], "texture": "#texture"}, + "south": {"uv": [0, 4.5, 2, 12.5], "texture": "#texture"}, + "west": {"uv": [2, 4.5, 4, 12.5], "texture": "#texture"}, + "up": {"uv": [11, 11.5, 9, 9.5], "texture": "#texture"}, + "down": {"uv": [11, 11.5, 9, 9.5], "texture": "#texture"} + } + }, + { + "from": [-7.027, 4.973, 11.973], + "to": [0.027, 11.027, 16.027], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, 4, 15]}, + "faces": { + "north": {"uv": [8.5, 4.5, 5, 7.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 5, 12.5], "texture": "#texture"}, + "south": {"uv": [5, 4.5, 8.5, 7.5], "texture": "#texture"}, + "west": {"uv": [10.5, 6.5, 8.5, 9.5], "texture": "#texture"}, + "up": {"uv": [5, 9.5, 8.5, 7.5], "texture": "#texture"}, + "down": {"uv": [8.5, 4.5, 12, 6.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/top.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/top.json new file mode 100644 index 00000000..a9451594 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/top.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [-0.028, 15.972, 11.972], + "to": [16.028, 21.028, 16.028], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 15]}, + "faces": { + "north": {"uv": [3.5, 0, 11.5, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [3.5, 0, 11.5, 2.5], "texture": "#texture"}, + "west": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "up": {"uv": [11.5, 4.5, 3.5, 2.5], "texture": "#texture"}, + "down": {"uv": [11.5, 4.5, 3.5, 2.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/top_left_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/top_left_corner.json new file mode 100644 index 00000000..d57e7a2d --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/top_left_corner.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [15.965, 15.965, 11.965], + "to": [23.035, 21.035, 16.035], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 15]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [11.5, 0, 15, 2.5], "texture": "#texture"}, + "west": {"uv": [9, 9.5, 7, 12], "texture": "#texture"}, + "up": {"uv": [0, 4.5, 3.5, 2.5], "texture": "#texture"}, + "down": {"uv": [0, 4.5, 3.5, 2.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/top_right_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/top_right_corner.json new file mode 100644 index 00000000..c5609de1 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/top_right_corner.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "block/oak" + }, + "elements": [ + { + "from": [-7, 16, 12], + "to": [0, 21, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 15]}, + "faces": { + "north": {"uv": [11.5, 0, 15, 2.5], "texture": "#texture"}, + "east": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "south": {"uv": [0, 0, 3.5, 2.5], "texture": "#texture"}, + "west": {"uv": [7, 9.5, 9, 12], "texture": "#texture"}, + "up": {"uv": [15, 4.5, 11.5, 2.5], "texture": "#texture"}, + "down": {"uv": [15, 4.5, 11.5, 2.5], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/stone/vertical.json b/src/main/resources/assets/bbb/models/block/template/frame/stone/vertical.json new file mode 100644 index 00000000..b22f0911 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/stone/vertical.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/stone/oak", + "particle": "bbb:block/frame/stone/stone" + }, + "elements": [ + { + "from": [6, 0, 13.98], + "to": [10, 16, 15.98], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 14]}, + "faces": { + "north": {"uv": [16, 6.5, 14, 14], "texture": "#texture"}, + "east": {"uv": [14, 6.5, 13, 14], "texture": "#texture"}, + "south": {"uv": [16, 6.5, 14, 14], "texture": "#texture"}, + "west": {"uv": [14, 6.5, 13, 14], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/top.json b/src/main/resources/assets/bbb/models/block/template/frame/top.json new file mode 100644 index 00000000..efe26f9c --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/top.json @@ -0,0 +1,31 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [-0.025, 15.975, 12.975], + "to": [16.025, 20.025, 16.025], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, -1.5]}, + "faces": { + "north": {"uv": [2.5, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [5, 7, 6.5, 9], "texture": "#texture"}, + "south": {"uv": [2.5, 2, 10.5, 4], "texture": "#texture"}, + "west": {"uv": [6.5, 7, 8, 9], "texture": "#texture"}, + "up": {"uv": [10.5, 5.5, 2.5, 4], "texture": "#texture"}, + "down": {"uv": [10.5, 5.5, 2.5, 7], "texture": "#texture"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/top_left_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/top_left_corner.json new file mode 100644 index 00000000..d4cf464d --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/top_left_corner.json @@ -0,0 +1,43 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [15.98, 15.98, 12.98], + "to": [21.02, 20.02, 16.02], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, -1.5]}, + "faces": { + "north": {"uv": [0, 0, 2.5, 2], "texture": "#texture"}, + "east": {"uv": [5, 7, 6.5, 9], "texture": "#texture"}, + "south": {"uv": [2.5, 2, 0, 4], "texture": "#texture"}, + "west": {"uv": [6.5, 7, 8, 9], "texture": "#texture"}, + "up": {"uv": [2.5, 5.5, 0, 4], "texture": "#texture"}, + "down": {"uv": [2.5, 5.5, 0, 7], "texture": "#texture"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/top_right_corner.json b/src/main/resources/assets/bbb/models/block/template/frame/top_right_corner.json new file mode 100644 index 00000000..769f68cc --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/top_right_corner.json @@ -0,0 +1,46 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "particle": "minecraft:block/oak_planks", + "texture": "bbb:block/frame/oak" + }, + "elements": [ + { + "from": [-5.01, 15.99, 12.99], + "to": [0.01, 20.01, 16.01], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, -1.5]}, + "faces": { + "north": {"uv": [2.5, 0, 0, 2], "texture": "#texture"}, + "east": {"uv": [8, 7, 6.5, 9], "texture": "#texture"}, + "south": {"uv": [0, 2, 2.5, 4], "texture": "#texture"}, + "west": {"uv": [6.5, 7, 5, 9], "texture": "#texture"}, + "up": {"uv": [0, 5.5, 2.5, 4], "texture": "#texture"}, + "down": {"uv": [0, 5.5, 2.5, 7], "texture": "#texture"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/block/template/frame/vertical.json b/src/main/resources/assets/bbb/models/block/template/frame/vertical.json new file mode 100644 index 00000000..ece86752 --- /dev/null +++ b/src/main/resources/assets/bbb/models/block/template/frame/vertical.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "texture": "bbb:block/frame/oak_sticks", + "particle": "block/oak_planks" + }, + "elements": [ + { + "from": [7, 0, 14], + "to": [9, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -8]}, + "faces": { + "north": {"uv": [1, 1, 0, 9], "texture": "#texture"}, + "east": {"uv": [2, 2.5, 1, 10.5], "texture": "#texture"}, + "south": {"uv": [1, 2.5, 0, 10.5], "texture": "#texture"}, + "west": {"uv": [2, 2.5, 1, 10.5], "texture": "#texture"}, + "up": {"uv": [2, 0, 1, 1], "texture": "#texture"}, + "down": {"uv": [2, 0, 1, 1], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bbb/models/item/acacia_frame.json b/src/main/resources/assets/bbb/models/item/acacia_frame.json index 686f9060..fbcbbd59 100644 --- a/src/main/resources/assets/bbb/models/item/acacia_frame.json +++ b/src/main/resources/assets/bbb/models/item/acacia_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/acacia_frame_inventory" + "parent": "bbb:block/frame/acacia_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/bamboo_frame.json b/src/main/resources/assets/bbb/models/item/bamboo_frame.json index d2411bf2..d13dfc59 100644 --- a/src/main/resources/assets/bbb/models/item/bamboo_frame.json +++ b/src/main/resources/assets/bbb/models/item/bamboo_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/bamboo_frame_inventory" + "parent": "bbb:block/frame/bamboo_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/birch_frame.json b/src/main/resources/assets/bbb/models/item/birch_frame.json index aca984b8..acdf761e 100644 --- a/src/main/resources/assets/bbb/models/item/birch_frame.json +++ b/src/main/resources/assets/bbb/models/item/birch_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/birch_frame_inventory" + "parent": "bbb:block/frame/birch_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/cherry_frame.json b/src/main/resources/assets/bbb/models/item/cherry_frame.json index 1e934f87..2f090184 100644 --- a/src/main/resources/assets/bbb/models/item/cherry_frame.json +++ b/src/main/resources/assets/bbb/models/item/cherry_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/cherry_frame_inventory" + "parent": "bbb:block/frame/cherry_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/crimson_frame.json b/src/main/resources/assets/bbb/models/item/crimson_frame.json index 80adef42..1a2289d8 100644 --- a/src/main/resources/assets/bbb/models/item/crimson_frame.json +++ b/src/main/resources/assets/bbb/models/item/crimson_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/crimson_frame_inventory" + "parent": "bbb:block/frame/crimson_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/dark_oak_frame.json b/src/main/resources/assets/bbb/models/item/dark_oak_frame.json index 108f4c46..7c94576d 100644 --- a/src/main/resources/assets/bbb/models/item/dark_oak_frame.json +++ b/src/main/resources/assets/bbb/models/item/dark_oak_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/dark_oak_frame_inventory" + "parent": "bbb:block/frame/dark_oak_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/jungle_frame.json b/src/main/resources/assets/bbb/models/item/jungle_frame.json index 3519e8e8..73287180 100644 --- a/src/main/resources/assets/bbb/models/item/jungle_frame.json +++ b/src/main/resources/assets/bbb/models/item/jungle_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/jungle_frame_inventory" + "parent": "bbb:block/frame/jungle_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/mangrove_frame.json b/src/main/resources/assets/bbb/models/item/mangrove_frame.json index f5d0a73d..48a6f3b6 100644 --- a/src/main/resources/assets/bbb/models/item/mangrove_frame.json +++ b/src/main/resources/assets/bbb/models/item/mangrove_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/mangrove_frame_inventory" + "parent": "bbb:block/frame/mangrove_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/nether_brick_frame.json b/src/main/resources/assets/bbb/models/item/nether_brick_frame.json new file mode 100644 index 00000000..69d93521 --- /dev/null +++ b/src/main/resources/assets/bbb/models/item/nether_brick_frame.json @@ -0,0 +1,3 @@ +{ + "parent": "bbb:block/frame/stone/nether_brick_inventory" +} diff --git a/src/main/resources/assets/bbb/models/item/oak_frame.json b/src/main/resources/assets/bbb/models/item/oak_frame.json index 59041808..c80e4e91 100644 --- a/src/main/resources/assets/bbb/models/item/oak_frame.json +++ b/src/main/resources/assets/bbb/models/item/oak_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/oak_frame_inventory" + "parent": "bbb:block/frame/oak_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/spruce_frame.json b/src/main/resources/assets/bbb/models/item/spruce_frame.json index be4453e4..edc2eafb 100644 --- a/src/main/resources/assets/bbb/models/item/spruce_frame.json +++ b/src/main/resources/assets/bbb/models/item/spruce_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/spruce_frame_inventory" + "parent": "bbb:block/frame/spruce_inventory" } diff --git a/src/main/resources/assets/bbb/models/item/warped_frame.json b/src/main/resources/assets/bbb/models/item/warped_frame.json index 51bdd6d2..961f3493 100644 --- a/src/main/resources/assets/bbb/models/item/warped_frame.json +++ b/src/main/resources/assets/bbb/models/item/warped_frame.json @@ -1,3 +1,3 @@ { - "parent": "bbb:block/frame/warped_frame_inventory" + "parent": "bbb:block/frame/warped_inventory" } diff --git a/src/main/resources/assets/bbb/textures/block/frame/acacia_frame.png b/src/main/resources/assets/bbb/textures/block/frame/acacia.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/acacia_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/acacia.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/acacia_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/acacia_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/acacia_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/acacia_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/bamboo_frame.png b/src/main/resources/assets/bbb/textures/block/frame/bamboo.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/bamboo_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/bamboo.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/bamboo_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/bamboo_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/bamboo_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/bamboo_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/birch_frame.png b/src/main/resources/assets/bbb/textures/block/frame/birch.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/birch_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/birch.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/birch_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/birch_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/birch_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/birch_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/cherry_frame.png b/src/main/resources/assets/bbb/textures/block/frame/cherry.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/cherry_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/cherry.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/cherry_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/cherry_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/cherry_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/cherry_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/crimson_frame.png b/src/main/resources/assets/bbb/textures/block/frame/crimson.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/crimson_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/crimson.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/crimson_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/crimson_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/crimson_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/crimson_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/dark_oak_frame.png b/src/main/resources/assets/bbb/textures/block/frame/dark_oak.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/dark_oak_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/dark_oak.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/dark_oak_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/dark_oak_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/dark_oak_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/dark_oak_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/jungle_frame.png b/src/main/resources/assets/bbb/textures/block/frame/jungle.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/jungle_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/jungle.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/jungle_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/jungle_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/jungle_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/jungle_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/mangrove_frame.png b/src/main/resources/assets/bbb/textures/block/frame/mangrove.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/mangrove_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/mangrove.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/mangrove_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/mangrove_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/mangrove_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/mangrove_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/oak.png b/src/main/resources/assets/bbb/textures/block/frame/oak.png new file mode 100644 index 00000000..bb748fe6 Binary files /dev/null and b/src/main/resources/assets/bbb/textures/block/frame/oak.png differ diff --git a/src/main/resources/assets/bbb/textures/block/frame/oak_frame.png b/src/main/resources/assets/bbb/textures/block/frame/oak_frame.png deleted file mode 100644 index fe28b5da..00000000 Binary files a/src/main/resources/assets/bbb/textures/block/frame/oak_frame.png and /dev/null differ diff --git a/src/main/resources/assets/bbb/textures/block/frame/oak_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/oak_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/oak_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/oak_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/spruce_frame.png b/src/main/resources/assets/bbb/textures/block/frame/spruce.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/spruce_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/spruce.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/spruce_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/spruce_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/spruce_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/spruce_sticks.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/warped_frame.png b/src/main/resources/assets/bbb/textures/block/frame/warped.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/warped_frame.png rename to src/main/resources/assets/bbb/textures/block/frame/warped.png diff --git a/src/main/resources/assets/bbb/textures/block/frame/warped_frame_sticks.png b/src/main/resources/assets/bbb/textures/block/frame/warped_sticks.png similarity index 100% rename from src/main/resources/assets/bbb/textures/block/frame/warped_frame_sticks.png rename to src/main/resources/assets/bbb/textures/block/frame/warped_sticks.png diff --git a/src/main/resources/assets/bbb/textures/font/config.png b/src/main/resources/assets/bbb/textures/font/config.png new file mode 100644 index 00000000..19e21a42 Binary files /dev/null and b/src/main/resources/assets/bbb/textures/font/config.png differ diff --git a/src/main/resources/assets/minecraft/font/default.json b/src/main/resources/assets/minecraft/font/default.json new file mode 100644 index 00000000..b6241189 --- /dev/null +++ b/src/main/resources/assets/minecraft/font/default.json @@ -0,0 +1,13 @@ +{ + "providers": [ + { + "type": "bitmap", + "file": "bbb:font/config.png", + "height": 10, + "ascent": 8, + "chars": [ + "\uE000" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/bbb.mixins.json b/src/main/resources/bbb.mixins.json index 133b7e5c..aa6b9eaa 100644 --- a/src/main/resources/bbb.mixins.json +++ b/src/main/resources/bbb.mixins.json @@ -4,7 +4,7 @@ "compatibilityLevel": "JAVA_17", "refmap": "bbb.refmap.json", "mixins": [ - "PaintingMixin", + "HangingEntityMixin", "WallBlockAccessor" ], "injectors": {