From e4819b466608b822bc0f9cbcb0d6aed6aa5a584d Mon Sep 17 00:00:00 2001 From: stfwi Date: Fri, 6 Nov 2020 23:01:23 +0100 Subject: [PATCH] Top Aligned (raised) Catwalk added. Catwalk Stairs added. --- build.gradle | 32 +- gradle.properties | 4 +- readme.md | 4 + .../java/wile/engineersdecor/ModContent.java | 57 ++- .../engineersdecor/blocks/DecorBlock.java | 4 +- .../engineersdecor/blocks/EdCatwalkBlock.java | 4 +- .../blocks/EdCatwalkStairsBlock.java | 180 +++++++ .../blocks/EdCatwalkTopAlignedBlock.java | 103 ++++ .../engineersdecor/blocks/EdFluidBarrel.java | 2 +- .../engineersdecor/blocks/EdRailingBlock.java | 2 +- .../engineersdecor/eapi/jei/JEIPlugin.java | 5 +- .../libmc/blocks/StandardBlocks.java | 10 +- .../libmc/detail/Auxiliaries.java | 7 + .../blockstates/steel_catwalk_stairs.json | 37 ++ .../blockstates/steel_catwalk_ta.json | 8 + .../assets/engineersdecor/lang/en_us.json | 6 + .../assets/engineersdecor/lang/ru_ru.json | 6 + .../assets/engineersdecor/lang/zh_cn.json | 6 + .../block/furniture/steel_catwalk_model.json | 273 +---------- .../furniture/steel_catwalk_n_model.json | 333 ++----------- .../furniture/steel_catwalk_ne_model.json | 392 +++------------- .../furniture/steel_catwalk_nes_model.json | 417 ++++------------- .../furniture/steel_catwalk_nesw_model.json | 443 ++++-------------- .../furniture/steel_catwalk_ns_model.json | 415 ++++------------ .../steel_catwalk_stairs_br_model.json | 378 +++++++++++++++ .../steel_catwalk_stairs_lr_model.json | 317 +++++++++++++ .../furniture/steel_catwalk_stairs_model.json | 255 ++++++++++ .../steel_catwalk_stairs_rr_model.json | 317 +++++++++++++ .../furniture/steel_catwalk_ta0_model.json | 103 ++++ .../furniture/steel_catwalk_ta1_model.json | 150 ++++++ .../furniture/steel_catwalk_ta2_model.json | 150 ++++++ .../furniture/steel_catwalk_ta3_model.json | 217 +++++++++ .../furniture/steel_floor_grating_model.json | 38 +- .../models/item/steel_catwalk_stairs.json | 1 + .../models/item/steel_catwalk_ta.json | 1 + .../block/furniture/steel_catwalk_side.png | Bin 0 -> 369 bytes .../block/furniture/steel_catwalk_top.png | Bin 369 -> 593 bytes .../loot_tables/blocks/steel_catwalk_ta.json | 21 + .../independent/steel_catwalk_recipe.json | 31 ++ .../steel_catwalk_stairs_recipe.json | 31 ++ .../independent/steel_catwalk_ta_recipe.json | 23 + .../steel_catwalk_ta_recipe_decompose.json | 23 + .../steel_floor_grating_recipe.json | 9 +- .../independent/steel_railing_recipe.json | 29 ++ 44 files changed, 2902 insertions(+), 1942 deletions(-) create mode 100644 src/main/java/wile/engineersdecor/blocks/EdCatwalkStairsBlock.java create mode 100644 src/main/java/wile/engineersdecor/blocks/EdCatwalkTopAlignedBlock.java create mode 100644 src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_stairs.json create mode 100644 src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_ta.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_br_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_lr_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_rr_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta0_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta1_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta2_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta3_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/item/steel_catwalk_stairs.json create mode 100644 src/main/resources/assets/engineersdecor/models/item/steel_catwalk_ta.json create mode 100644 src/main/resources/assets/engineersdecor/textures/block/furniture/steel_catwalk_side.png create mode 100644 src/main/resources/data/engineersdecor/loot_tables/blocks/steel_catwalk_ta.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_recipe.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_stairs_recipe.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe_decompose.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/steel_railing_recipe.json diff --git a/build.gradle b/build.gradle index 150b627..b63371f 100644 --- a/build.gradle +++ b/build.gradle @@ -65,8 +65,8 @@ minecraft { dependencies { minecraft "net.minecraftforge:forge:${version_forge_minecraft}" - // compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api") - // runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}") + compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api") + runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}") } processResources { @@ -91,29 +91,17 @@ jar { def reobfFile = file("$buildDir/reobfJar/output.jar") def reobfArtifact = artifacts.add('default', reobfFile) { type 'jar'; builtBy 'reobfJar' } -def signing = { -> - def sp = new Properties() - if(project.hasProperty("keystore_file")) { - sp.keystore_file = project.keystore_file - sp.keystore_alias = project.keystore_alias - sp.keystore_pass = project.keystore_pass - sp.keystore_keypass = project.keystore_keypass - sp.fingerprint_sha1 = project.fingerprint_sha1 - } else { - logger.warn("[WARNING] No signing data available.") - } - if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) } - return sp -}() task signJar(type: SignJar, dependsOn: jar) { - onlyIf { signing.hasProperty("keystore_file") } - if(signing.hasProperty("keystore_file")) { - keyStore = signing.getProperty("keystore_file") - alias = signing.getProperty("keystore_alias") - storePass = signing.getProperty("keystore_pass") - keyPass = signing.getProperty("keystore_keypass") + onlyIf { project.hasProperty("keystore_file") } + if(project.hasProperty("keystore_file")) { + keyStore = project.getProperty("keystore_file") + alias = project.getProperty("keystore_alias") + storePass = project.getProperty("keystore_pass") + keyPass = project.getProperty("keystore_keypass") inputFile = jar.archivePath outputFile = jar.archivePath + } else { + logger.warn("[WARNING] Signing skipped.") } } build.dependsOn signJar diff --git a/gradle.properties b/gradle.properties index 9330c65..d5345eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.16.4 version_forge_minecraft=1.16.4-35.0.2 version_fml_mappings=20201028-1.16.3 -version_jei=1.16.3:7.3.2.36 -version_engineersdecor=1.1.4-b1 +version_jei=1.16.4:7.6.0.58 +version_engineersdecor=1.1.4-b2 diff --git a/readme.md b/readme.md index 62a97f7..03c965b 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,10 @@ Mod sources for Minecraft version 1.16.x. ## Version history + ~ v1.1.4-b2 [A] Steel Catwalks (top and bottom aligned). + [A] Steel Railings added. + [F] Fixed Empty Fluid Barrel crafting crash (ty inflamedsebi). + - v1.1.4-b1 [U] Ported to 1.16.4. - v1.1.3 [R] Release build v1.1.3. diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index 45b1971..9b38a52 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -864,20 +864,71 @@ public class ModContent )).setRegistryName(new ResourceLocation(MODID, "steel_mesh_fence_gate")); public static final EdRailingBlock STEEL_RAILING = (EdRailingBlock)(new EdRailingBlock( - DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL, + DecorBlock.CFG_CUTOUT, Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1f, 20f).sound(SoundType.METAL).notSolid(), Auxiliaries.getPixeledAABB(0,0,0, 0, 0,0), Auxiliaries.getPixeledAABB(0,0,0, 16,15.9,1) )).setRegistryName(new ResourceLocation(MODID, "steel_railing")); public static final EdCatwalkBlock STEEL_CATWALK = (EdCatwalkBlock)(new EdCatwalkBlock( - DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL, + DecorBlock.CFG_CUTOUT, Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 20f).sound(SoundType.METAL).notSolid(), Auxiliaries.getPixeledAABB(0,0,0, 16, 2,16), Auxiliaries.getPixeledAABB(0,0,0, 16,15.9, 1), STEEL_RAILING )).setRegistryName(new ResourceLocation(MODID, "steel_catwalk")); + public static final EdCatwalkTopAlignedBlock STEEL_CATWALK_TOP_ALIGNED = (EdCatwalkTopAlignedBlock)(new EdCatwalkTopAlignedBlock( + DecorBlock.CFG_CUTOUT, + Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 20f).sound(SoundType.METAL).notSolid(), + new VoxelShape[]{ + VoxelShapes.create(Auxiliaries.getPixeledAABB(0,14,0, 16, 16,16)), // only base + Auxiliaries.getUnionShape( // base with thick pole + Auxiliaries.getPixeledAABB(0,14,0, 16, 16,16), + Auxiliaries.getPixeledAABB(5, 0,5, 11,15, 11) + ), + Auxiliaries.getUnionShape( // base with thin pole + Auxiliaries.getPixeledAABB(0,14,0, 16, 16,16), + Auxiliaries.getPixeledAABB(6, 0,6, 10,15, 10) + ), + Auxiliaries.getUnionShape( // structure frame-like + Auxiliaries.getPixeledAABB( 0, 0, 0, 16, 2,16), + Auxiliaries.getPixeledAABB( 0,14, 0, 16, 16,16), + Auxiliaries.getPixeledAABB( 0, 0, 0, 1, 16, 1), + Auxiliaries.getPixeledAABB(15, 0, 0, 16, 16, 1), + Auxiliaries.getPixeledAABB(15, 0,15, 16, 16,16), + Auxiliaries.getPixeledAABB( 0, 0,15, 1, 16,16) + ) + } + )).setRegistryName(new ResourceLocation(MODID, "steel_catwalk_ta")); + + public static final EdCatwalkStairsBlock STEEL_CATWALK_STAIRS = (EdCatwalkStairsBlock)(new EdCatwalkStairsBlock( + DecorBlock.CFG_CUTOUT, + Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 20f).sound(SoundType.METAL).notSolid(), + new AxisAlignedBB[] { // base + Auxiliaries.getPixeledAABB( 1, 2, 8, 15, 4, 16), + Auxiliaries.getPixeledAABB( 1,10, 0, 15, 12, 8), + }, + new AxisAlignedBB[] { // railing left + Auxiliaries.getPixeledAABB(0.4, 0, 15, 0.6, 15, 16), + Auxiliaries.getPixeledAABB(0.4, 1, 14, 0.6, 16, 15), + Auxiliaries.getPixeledAABB(0.4, 2, 13, 0.6, 17, 14), + Auxiliaries.getPixeledAABB(0.4, 3, 12, 0.6, 18, 13), + Auxiliaries.getPixeledAABB(0.4, 4, 11, 0.6, 19, 12), + Auxiliaries.getPixeledAABB(0.4, 5, 10, 0.6, 20, 11), + Auxiliaries.getPixeledAABB(0.4, 6, 9, 0.6, 21, 10), + Auxiliaries.getPixeledAABB(0.4, 7, 8, 0.6, 22, 9), + Auxiliaries.getPixeledAABB(0.4, 8, 7, 0.6, 23, 8), + Auxiliaries.getPixeledAABB(0.4, 9, 6, 0.6, 24, 7), + Auxiliaries.getPixeledAABB(0.4, 10, 5, 0.6, 25, 6), + Auxiliaries.getPixeledAABB(0.4, 11, 4, 0.6, 26, 5), + Auxiliaries.getPixeledAABB(0.4, 12, 3, 0.6, 27, 4), + Auxiliaries.getPixeledAABB(0.4, 13, 2, 0.6, 28, 3), + Auxiliaries.getPixeledAABB(0.4, 14, 1, 0.6, 29, 2), + Auxiliaries.getPixeledAABB(0.4, 15, 0, 0.6, 30, 1) + } + )).setRegistryName(new ResourceLocation(MODID, "steel_catwalk_stairs")); + // ------------------------------------------------------------------------------------------------------------------- public static final EdTestBlock.TestBlock TEST_BLOCK = (EdTestBlock.TestBlock)(new EdTestBlock.TestBlock( @@ -978,6 +1029,8 @@ public class ModContent STEEL_MESH_FENCE_GATE, STEEL_CATWALK, STEEL_RAILING, + STEEL_CATWALK_TOP_ALIGNED, + STEEL_CATWALK_STAIRS, TREATED_WOOD_POLE, TREATED_WOOD_POLE_HEAD, TREATED_WOOD_POLE_SUPPORT, diff --git a/src/main/java/wile/engineersdecor/blocks/DecorBlock.java b/src/main/java/wile/engineersdecor/blocks/DecorBlock.java index e06fdab..1b490cc 100644 --- a/src/main/java/wile/engineersdecor/blocks/DecorBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/DecorBlock.java @@ -121,8 +121,8 @@ public class DecorBlock public static class HorizontalFourWayWaterLoggable extends StandardBlocks.HorizontalFourWayWaterLoggable implements IWaterLoggable { - public HorizontalFourWayWaterLoggable(long config, Block.Properties properties, AxisAlignedBB base_aabb, AxisAlignedBB side_aabb) - { super(config, properties, base_aabb, side_aabb); } + public HorizontalFourWayWaterLoggable(long config, Block.Properties properties, AxisAlignedBB base_aabb, AxisAlignedBB side_aabb, int railing_height_extension) + { super(config, properties, base_aabb, side_aabb, railing_height_extension); } } } diff --git a/src/main/java/wile/engineersdecor/blocks/EdCatwalkBlock.java b/src/main/java/wile/engineersdecor/blocks/EdCatwalkBlock.java index 1db9aba..31a0bf7 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdCatwalkBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdCatwalkBlock.java @@ -38,7 +38,7 @@ public class EdCatwalkBlock extends DecorBlock.HorizontalFourWayWaterLoggable im final AxisAlignedBB base_aabb; public EdCatwalkBlock(long config, Block.Properties properties, final AxisAlignedBB base_aabb, final AxisAlignedBB railing_aabb, final Block railing_block) - { super(config, properties, base_aabb, railing_aabb); this.railing_block = railing_block; this.base_aabb=base_aabb; } + { super(config, properties, base_aabb, railing_aabb, 0); this.railing_block = railing_block; this.base_aabb=base_aabb; } @Override public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos) @@ -53,7 +53,7 @@ public class EdCatwalkBlock extends DecorBlock.HorizontalFourWayWaterLoggable im { if(!world.setBlockState(pos, state, 1|2)) return false; world.playSound(player, pos, SoundEvents.BLOCK_METAL_PLACE, SoundCategory.BLOCKS, 1f, 1f); - if(!player.isCreative()) { + if((!player.isCreative()) && (!world.isRemote())) { ItemStack stack = player.getHeldItem(hand); if(shrink >= 0) { stack.shrink(shrink); diff --git a/src/main/java/wile/engineersdecor/blocks/EdCatwalkStairsBlock.java b/src/main/java/wile/engineersdecor/blocks/EdCatwalkStairsBlock.java new file mode 100644 index 0000000..08f3ff3 --- /dev/null +++ b/src/main/java/wile/engineersdecor/blocks/EdCatwalkStairsBlock.java @@ -0,0 +1,180 @@ +/* + * @file EdCatwalkStairsBlock.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2020 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Stair version of the catwalk block, optional left/right railings. + */ +package wile.engineersdecor.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.*; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.*; +import net.minecraft.util.Direction.Axis; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.shapes.IBooleanFunction; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; +import wile.engineersdecor.ModContent; +import wile.engineersdecor.libmc.detail.Auxiliaries; + +import javax.annotation.Nullable; +import java.util.*; + + +public class EdCatwalkStairsBlock extends DecorBlock.HorizontalWaterLoggable implements IDecorBlock +{ + public static final BooleanProperty RIGHT_RAILING = BooleanProperty.create("right_railing"); + public static final BooleanProperty LEFT_RAILING = BooleanProperty.create("left_railing"); + protected final Map shapes; + protected final Map collision_shapes; + protected final Map y_rotations; + + public EdCatwalkStairsBlock(long config, Block.Properties properties, final AxisAlignedBB[] base_aabb, final AxisAlignedBB[] railing_aabbs) + { + super(config, properties, base_aabb); + Map sh = new HashMap<>(); + Map csh = new HashMap<>(); + getStateContainer().getValidStates().forEach(state->{ + Direction facing = state.get(HORIZONTAL_FACING); + VoxelShape base_shape = Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(base_aabb, facing, true)); + if(state.get(RIGHT_RAILING)) { + VoxelShape right_shape = Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(Auxiliaries.getMirroredAABB(railing_aabbs, Axis.X), facing, true)); + base_shape = VoxelShapes.combine(base_shape, right_shape, IBooleanFunction.OR); + } + if(state.get(LEFT_RAILING)) { + VoxelShape left_shape = Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(railing_aabbs, facing, true)); + base_shape = VoxelShapes.combine(base_shape, left_shape, IBooleanFunction.OR); + } + sh.put(state, base_shape); + csh.put(state, base_shape); + }); + shapes = sh; + collision_shapes = csh; + y_rotations = new HashMap<>(); + y_rotations.put(Direction.NORTH, 0); + y_rotations.put(Direction.EAST, 1); + y_rotations.put(Direction.SOUTH, 2); + y_rotations.put(Direction.WEST, 3); + y_rotations.put(Direction.UP, 0); + y_rotations.put(Direction.DOWN, 0); + setDefaultState(getStateContainer().getBaseState().with(LEFT_RAILING, false).with(RIGHT_RAILING, false)); + } + + @Override + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) + { return shapes.getOrDefault(state, VoxelShapes.fullCube()); } + + @Override + public VoxelShape getCollisionShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) + { return collision_shapes.getOrDefault(state, VoxelShapes.fullCube()); } + + @Override + protected void fillStateContainer(StateContainer.Builder builder) + { super.fillStateContainer(builder); builder.add(RIGHT_RAILING, LEFT_RAILING); } + + @Override + public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos) + { return true; } + + @Override + @Nullable + public BlockState getStateForPlacement(BlockItemUseContext context) + { return super.getStateForPlacement(context); } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) + { + final Item item = player.getHeldItem(hand).getItem(); + if((!(item instanceof BlockItem))) return ActionResultType.PASS; + final Block block = ((BlockItem)item).getBlock(); + final Direction facing = state.get(HORIZONTAL_FACING); + if(block == this) { + final Direction hlv = Arrays.stream(Direction.getFacingDirections(player)).filter(d->d.getAxis().isHorizontal()).findFirst().orElse(Direction.NORTH); + BlockPos adjacent_pos; + if(hlv == facing) { + adjacent_pos = pos.up().offset(hlv); + } else if(hlv == facing.getOpposite()) { + adjacent_pos = pos.down().offset(hlv); + } else { + return world.isRemote() ? ActionResultType.SUCCESS : ActionResultType.CONSUME; + } + final BlockState adjacent_state = world.getBlockState(adjacent_pos); + if(adjacent_state == null) return world.isRemote() ? ActionResultType.SUCCESS : ActionResultType.CONSUME; + if(!adjacent_state.isReplaceable(new DirectionalPlaceContext(world, adjacent_pos, hit.getFace().getOpposite(), player.getHeldItem(hand), hit.getFace()))) return ActionResultType.CONSUME; + BlockState place_state = getDefaultState().with(HORIZONTAL_FACING, facing); + place_state = place_state.with(WATERLOGGED,adjacent_state.getFluidState().getFluid()==Fluids.WATER); + EdCatwalkBlock.place_consume(place_state, world, adjacent_pos, player, hand, 1); + return world.isRemote() ? ActionResultType.SUCCESS : ActionResultType.CONSUME; + } else if((block == ModContent.STEEL_CATWALK) || (block == ModContent.STEEL_CATWALK_TOP_ALIGNED)) { + BlockPos adjacent_pos; + adjacent_pos = pos.offset(facing); + final BlockState adjacent_state = world.getBlockState(adjacent_pos); + if(adjacent_state == null) return ActionResultType.CONSUME; + if(!adjacent_state.isReplaceable(new DirectionalPlaceContext(world, adjacent_pos, hit.getFace().getOpposite(), player.getHeldItem(hand), hit.getFace()))) return ActionResultType.CONSUME; + BlockState place_state = ModContent.STEEL_CATWALK_TOP_ALIGNED.getDefaultState(); + place_state = place_state.with(WATERLOGGED,adjacent_state.getFluidState().getFluid()==Fluids.WATER); + EdCatwalkBlock.place_consume(place_state, world, adjacent_pos, player, hand, 1); + return world.isRemote() ? ActionResultType.SUCCESS : ActionResultType.CONSUME; + } else if(block == ModContent.STEEL_RAILING) { + Direction face = hit.getFace(); + int shrink = 0; + BlockState place_state = state; + if(face == Direction.UP) { + Vector3d rhv = hit.getHitVec().subtract(Vector3d.copyCentered(hit.getPos())).mul(new Vector3d(1,0,1)).crossProduct(Vector3d.copy(facing.getDirectionVec())); + face = (rhv.y > 0) ? (facing.rotateY()) : (facing.rotateYCCW()); + } + if(face == facing.rotateY()) { + if(state.get(RIGHT_RAILING)) { + place_state = state.with(RIGHT_RAILING, false); + shrink = -1; + } else { + place_state = state.with(RIGHT_RAILING, true); + shrink = 1; + } + } else if(face == facing.rotateYCCW()) { + if(state.get(LEFT_RAILING)) { + place_state = state.with(LEFT_RAILING, false); + shrink = -1; + } else { + place_state = state.with(LEFT_RAILING, true); + shrink = 1; + } + } + if(shrink != 0) EdCatwalkBlock.place_consume(place_state, world, pos, player, hand, shrink); + return world.isRemote() ? ActionResultType.SUCCESS : ActionResultType.CONSUME; + } + return ActionResultType.PASS; + } + + // -- IDecorBlock + + @Override + public boolean hasDynamicDropList() + { return true; } + + @Override + public List dropList(BlockState state, World world, @Nullable TileEntity te, boolean explosion) + { + if(world.isRemote()) return Collections.singletonList(ItemStack.EMPTY); + List drops = new ArrayList<>(); + drops.add(new ItemStack(state.getBlock().asItem())); + int n = (state.get(LEFT_RAILING)?1:0)+(state.get(RIGHT_RAILING)?1:0); + if(n > 0) drops.add(new ItemStack(ModContent.STEEL_RAILING, n)); + return drops; + } + +} diff --git a/src/main/java/wile/engineersdecor/blocks/EdCatwalkTopAlignedBlock.java b/src/main/java/wile/engineersdecor/blocks/EdCatwalkTopAlignedBlock.java new file mode 100644 index 0000000..0578867 --- /dev/null +++ b/src/main/java/wile/engineersdecor/blocks/EdCatwalkTopAlignedBlock.java @@ -0,0 +1,103 @@ +/* + * @file EdCatwalkTopAlignedBlock.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2020 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Top aligned platforms, down-connection to poles. + */ +package wile.engineersdecor.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.*; +import net.minecraft.state.IntegerProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.World; +import wile.engineersdecor.ModContent; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.stream.Collectors; + +public class EdCatwalkTopAlignedBlock extends DecorBlock.WaterLoggable implements IDecorBlock +{ + public static final IntegerProperty VARIANT = IntegerProperty.create("variant", 0, 3); + protected final List variant_shapes; + + public EdCatwalkTopAlignedBlock(long config, Block.Properties properties, final VoxelShape[] variant_shapes) + { + super(config, properties, variant_shapes[0]); + setDefaultState(getStateContainer().getBaseState().with(VARIANT, 0)); + this.variant_shapes = VARIANT.getAllowedValues().stream().map(i->(i builder) + { super.fillStateContainer(builder); builder.add(VARIANT); } + + @Override + @Nullable + public BlockState getStateForPlacement(BlockItemUseContext context) + { + BlockState state = adapted_state(super.getStateForPlacement(context), context.getWorld(), context.getPos()); + if(context.getFace() != Direction.UP) return state; + BlockState below = context.getWorld().getBlockState(context.getPos().down()); + if((state.get(VARIANT)==0) && (below.isSolidSide(context.getWorld(), context.getPos().down(), Direction.UP))) return state.with(VARIANT, 3); + return state; + } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) + { + final Item item = player.getHeldItem(hand).getItem(); + if(item != this.asItem()) return ActionResultType.PASS; + if(hit.getFace().getAxis().isHorizontal()) return ActionResultType.PASS; + BlockPos adjacent_pos = pos.offset(player.getHorizontalFacing()); + BlockState adjacent_state = world.getBlockState(adjacent_pos); + if(adjacent_state.isReplaceable(new DirectionalPlaceContext(world, adjacent_pos, hit.getFace().getOpposite(), player.getHeldItem(hand), hit.getFace()))) { + BlockState place_state = getDefaultState(); + place_state = place_state.with(WATERLOGGED,adjacent_state.getFluidState().getFluid()==Fluids.WATER); + EdCatwalkBlock.place_consume(adapted_state(place_state, world, adjacent_pos), world, adjacent_pos, player, hand, 1); + } + return world.isRemote() ? ActionResultType.SUCCESS : ActionResultType.CONSUME; + } + + @Override + public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, IWorld world, BlockPos pos, BlockPos facingPos) + { return adapted_state(super.updatePostPlacement(state, facing, facingState, world, pos, facingPos), world, pos); } + + // --- + + private BlockState adapted_state(BlockState state, IWorld world, BlockPos pos) + { + BlockState below = world.getBlockState(pos.down()); + if((below == null) || (state == null)) return state; + if((below.getBlock() == ModContent.THICK_STEEL_POLE) || (below.getBlock() == ModContent.THICK_STEEL_POLE_HEAD)) return state.with(VARIANT, 1); + if((below.getBlock() == ModContent.THIN_STEEL_POLE) || (below.getBlock() == ModContent.THIN_STEEL_POLE_HEAD)) return state.with(VARIANT, 2); + return state; + } + +} diff --git a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java index 4cf1deb..e4996b4 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java @@ -418,7 +418,7 @@ public class EdFluidBarrel public ItemStack getContainerItem(ItemStack stack) { FluidStack fs = getFluid(stack); - fs.shrink(1000); + if(fs.getAmount() > 1000) fs.shrink(1000); else fs = FluidStack.EMPTY; return setFluid(stack, fs); } } diff --git a/src/main/java/wile/engineersdecor/blocks/EdRailingBlock.java b/src/main/java/wile/engineersdecor/blocks/EdRailingBlock.java index adde346..967d4ee 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdRailingBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdRailingBlock.java @@ -32,7 +32,7 @@ import java.util.List; public class EdRailingBlock extends DecorBlock.HorizontalFourWayWaterLoggable implements IDecorBlock { public EdRailingBlock(long config, Block.Properties properties, final AxisAlignedBB base_aabb, final AxisAlignedBB railing_aabb) - { super(config, properties, base_aabb, railing_aabb); } + { super(config, properties, base_aabb, railing_aabb, 0); } @Override public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos) diff --git a/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java b/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java index febf786..21557e3 100644 --- a/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java +++ b/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java @@ -7,8 +7,8 @@ * JEI plugin (see https://github.com/mezz/JustEnoughItems/wiki/Creating-Plugins) */ package wile.engineersdecor.eapi.jei; -public class JEIPlugin {} -/* +//public class JEIPlugin {} + import wile.engineersdecor.ModEngineersDecor; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -74,4 +74,3 @@ public class JEIPlugin implements mezz.jei.api.IModPlugin } } } -*/ diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java b/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java index df4a54c..dbf48d3 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java @@ -441,7 +441,7 @@ public class StandardBlocks protected final Map shapes; protected final Map collision_shapes; - public HorizontalFourWayWaterLoggable(long config, Block.Properties properties, AxisAlignedBB base_aabb, final AxisAlignedBB side_aabb) + public HorizontalFourWayWaterLoggable(long config, Block.Properties properties, AxisAlignedBB base_aabb, final AxisAlignedBB side_aabb, int railing_height_extension) { super(config, properties, base_aabb); Map build_shapes = new HashMap<>(); @@ -460,10 +460,10 @@ public class StandardBlocks { // how the hack to extend a shape, these are the above with y+4px. VoxelShape shape = ((base_aabb.getXSize()==0) || (base_aabb.getYSize()==0) || (base_aabb.getZSize()==0)) ? VoxelShapes.empty() : VoxelShapes.create(base_aabb); - if(state.get(NORTH)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.NORTH, true).expand(0, 2, 0)), IBooleanFunction.OR); - if(state.get(EAST)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.EAST, true).expand(0, 2, 0)), IBooleanFunction.OR); - if(state.get(SOUTH)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.SOUTH, true).expand(0, 2, 0)), IBooleanFunction.OR); - if(state.get(WEST)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.WEST, true).expand(0, 2, 0)), IBooleanFunction.OR); + if(state.get(NORTH)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.NORTH, true).expand(0, railing_height_extension, 0)), IBooleanFunction.OR); + if(state.get(EAST)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.EAST, true).expand(0, railing_height_extension, 0)), IBooleanFunction.OR); + if(state.get(SOUTH)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.SOUTH, true).expand(0, railing_height_extension, 0)), IBooleanFunction.OR); + if(state.get(WEST)) shape = VoxelShapes.combine(shape,VoxelShapes.create(Auxiliaries.getRotatedAABB(side_aabb, Direction.WEST, true).expand(0, railing_height_extension, 0)), IBooleanFunction.OR); if(shape.isEmpty()) shape = VoxelShapes.fullCube(); build_collision_shapes.put(state.with(WATERLOGGED, false), shape); build_collision_shapes.put(state.with(WATERLOGGED, true), shape); diff --git a/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java b/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java index 3fd2d41..086b21f 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java @@ -339,6 +339,13 @@ public class Auxiliaries return transformed; } + public static final VoxelShape getUnionShape(AxisAlignedBB ... aabbs) + { + VoxelShape shape = VoxelShapes.empty(); + for(AxisAlignedBB aabb: aabbs) shape = VoxelShapes.combine(shape, VoxelShapes.create(aabb), IBooleanFunction.OR); + return shape; + } + public static final VoxelShape getUnionShape(AxisAlignedBB[] ... aabb_list) { VoxelShape shape = VoxelShapes.empty(); diff --git a/src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_stairs.json b/src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_stairs.json new file mode 100644 index 0000000..7cf4c05 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_stairs.json @@ -0,0 +1,37 @@ +{ + "variants": { + "facing=east,left_railing=false,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" , "y": 90 }, + "facing=east,left_railing=false,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model", "y": 90 }, + "facing=east,left_railing=true,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model", "y": 90 }, + "facing=east,left_railing=true,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model", "y": 90 }, + "facing=north,left_railing=false,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" }, + "facing=north,left_railing=false,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model" }, + "facing=north,left_railing=true,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model" }, + "facing=north,left_railing=true,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model" }, + "facing=south,left_railing=false,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" , "y":180 }, + "facing=south,left_railing=false,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model", "y":180 }, + "facing=south,left_railing=true,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model", "y":180 }, + "facing=south,left_railing=true,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model", "y":180 }, + "facing=west,left_railing=false,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" , "y":270 }, + "facing=west,left_railing=false,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model", "y":270 }, + "facing=west,left_railing=true,right_railing=false,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model", "y":270 }, + "facing=west,left_railing=true,right_railing=true,waterlogged=false": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model", "y":270 }, + + "facing=east,left_railing=false,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" , "y": 90 }, + "facing=east,left_railing=false,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model", "y": 90 }, + "facing=east,left_railing=true,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model", "y": 90 }, + "facing=east,left_railing=true,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model", "y": 90 }, + "facing=north,left_railing=false,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" }, + "facing=north,left_railing=false,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model" }, + "facing=north,left_railing=true,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model" }, + "facing=north,left_railing=true,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model" }, + "facing=south,left_railing=false,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" , "y":180 }, + "facing=south,left_railing=false,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model", "y":180 }, + "facing=south,left_railing=true,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model", "y":180 }, + "facing=south,left_railing=true,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model", "y":180 }, + "facing=west,left_railing=false,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_model" , "y":270 }, + "facing=west,left_railing=false,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_rr_model", "y":270 }, + "facing=west,left_railing=true,right_railing=false,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_lr_model", "y":270 }, + "facing=west,left_railing=true,right_railing=true,waterlogged=true": { "model": "engineersdecor:block/furniture/steel_catwalk_stairs_br_model", "y":270 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_ta.json b/src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_ta.json new file mode 100644 index 0000000..db42763 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/steel_catwalk_ta.json @@ -0,0 +1,8 @@ +{ + "variants": { + "variant=0": { "model": "engineersdecor:block/furniture/steel_catwalk_ta0_model" }, + "variant=1": { "model": "engineersdecor:block/furniture/steel_catwalk_ta1_model" }, + "variant=2": { "model": "engineersdecor:block/furniture/steel_catwalk_ta2_model" }, + "variant=3": { "model": "engineersdecor:block/furniture/steel_catwalk_ta3_model" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/lang/en_us.json b/src/main/resources/assets/engineersdecor/lang/en_us.json index d4b28ca..f413639 100644 --- a/src/main/resources/assets/engineersdecor/lang/en_us.json +++ b/src/main/resources/assets/engineersdecor/lang/en_us.json @@ -237,6 +237,11 @@ "block.engineersdecor.small_waste_incinerator": "Small Waste Incinerator", "block.engineersdecor.small_waste_incinerator.help": "Trash with internal fifo slots.\n Items can be inserted on all sides,\n and are kept until there is no\n space left in the fifo. After that\n the oldest stack will be incinerated.\n Apply electrical RF/FE power to\n increase the processing speed.\n Keeps its inventory when being\n relocated.", "block.engineersdecor.steel_catwalk": "Steel Catwalk", + "block.engineersdecor.steel_catwalk.help": "Simple catwalk for better access to\nbig machines. Can also be placed in\nlook direction from the top. Click\nwith a Railing to add the guardrail\nto a side (close click: exact\nplacemend, far click: auto best\nmatch). Click again to remove a\nguardrail.", + "block.engineersdecor.steel_catwalk_stairs": "Steel Catwalk Stairs", + "block.engineersdecor.steel_catwalk_stairs.help": "Click with a Steel Railing to add\nor remove guardrails. Cannot be\nplaced bottom-down, no corners\n(no'normal' Stairs).", + "block.engineersdecor.steel_catwalk_ta": "Raised Steel Catwalk", + "block.engineersdecor.steel_catwalk_ta.help": "Top aligned Catwalk, connects to\nSteel poles below.", "block.engineersdecor.steel_double_t_support": "Steel Double T Support", "block.engineersdecor.steel_double_t_support.help": "Horizontal ceiling support beam fragment.", "block.engineersdecor.steel_floor_grating": "Steel Floor Grating", @@ -248,6 +253,7 @@ "block.engineersdecor.steel_mesh_fence_gate": "Steel Mesh Fence Gate", "block.engineersdecor.steel_mesh_fence_gate.help": "Industrial style fence gate that\n fits well to the Steel Mesh Fence.\n Can be placed as single or double\n size gate.", "block.engineersdecor.steel_railing": "Steel Railing", + "block.engineersdecor.steel_railing.help": "Decorative guardrail. Add or remove\nsides by clicking while holding\nrailings in your hand. Also works\non Steel Catwalks.", "block.engineersdecor.steel_table": "Steel Table", "block.engineersdecor.steel_table.help": "Robust four-legged steel table.", "block.engineersdecor.straight_pipe_valve": "Fluid Pipe Check Valve", diff --git a/src/main/resources/assets/engineersdecor/lang/ru_ru.json b/src/main/resources/assets/engineersdecor/lang/ru_ru.json index d8f7072..12caedd 100644 --- a/src/main/resources/assets/engineersdecor/lang/ru_ru.json +++ b/src/main/resources/assets/engineersdecor/lang/ru_ru.json @@ -237,6 +237,11 @@ "block.engineersdecor.small_waste_incinerator": "Компактный сжигатель отходов", "block.engineersdecor.small_waste_incinerator.help": "§6Отходы с слотами для очереди.§r Предметы могут помещаться с любой стороны, и храниться до тех пор, пока в очереди не останется свободного места. После этого самый старый стек будет сожжен. Подключите электричество (RF/FE) для увеличения скорости обработки. Сохраняет инвентарь при перемещении.", "block.engineersdecor.steel_catwalk": "Steel Catwalk", + "block.engineersdecor.steel_catwalk.help": "Simple catwalk for better access to\nbig machines. Can also be placed in\nlook direction from the top. Click\nwith a Railing to add the guardrail\nto a side (close click: exact\nplacemend, far click: auto best\nmatch). Click again to remove a\nguardrail.", + "block.engineersdecor.steel_catwalk_stairs": "Steel Catwalk Stairs", + "block.engineersdecor.steel_catwalk_stairs.help": "Click with a Steel Railing to add\nor remove guardrails. Cannot be\nplaced bottom-down, no corners\n(no'normal' Stairs).", + "block.engineersdecor.steel_catwalk_ta": "Raised Steel Catwalk", + "block.engineersdecor.steel_catwalk_ta.help": "Top aligned Catwalk, connects to\nSteel poles below.", "block.engineersdecor.steel_double_t_support": "Стальная двойная Т-образная опора", "block.engineersdecor.steel_double_t_support.help": "§6Фрагмент горизонтальной потолочной опорной балки.", "block.engineersdecor.steel_floor_grating": "Решётка стального пола", @@ -248,6 +253,7 @@ "block.engineersdecor.steel_mesh_fence_gate": "Steel Mesh Fence Gate", "block.engineersdecor.steel_mesh_fence_gate.help": "§6Industrial style fence gate that fits well to the Steel Mesh Fence.§r\nCan be placed as single or double size gate.", "block.engineersdecor.steel_railing": "Steel Railing", + "block.engineersdecor.steel_railing.help": "Decorative guardrail. Add or remove\nsides by clicking while holding\nrailings in your hand. Also works\non Steel Catwalks.", "block.engineersdecor.steel_table": "Стальной стол", "block.engineersdecor.steel_table.help": "§6Прочный стол с четырьмя ножками.", "block.engineersdecor.straight_pipe_valve": "Одноканальный жидкостный клапан", diff --git a/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/src/main/resources/assets/engineersdecor/lang/zh_cn.json index b7d28dd..a151f2c 100644 --- a/src/main/resources/assets/engineersdecor/lang/zh_cn.json +++ b/src/main/resources/assets/engineersdecor/lang/zh_cn.json @@ -237,6 +237,11 @@ "block.engineersdecor.small_waste_incinerator": "小型垃圾焚烧炉", "block.engineersdecor.small_waste_incinerator.help": "§6有内部先进先出队列的垃圾桶。§r物品可以从任何一面插入，而且 直到队列满都会保留。一旦超过队列上限，最老的物品会被焚毁。 通入RF/FE会增加处理速度。破坏时保留内部未销毁的物品。", "block.engineersdecor.steel_catwalk": "Steel Catwalk", + "block.engineersdecor.steel_catwalk.help": "Simple catwalk for better access to\nbig machines. Can also be placed in\nlook direction from the top. Click\nwith a Railing to add the guardrail\nto a side (close click: exact\nplacemend, far click: auto best\nmatch). Click again to remove a\nguardrail.", + "block.engineersdecor.steel_catwalk_stairs": "Steel Catwalk Stairs", + "block.engineersdecor.steel_catwalk_stairs.help": "Click with a Steel Railing to add\nor remove guardrails. Cannot be\nplaced bottom-down, no corners\n(no'normal' Stairs).", + "block.engineersdecor.steel_catwalk_ta": "Raised Steel Catwalk", + "block.engineersdecor.steel_catwalk_ta.help": "Top aligned Catwalk, connects to\nSteel poles below.", "block.engineersdecor.steel_double_t_support": "钢制双T型支架", "block.engineersdecor.steel_double_t_support.help": "§6一段水平吊顶支撑梁。", "block.engineersdecor.steel_floor_grating": "钢地板格栅", @@ -248,6 +253,7 @@ "block.engineersdecor.steel_mesh_fence_gate": "钢制网状栅栏门", "block.engineersdecor.steel_mesh_fence_gate.help": "§6工业风格的栅栏门，可以同钢丝栅栏完美搭配。§r\n放置时可以设置为单叶门或者双叶门。", "block.engineersdecor.steel_railing": "Steel Railing", + "block.engineersdecor.steel_railing.help": "Decorative guardrail. Add or remove\nsides by clicking while holding\nrailings in your hand. Also works\non Steel Catwalks.", "block.engineersdecor.steel_table": "钢桌", "block.engineersdecor.steel_table.help": "§6结实的四脚钢桌。", "block.engineersdecor.straight_pipe_valve": "输液管止回阀", diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_model.json index 6224342..317125f 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_model.json @@ -2,8 +2,9 @@ "parent": "block/block", "ambientocclusion": false, "textures": { - "particle": "engineersdecor:block/furniture/steel_catwalk_top", - "s": "engineersdecor:block/furniture/steel_catwalk_top" + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" }, "elements": [ { @@ -24,9 +25,7 @@ "to": [16, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 0.75]}, "faces": { - "north": {"uv": [0, 14, 1, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [15, 14, 16, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, "down": {"uv": [15, 1, 16, 15], "texture": "#s"} @@ -50,272 +49,28 @@ "to": [1, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [-7, -6.5, 0.75]}, "faces": { - "north": {"uv": [15, 14, 16, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 1, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, "down": {"uv": [0, 1, 1, 15], "texture": "#s"} } }, { - "from": [11, 0.75, 1], - "to": [12, 1.9375, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 2, 1], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -6.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} } }, { - "from": [15, 0.75, 5], - "to": [16, 1.9375, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 1, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -7.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "texture": "#s"} - } - }, - { - "from": [13, 0.75, 2.75], - "to": [14, 1.9375, 13.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "texture": "#s"} - } - }, - { - "from": [17, 0.75, 6], - "to": [18, 1.9375, 8.75], - "rotation": {"angle": 45, "axis": "y", "origin": [9, 1.78125, 8]}, - "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "texture": "#s"} - } - }, - { - "from": [7, 0.75, -2], - "to": [8, 1.9375, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "texture": "#s"} - } - }, - { - "from": [9, 0.75, -1.25], - "to": [10, 1.9375, 17.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "texture": "#s"} - } - }, - { - "from": [3, 0.75, 2], - "to": [4, 1.9375, 14], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "texture": "#s"} - } - }, - { - "from": [-1, 0.75, 6], - "to": [0, 1.9375, 10], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "texture": "#s"} - } - }, - { - "from": [5, 0.75, 0], - "to": [6, 1.9375, 16], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "texture": "#s"} - } - }, - { - "from": [1, 0.75, 4], - "to": [2, 1.9375, 12], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "texture": "#s"} - } - }, - { - "from": [3.75, 0.625, 14], - "to": [12.25, 1.8125, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [6, 0.625, 16], - "to": [10, 1.8125, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0, 0.625, 10], - "to": [16.25, 1.8125, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2, 0.625, 12], - "to": [14, 1.8125, 13], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-1.25, 0.625, 6], - "to": [17.25, 1.8125, 7], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-2, 0.625, 8], - "to": [18, 1.8125, 9], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2.75, 0.625, 2], - "to": [13.25, 1.8125, 3], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0.75, 0.625, 4], - "to": [15, 1.8125, 5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [5.75, 0.625, -2], - "to": [8.75, 1.8125, -1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 7]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [4.75, 0.625, 0], - "to": [11, 1.8125, 1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "rotation": 90, "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} } } ], @@ -336,7 +91,7 @@ }, "gui": { "rotation": [30, 225, 0], - "translation": [0.25, 3, -3], + "translation": [0.25, 1.25, -3], "scale": [0.6, 0.6, 0.6] }, "fixed": { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_n_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_n_model.json index 357dd3f..b9fe87a 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_n_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_n_model.json @@ -3,58 +3,11 @@ "ambientocclusion": false, "textures": { "frame": "engineersdecor:block/material/steel_texture", - "particle": "engineersdecor:block/furniture/steel_catwalk_top", - "s": "engineersdecor:block/furniture/steel_catwalk_top" + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" }, "elements": [ - { - "from": [0, 2, 0], - "to": [1, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [0, 15, 1, 16], "texture": "#frame"} - } - }, - { - "from": [0, 15, 0], - "to": [16, 16, 1.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 0, 16, 1.5], "texture": "#frame"}, - "down": {"uv": [0, 14.5, 16, 16], "texture": "#frame"} - } - }, - { - "from": [1, 14.5, 0.25], - "to": [15, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, - "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} - } - }, - { - "from": [15, 2, 0], - "to": [16, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [15, 15, 16, 16], "texture": "#frame"} - } - }, { "from": [0, 0, 0], "to": [16, 2, 1], @@ -73,9 +26,7 @@ "to": [16, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 0.75]}, "faces": { - "north": {"uv": [0, 14, 1, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [15, 14, 16, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, "down": {"uv": [15, 1, 16, 15], "texture": "#s"} @@ -99,272 +50,74 @@ "to": [1, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [-7, -6.5, 0.75]}, "faces": { - "north": {"uv": [15, 14, 16, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 1, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, "down": {"uv": [0, 1, 1, 15], "texture": "#s"} } }, { - "from": [11, 0.75, 1], - "to": [12, 1.9375, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 2, 1], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -6.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} } }, { - "from": [15, 0.75, 5], - "to": [16, 1.9375, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 1, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -7.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} } }, { - "from": [13, 0.75, 2.75], - "to": [14, 1.9375, 13.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 2, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "texture": "#s"} + "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } }, { - "from": [17, 0.75, 6], - "to": [18, 1.9375, 8.75], - "rotation": {"angle": 45, "axis": "y", "origin": [9, 1.78125, 8]}, + "from": [0, 15, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "texture": "#s"} + "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#frame"} } }, { - "from": [7, 0.75, -2], - "to": [8, 1.9375, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 14.5, 0.25], + "to": [15, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, "faces": { - "north": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "texture": "#s"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "up": {"uv": [1, 0.25, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 15.75], "texture": "#frame"} } }, { - "from": [9, 0.75, -1.25], - "to": [10, 1.9375, 17.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 2, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "texture": "#s"} - } - }, - { - "from": [3, 0.75, 2], - "to": [4, 1.9375, 14], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "texture": "#s"} - } - }, - { - "from": [-1, 0.75, 6], - "to": [0, 1.9375, 10], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "texture": "#s"} - } - }, - { - "from": [5, 0.75, 0], - "to": [6, 1.9375, 16], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "texture": "#s"} - } - }, - { - "from": [1, 0.75, 4], - "to": [2, 1.9375, 12], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "texture": "#s"} - } - }, - { - "from": [3.75, 0.625, 14], - "to": [12.25, 1.8125, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [6, 0.625, 16], - "to": [10, 1.8125, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0, 0.625, 10], - "to": [16.25, 1.8125, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2, 0.625, 12], - "to": [14, 1.8125, 13], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-1.25, 0.625, 6], - "to": [17.25, 1.8125, 7], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-2, 0.625, 8], - "to": [18, 1.8125, 9], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2.75, 0.625, 2], - "to": [13.25, 1.8125, 3], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0.75, 0.625, 4], - "to": [15, 1.8125, 5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [5.75, 0.625, -2], - "to": [8.75, 1.8125, -1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 7]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [4.75, 0.625, 0], - "to": [11, 1.8125, 1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "rotation": 90, "texture": "#s"} + "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } } ], diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ne_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ne_model.json index 5fbf622..7df8d96 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ne_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ne_model.json @@ -3,94 +3,11 @@ "ambientocclusion": false, "textures": { "frame": "engineersdecor:block/material/steel_texture", - "particle": "engineersdecor:block/furniture/steel_catwalk_top", - "s": "engineersdecor:block/furniture/steel_catwalk_top" + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" }, "elements": [ - { - "from": [0, 2, 0], - "to": [1, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [0, 15, 1, 16], "texture": "#frame"} - } - }, - { - "from": [15, 2, 15], - "to": [16, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 15.5]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "west": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "down": {"uv": [15, 0, 16, 1], "texture": "#frame"} - } - }, - { - "from": [0, 15, 0], - "to": [16, 16, 1.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 0, 16, 1.5], "texture": "#frame"}, - "down": {"uv": [0, 14.5, 16, 16], "texture": "#frame"} - } - }, - { - "from": [14.5, 15, 1.5], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 2]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "east": {"uv": [0, 0, 14.5, 1], "texture": "#frame"}, - "south": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [1.5, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [14.5, 1.5, 16, 16], "texture": "#frame"}, - "down": {"uv": [14.5, 0, 16, 14.5], "texture": "#frame"} - } - }, - { - "from": [1, 14.5, 0.25], - "to": [15, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, - "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "up": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} - } - }, - { - "from": [15, 14.5, 1], - "to": [15.75, 15, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 1]}, - "faces": { - "east": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "west": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "up": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "down": {"uv": [15, 1, 16, 15], "texture": "#frame"} - } - }, - { - "from": [15, 2, 0], - "to": [16, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [15, 15, 16, 16], "texture": "#frame"} - } - }, { "from": [0, 0, 0], "to": [16, 2, 1], @@ -109,9 +26,7 @@ "to": [16, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 0.75]}, "faces": { - "north": {"uv": [0, 14, 1, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [15, 14, 16, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, "down": {"uv": [15, 1, 16, 15], "texture": "#s"} @@ -135,283 +50,120 @@ "to": [1, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [-7, -6.5, 0.75]}, "faces": { - "north": {"uv": [15, 14, 16, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 1, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, "down": {"uv": [0, 1, 1, 15], "texture": "#s"} } }, { - "from": [11, 0.75, 1], - "to": [12, 1.9375, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 2, 1], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -6.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} } }, { - "from": [15, 0.75, 5], - "to": [16, 1.9375, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 1, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -7.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} } }, { - "from": [13, 0.75, 2.75], - "to": [14, 1.9375, 13.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 2, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "texture": "#s"} + "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } }, { - "from": [17, 0.75, 6], - "to": [18, 1.9375, 8.75], - "rotation": {"angle": 45, "axis": "y", "origin": [9, 1.78125, 8]}, + "from": [15, 2, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 15.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "texture": "#s"} + "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 14], "texture": "#frame"} } }, { - "from": [7, 0.75, -2], - "to": [8, 1.9375, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 15, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "texture": "#s"} + "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#frame"} } }, { - "from": [9, 0.75, -1.25], - "to": [10, 1.9375, 17.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 15, 1], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 2]}, "faces": { - "north": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "texture": "#s"} + "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 15, 1], "texture": "#frame"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [15, 1, 16, 16], "texture": "#frame"}, + "down": {"uv": [15, 0, 16, 15], "texture": "#frame"} } }, { - "from": [3, 0.75, 2], - "to": [4, 1.9375, 14], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 14.5, 0.25], + "to": [15, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "texture": "#s"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "up": {"uv": [1, 0.25, 15, 1], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 15.75], "texture": "#frame"} } }, { - "from": [-1, 0.75, 6], - "to": [0, 1.9375, 10], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 14.5, 1], + "to": [15.75, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 1]}, "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "texture": "#s"} + "east": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "west": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "up": {"uv": [15, 1, 15.75, 15], "texture": "#frame"}, + "down": {"uv": [15, 1, 15.75, 15], "texture": "#frame"} } }, { - "from": [5, 0.75, 0], - "to": [6, 1.9375, 16], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 2, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "texture": "#s"} - } - }, - { - "from": [1, 0.75, 4], - "to": [2, 1.9375, 12], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "texture": "#s"} - } - }, - { - "from": [3.75, 0.625, 14], - "to": [12.25, 1.8125, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [6, 0.625, 16], - "to": [10, 1.8125, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0, 0.625, 10], - "to": [16.25, 1.8125, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2, 0.625, 12], - "to": [14, 1.8125, 13], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-1.25, 0.625, 6], - "to": [17.25, 1.8125, 7], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-2, 0.625, 8], - "to": [18, 1.8125, 9], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2.75, 0.625, 2], - "to": [13.25, 1.8125, 3], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0.75, 0.625, 4], - "to": [15, 1.8125, 5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [5.75, 0.625, -2], - "to": [8.75, 1.8125, -1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 7]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [4.75, 0.625, 0], - "to": [11, 1.8125, 1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "rotation": 90, "texture": "#s"} + "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } } ], "display": { "thirdperson_righthand": { "rotation": [70, -2, 3], - "translation": [0.25, 1, 1.75], - "scale": [0.3, 0.3, 0.3] + "translation": [0.75, 1.75, 1.25], + "scale": [0.2, 0.2, 0.2] }, "firstperson_righthand": { - "rotation": [8, 0, 42], + "rotation": [20, -59, 15], "translation": [8.5, 0, -5.75], "scale": [0.4, 0.4, 0.4] }, @@ -420,13 +172,13 @@ "scale": [0.3, 0.3, 0.3] }, "gui": { - "rotation": [30, 225, 0], - "translation": [0.25, 3, -3], + "rotation": [30, 45, 0], + "translation": [0.25, 0, -3], "scale": [0.6, 0.6, 0.6] }, "fixed": { "rotation": [-90, 0, 0], - "translation": [0, 0, -4], + "translation": [0, 0, -3.5], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nes_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nes_model.json index b4c4953..2e7c820 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nes_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nes_model.json @@ -3,125 +3,11 @@ "ambientocclusion": false, "textures": { "frame": "engineersdecor:block/material/steel_texture", - "particle": "engineersdecor:block/furniture/steel_catwalk_top", - "s": "engineersdecor:block/furniture/steel_catwalk_top" + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" }, "elements": [ - { - "from": [0, 2, 0], - "to": [1, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [0, 15, 1, 16], "texture": "#frame"} - } - }, - { - "from": [0, 2, 15], - "to": [1, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15.5]}, - "faces": { - "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "west": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} - } - }, - { - "from": [15, 2, 15], - "to": [16, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 15.5]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "west": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "down": {"uv": [15, 0, 16, 1], "texture": "#frame"} - } - }, - { - "from": [0, 15, 0], - "to": [16, 16, 1.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 0, 16, 1.5], "texture": "#frame"}, - "down": {"uv": [0, 14.5, 16, 16], "texture": "#frame"} - } - }, - { - "from": [0, 15, 14.5], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [0, 14.5, 16, 16], "texture": "#frame"}, - "down": {"uv": [0, 0, 16, 1.5], "texture": "#frame"} - } - }, - { - "from": [14.5, 15, 1.5], - "to": [16, 16, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 2]}, - "faces": { - "east": {"uv": [0, 0, 14.5, 1], "texture": "#frame"}, - "west": {"uv": [1.5, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [14.5, 1.5, 16, 16], "texture": "#frame"}, - "down": {"uv": [14.5, 0, 16, 14.5], "texture": "#frame"} - } - }, - { - "from": [1, 14.5, 0.25], - "to": [15, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, - "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} - } - }, - { - "from": [1, 14.5, 15], - "to": [15, 15, 15.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 14.75]}, - "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} - } - }, - { - "from": [15, 14.5, 1], - "to": [15.75, 15, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 1]}, - "faces": { - "east": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "west": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [15, 1, 16, 15], "texture": "#frame"} - } - }, - { - "from": [15, 2, 0], - "to": [16, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [15, 15, 16, 16], "texture": "#frame"} - } - }, { "from": [0, 0, 0], "to": [16, 2, 1], @@ -140,9 +26,7 @@ "to": [16, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 0.75]}, "faces": { - "north": {"uv": [0, 14, 1, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [15, 14, 16, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, "down": {"uv": [15, 1, 16, 15], "texture": "#s"} @@ -166,272 +50,139 @@ "to": [1, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [-7, -6.5, 0.75]}, "faces": { - "north": {"uv": [15, 14, 16, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 1, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, "down": {"uv": [0, 1, 1, 15], "texture": "#s"} } }, { - "from": [11, 0.75, 1], - "to": [12, 1.9375, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 2, 1], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -6.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} } }, { - "from": [15, 0.75, 5], - "to": [16, 1.9375, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 1, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -7.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} } }, { - "from": [13, 0.75, 2.75], - "to": [14, 1.9375, 13.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 2, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "texture": "#s"} + "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } }, { - "from": [17, 0.75, 6], - "to": [18, 1.9375, 8.75], - "rotation": {"angle": 45, "axis": "y", "origin": [9, 1.78125, 8]}, + "from": [0, 2, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "texture": "#s"} + "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 14], "texture": "#frame"} } }, { - "from": [7, 0.75, -2], - "to": [8, 1.9375, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 2, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 15.5]}, "faces": { - "north": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "texture": "#s"} + "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 14], "texture": "#frame"} } }, { - "from": [9, 0.75, -1.25], - "to": [10, 1.9375, 17.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 15, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "texture": "#s"} + "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#frame"} } }, { - "from": [3, 0.75, 2], - "to": [4, 1.9375, 14], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 15, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "texture": "#s"} + "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#frame"} } }, { - "from": [-1, 0.75, 6], - "to": [0, 1.9375, 10], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 15, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 2]}, "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "texture": "#s"} + "east": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [1, 0, 15, 1], "texture": "#frame"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#frame"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#frame"} } }, { - "from": [5, 0.75, 0], - "to": [6, 1.9375, 16], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 14.5, 0.25], + "to": [15, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "texture": "#s"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 15.75], "texture": "#frame"} } }, { - "from": [1, 0.75, 4], - "to": [2, 1.9375, 12], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 14.5, 15], + "to": [15, 15, 15.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 14.75]}, "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "texture": "#s"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [1, 0.25, 15, 1], "texture": "#frame"} } }, { - "from": [3.75, 0.625, 14], - "to": [12.25, 1.8125, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 14.5, 1], + "to": [15.75, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 1]}, "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "rotation": 90, "texture": "#s"} + "east": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "west": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [15, 1, 15.75, 15], "texture": "#frame"} } }, { - "from": [6, 0.625, 16], - "to": [10, 1.8125, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 2, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0, 0.625, 10], - "to": [16.25, 1.8125, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2, 0.625, 12], - "to": [14, 1.8125, 13], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-1.25, 0.625, 6], - "to": [17.25, 1.8125, 7], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-2, 0.625, 8], - "to": [18, 1.8125, 9], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2.75, 0.625, 2], - "to": [13.25, 1.8125, 3], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0.75, 0.625, 4], - "to": [15, 1.8125, 5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [5.75, 0.625, -2], - "to": [8.75, 1.8125, -1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 7]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [4.75, 0.625, 0], - "to": [11, 1.8125, 1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "rotation": 90, "texture": "#s"} + "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } } ], diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nesw_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nesw_model.json index 6fb683c..e2a0373 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nesw_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_nesw_model.json @@ -3,146 +3,11 @@ "ambientocclusion": false, "textures": { "frame": "engineersdecor:block/material/steel_texture", - "particle": "engineersdecor:block/furniture/steel_catwalk_top", - "s": "engineersdecor:block/furniture/steel_catwalk_top" + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" }, "elements": [ - { - "from": [0, 2, 0], - "to": [1, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [0, 15, 1, 16], "texture": "#frame"} - } - }, - { - "from": [0, 2, 15], - "to": [1, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15.5]}, - "faces": { - "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "west": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#frame"} - } - }, - { - "from": [15, 2, 15], - "to": [16, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 15.5]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "west": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "down": {"uv": [15, 0, 16, 1], "texture": "#frame"} - } - }, - { - "from": [0, 15, 0], - "to": [16, 16, 1.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 0, 16, 1.5], "texture": "#frame"}, - "down": {"uv": [0, 14.5, 16, 16], "texture": "#frame"} - } - }, - { - "from": [0, 15, 14.5], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [0, 14.5, 16, 16], "texture": "#frame"}, - "down": {"uv": [0, 0, 16, 1.5], "texture": "#frame"} - } - }, - { - "from": [14.5, 15, 1.5], - "to": [16, 16, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 2]}, - "faces": { - "east": {"uv": [0, 0, 14.5, 1], "texture": "#frame"}, - "west": {"uv": [1.5, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [14.5, 1.5, 16, 16], "texture": "#frame"}, - "down": {"uv": [14.5, 0, 16, 14.5], "texture": "#frame"} - } - }, - { - "from": [0, 15, 1.5], - "to": [1.5, 16, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [-6.5, 8, 2]}, - "faces": { - "east": {"uv": [1.5, 0, 14.5, 1], "texture": "#frame"}, - "west": {"uv": [1.5, 0, 14.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 1.5, 1.5, 14.5], "texture": "#frame"}, - "down": {"uv": [0, 1.5, 1.5, 14.5], "texture": "#frame"} - } - }, - { - "from": [1, 14.5, 0.25], - "to": [15, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, - "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} - } - }, - { - "from": [1, 14.5, 15], - "to": [15, 15, 15.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 14.75]}, - "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} - } - }, - { - "from": [15, 14.5, 1], - "to": [15.75, 15, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 1]}, - "faces": { - "east": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "west": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [15, 1, 16, 15], "texture": "#frame"} - } - }, - { - "from": [0.25, 14.5, 1], - "to": [1, 15, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [-5.75, 7, 1]}, - "faces": { - "east": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, - "west": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, - "down": {"uv": [0.25, 1, 1, 15], "texture": "#frame"} - } - }, - { - "from": [15, 2, 0], - "to": [16, 15, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, - "faces": { - "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, - "west": {"uv": [0, 1, 1, 14], "texture": "#frame"}, - "down": {"uv": [15, 15, 16, 16], "texture": "#frame"} - } - }, { "from": [0, 0, 0], "to": [16, 2, 1], @@ -161,9 +26,7 @@ "to": [16, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 0.75]}, "faces": { - "north": {"uv": [0, 14, 1, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [15, 14, 16, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, "down": {"uv": [15, 1, 16, 15], "texture": "#s"} @@ -187,272 +50,160 @@ "to": [1, 2, 15], "rotation": {"angle": 0, "axis": "y", "origin": [-7, -6.5, 0.75]}, "faces": { - "north": {"uv": [15, 14, 16, 16], "texture": "#s"}, "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 1, 16], "texture": "#s"}, "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, "down": {"uv": [0, 1, 1, 15], "texture": "#s"} } }, { - "from": [11, 0.75, 1], - "to": [12, 1.9375, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 2, 1], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -6.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} } }, { - "from": [15, 0.75, 5], - "to": [16, 1.9375, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 1, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -7.5, 0.75]}, "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "texture": "#s"} + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} } }, { - "from": [13, 0.75, 2.75], - "to": [14, 1.9375, 13.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 2, 0], + "to": [1, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "texture": "#s"} + "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } }, { - "from": [17, 0.75, 6], - "to": [18, 1.9375, 8.75], - "rotation": {"angle": 45, "axis": "y", "origin": [9, 1.78125, 8]}, + "from": [0, 2, 15], + "to": [1, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15.5]}, "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "texture": "#s"} + "north": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "south": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 14], "texture": "#frame"} } }, { - "from": [7, 0.75, -2], - "to": [8, 1.9375, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 2, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 15.5]}, "faces": { - "north": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "texture": "#s"} + "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "east": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "west": {"uv": [15, 1, 16, 14], "texture": "#frame"} } }, { - "from": [9, 0.75, -1.25], - "to": [10, 1.9375, 17.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 15, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "texture": "#s"} + "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#frame"} } }, { - "from": [3, 0.75, 2], - "to": [4, 1.9375, 14], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 15, 14.75], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "texture": "#s"} + "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1.25, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [14.75, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [0, 14.75, 16, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 16, 1.25], "texture": "#frame"} } }, { - "from": [-1, 0.75, 6], - "to": [0, 1.9375, 10], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 15, 1], + "to": [16, 16, 14.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 2]}, "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "texture": "#s"} + "east": {"uv": [1.25, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [1, 0, 14.75, 1], "texture": "#frame"}, + "up": {"uv": [15, 1, 16, 14.75], "texture": "#frame"}, + "down": {"uv": [15, 1.25, 16, 15], "texture": "#frame"} } }, { - "from": [5, 0.75, 0], - "to": [6, 1.9375, 16], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0, 15, 1], + "to": [1, 16, 14.75], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.5, 8, 2]}, "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "texture": "#s"} + "east": {"uv": [1.25, 0, 15, 1], "texture": "#frame"}, + "west": {"uv": [1, 0, 14.75, 1], "texture": "#frame"}, + "up": {"uv": [0, 1, 1, 14.75], "texture": "#frame"}, + "down": {"uv": [0, 1.25, 1, 15], "texture": "#frame"} } }, { - "from": [1, 0.75, 4], - "to": [2, 1.9375, 12], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 14.5, 0.25], + "to": [15, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "texture": "#s"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 15.75], "texture": "#frame"} } }, { - "from": [3.75, 0.625, 14], - "to": [12.25, 1.8125, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [1, 14.5, 15], + "to": [15, 15, 15.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 14.75]}, "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "rotation": 90, "texture": "#s"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [1, 0.25, 15, 1], "texture": "#frame"} } }, { - "from": [6, 0.625, 16], - "to": [10, 1.8125, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 14.5, 1], + "to": [15.75, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 1]}, "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "rotation": 90, "texture": "#s"} + "east": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "west": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [15, 1, 15.75, 15], "texture": "#frame"} } }, { - "from": [0, 0.625, 10], - "to": [16.25, 1.8125, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [0.25, 14.5, 1], + "to": [1, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-5.75, 7, 1]}, "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "rotation": 90, "texture": "#s"} + "east": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "west": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [0.25, 1, 1, 15], "texture": "#frame"} } }, { - "from": [2, 0.625, 12], - "to": [14, 1.8125, 13], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, + "from": [15, 2, 0], + "to": [16, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-1.25, 0.625, 6], - "to": [17.25, 1.8125, 7], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-2, 0.625, 8], - "to": [18, 1.8125, 9], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2.75, 0.625, 2], - "to": [13.25, 1.8125, 3], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0.75, 0.625, 4], - "to": [15, 1.8125, 5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [5.75, 0.625, -2], - "to": [8.75, 1.8125, -1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 7]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [4.75, 0.625, 0], - "to": [11, 1.8125, 1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "rotation": 90, "texture": "#s"} + "north": {"uv": [0, 1, 1, 14], "texture": "#frame"}, + "east": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "south": {"uv": [15, 1, 16, 14], "texture": "#frame"}, + "west": {"uv": [0, 1, 1, 14], "texture": "#frame"} } } ], diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ns_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ns_model.json index e35a014..215c20e 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ns_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ns_model.json @@ -3,10 +3,77 @@ "ambientocclusion": false, "textures": { "frame": "engineersdecor:block/material/steel_texture", - "particle": "engineersdecor:block/furniture/steel_catwalk_top", - "s": "engineersdecor:block/furniture/steel_catwalk_top" + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" }, "elements": [ + { + "from": [0, 0, 0], + "to": [16, 2, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, -0.25]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#s"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 14.75]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, -6.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + }, + { + "from": [1, 2, 1], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -6.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -7.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} + } + }, { "from": [0, 2, 0], "to": [1, 15, 1], @@ -21,15 +88,15 @@ }, { "from": [0, 15, 0], - "to": [16, 16, 1.5], + "to": [16, 16, 1], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0.5]}, "faces": { "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#frame"}, "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 0, 16, 1.5], "texture": "#frame"}, - "down": {"uv": [0, 14.5, 16, 16], "texture": "#frame"} + "west": {"uv": [0, 0, 1, 1], "texture": "#frame"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#frame"} } }, { @@ -37,9 +104,9 @@ "to": [15, 15, 1], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 0]}, "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [1, 15, 15, 15.75], "texture": "#frame"} } }, { @@ -67,16 +134,16 @@ } }, { - "from": [0, 15, 14.5], + "from": [0, 15, 15], "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, "faces": { "north": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#frame"}, "south": {"uv": [0, 0, 16, 1], "texture": "#frame"}, - "west": {"uv": [14.5, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [0, 14.5, 16, 16], "texture": "#frame"}, - "down": {"uv": [0, 0, 16, 1.5], "texture": "#frame"} + "west": {"uv": [15, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#frame"} } }, { @@ -84,9 +151,9 @@ "to": [15, 15, 15.75], "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 14.75]}, "faces": { - "north": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "south": {"uv": [1, 2, 15, 3], "texture": "#frame"}, - "down": {"uv": [1, 15, 15, 16], "texture": "#frame"} + "north": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "south": {"uv": [1, 1, 15, 1.5], "texture": "#frame"}, + "down": {"uv": [1, 0.25, 15, 1], "texture": "#frame"} } }, { @@ -100,318 +167,6 @@ "west": {"uv": [15, 1, 16, 14], "texture": "#frame"}, "down": {"uv": [15, 0, 16, 1], "texture": "#frame"} } - }, - { - "from": [0, 0, 0], - "to": [16, 2, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, -0.25]}, - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, - "east": {"uv": [15, 14, 16, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, - "west": {"uv": [0, 14, 1, 16], "texture": "#s"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#s"}, - "down": {"uv": [0, 15, 16, 16], "texture": "#s"} - } - }, - { - "from": [15, 0, 1], - "to": [16, 2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 0.75]}, - "faces": { - "north": {"uv": [0, 14, 1, 16], "texture": "#s"}, - "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [15, 14, 16, 16], "texture": "#s"}, - "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, - "down": {"uv": [15, 1, 16, 15], "texture": "#s"} - } - }, - { - "from": [0, 0, 15], - "to": [16, 2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -6.5, 14.75]}, - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, - "east": {"uv": [0, 14, 1, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, - "west": {"uv": [15, 14, 16, 16], "texture": "#s"}, - "up": {"uv": [0, 15, 16, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 16, 1], "texture": "#s"} - } - }, - { - "from": [0, 0, 1], - "to": [1, 2, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [-7, -6.5, 0.75]}, - "faces": { - "north": {"uv": [15, 14, 16, 16], "texture": "#s"}, - "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "south": {"uv": [0, 14, 1, 16], "texture": "#s"}, - "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, - "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, - "down": {"uv": [0, 1, 1, 15], "texture": "#s"} - } - }, - { - "from": [11, 0.75, 1], - "to": [12, 1.9375, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "texture": "#s"} - } - }, - { - "from": [15, 0.75, 5], - "to": [16, 1.9375, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "texture": "#s"} - } - }, - { - "from": [13, 0.75, 2.75], - "to": [14, 1.9375, 13.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "texture": "#s"} - } - }, - { - "from": [17, 0.75, 6], - "to": [18, 1.9375, 8.75], - "rotation": {"angle": 45, "axis": "y", "origin": [9, 1.78125, 8]}, - "faces": { - "north": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "texture": "#s"} - } - }, - { - "from": [7, 0.75, -2], - "to": [8, 1.9375, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "texture": "#s"} - } - }, - { - "from": [9, 0.75, -1.25], - "to": [10, 1.9375, 17.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "texture": "#s"} - } - }, - { - "from": [3, 0.75, 2], - "to": [4, 1.9375, 14], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "texture": "#s"} - } - }, - { - "from": [-1, 0.75, 6], - "to": [0, 1.9375, 10], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "texture": "#s"} - } - }, - { - "from": [5, 0.75, 0], - "to": [6, 1.9375, 16], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "texture": "#s"} - } - }, - { - "from": [1, 0.75, 4], - "to": [2, 1.9375, 12], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "south": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "texture": "#s"} - } - }, - { - "from": [3.75, 0.625, 14], - "to": [12.25, 1.8125, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 7], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [6, 0.625, 16], - "to": [10, 1.8125, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [3, 1, 4, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [1, 4, 2, 8], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0, 0.625, 10], - "to": [16.25, 1.8125, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "up": {"uv": [4, 1, 5, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [4, 1, 5, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2, 0.625, 12], - "to": [14, 1.8125, 13], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "up": {"uv": [2, 1, 3, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [3, 1, 4, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-1.25, 0.625, 6], - "to": [17.25, 1.8125, 7], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "up": {"uv": [8, 0, 9, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [8, 0, 9, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [-2, 0.625, 8], - "to": [18, 1.8125, 9], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [7, 15.5625, 8, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [8, 15.5625, 9, 15.75], "texture": "#s"}, - "up": {"uv": [7, 0, 8, 16], "rotation": 270, "texture": "#s"}, - "down": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [2.75, 0.625, 2], - "to": [13.25, 1.8125, 3], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [14, 1, 15, 13], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 1, 14, 13], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [0.75, 0.625, 4], - "to": [15, 1.8125, 5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [13, 1, 14, 15], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 15], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [5.75, 0.625, -2], - "to": [8.75, 1.8125, -1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 7]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [12, 15.5625, 13, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [3, 15.5625, 4, 15.75], "texture": "#s"}, - "up": {"uv": [12, 1, 13, 5], "rotation": 270, "texture": "#s"}, - "down": {"uv": [13, 7, 14, 11], "rotation": 90, "texture": "#s"} - } - }, - { - "from": [4.75, 0.625, 0], - "to": [11, 1.8125, 1], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 1.78125, 8]}, - "faces": { - "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "east": {"uv": [11, 15.5625, 12, 15.75], "texture": "#s"}, - "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, - "west": {"uv": [4, 15.5625, 5, 15.75], "texture": "#s"}, - "up": {"uv": [11, 1, 12, 7], "rotation": 270, "texture": "#s"}, - "down": {"uv": [11, 1, 12, 7], "rotation": 90, "texture": "#s"} - } } ], "display": { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_br_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_br_model.json new file mode 100644 index 0000000..64d0b51 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_br_model.json @@ -0,0 +1,378 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "frame": "engineersdecor:block/material/steel_texture", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [1, 10, 7], + "to": [15, 12, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 8.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 10, 1], + "to": [15, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3.5, 7.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 10, 0], + "to": [15, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 10, 1], + "to": [2, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 7.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 15], + "to": [15, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 16.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 2, 9], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, -4.5, 15.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 8], + "to": [15, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 9.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 2, 9], + "to": [2, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 15.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [14.875, -1, 15], + "to": [15.9375, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [14.875, 14, 15.0625], + "to": [15.9375, 15.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, 7.5, 17.25]}, + "faces": { + "north": {"uv": [0.0625, 0, 1.125, 2], "texture": "#s"}, + "east": {"uv": [0, 0, 1.0625, 2], "texture": "#s"}, + "south": {"uv": [14.875, 0, 15.9375, 2], "texture": "#s"}, + "west": {"uv": [14.9375, 0, 16, 2], "texture": "#s"}, + "up": {"uv": [15, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [14.875, 0, 15.9375, 1.0625], "texture": "#s"} + } + }, + { + "from": [14.9375, 15, -1], + "to": [15.875, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [7.875, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [14.9375, 29, 0], + "to": [15.875, 30.5, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [7.875, 22.5, 1.25]}, + "faces": { + "north": {"uv": [0.125, 0, 1.0625, 2], "texture": "#s"}, + "east": {"uv": [14, 0, 15.875, 2], "texture": "#s"}, + "south": {"uv": [14.9375, 0, 15.875, 2], "texture": "#s"}, + "west": {"uv": [0, 0, 1.875, 2], "texture": "#s"}, + "up": {"uv": [14.9375, 0, 15.875, 1.875], "texture": "#s"}, + "down": {"uv": [15, 14, 16, 16], "texture": "#s"} + } + }, + { + "from": [0.0625, -1, 15], + "to": [1.125, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.6875, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.0625, 14, 15.0625], + "to": [1.125, 15.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.6875, 7.5, 17.25]}, + "faces": { + "north": {"uv": [14.875, 0, 15.9375, 2], "texture": "#s"}, + "east": {"uv": [0, 0, 1.0625, 2], "texture": "#s"}, + "south": {"uv": [0.0625, 0, 1.125, 2], "texture": "#s"}, + "west": {"uv": [14.9375, 0, 16, 2], "texture": "#s"}, + "up": {"uv": [0.0625, 14.9375, 1.125, 16], "texture": "#s"}, + "down": {"uv": [0.0625, 0, 1.125, 1.0625], "texture": "#s"} + } + }, + { + "from": [0.125, 15, -1], + "to": [1.0625, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.75, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.125, 29, 0], + "to": [1.0625, 30.5, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.75, 22.5, 1.25]}, + "faces": { + "north": {"uv": [14.9375, 0, 15.875, 2], "texture": "#s"}, + "east": {"uv": [14, 0, 15.875, 2], "texture": "#s"}, + "south": {"uv": [0.125, 0, 1.0625, 2], "texture": "#s"}, + "west": {"uv": [0, 0, 1.875, 2], "texture": "#s"}, + "up": {"uv": [0.125, 0, 1.0625, 1.875], "texture": "#s"}, + "down": {"uv": [0, 14, 0.938, 15.875], "texture": "#s"} + } + }, + { + "from": [15, 8, -1.25], + "to": [15.8125, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [15.5, 11, 8]}, + "faces": { + "north": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [15, 0, 15.9375, 16], "texture": "#s"}, + "down": {"uv": [15, 0, 15.9375, 16], "texture": "#s"} + } + }, + { + "from": [0.1875, 8, -1.25], + "to": [1, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [0.5625, 11, 8]}, + "faces": { + "north": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [0.0625, 0, 1, 16], "texture": "#s"}, + "down": {"uv": [0.0625, 0, 1, 16], "texture": "#s"} + } + }, + { + "from": [0.25, 1, 15.0625], + "to": [0.9375, 14, 16], + "faces": { + "north": {"uv": [15, 2, 16, 15], "texture": "#frame"}, + "east": {"uv": [0, 2, 0.9375, 15], "texture": "#frame"}, + "south": {"uv": [0, 2, 1, 15], "texture": "#frame"}, + "west": {"uv": [15.0625, 2, 16, 15], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 0.9375], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [0.1875, 23, -8.4375], + "to": [1, 24, 12.9375], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 16, 4]}, + "faces": { + "east": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [0, 14.5, 16, 16], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [0.1875, 17, 0], + "to": [0.9375, 29, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, + "faces": { + "north": {"uv": [15, 0, 15.875, 12], "texture": "#frame"}, + "east": {"uv": [15.0625, 0, 16, 12], "texture": "#frame"}, + "south": {"uv": [0.125, 0, 1, 12], "texture": "#frame"}, + "west": {"uv": [0, 0, 0.9375, 12], "texture": "#frame"}, + "down": {"uv": [0.125, 15.0625, 1.0625, 15.9375], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [15.0625, 1, 15.0625], + "to": [15.75, 14, 16], + "faces": { + "north": {"uv": [0, 2, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 2, 0.9375, 15], "texture": "#frame"}, + "south": {"uv": [15, 2, 16, 15], "texture": "#frame"}, + "west": {"uv": [15.0625, 2, 16, 15], "texture": "#frame"}, + "down": {"uv": [15, 0, 16, 0.9375], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [15.0625, 23, -8.4375], + "to": [15.8125, 24, 12.9375], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 16, 4]}, + "faces": { + "north": {"uv": [0.1875, 0, 0.9375, 0], "texture": "#frame"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#frame"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#frame"} + } + }, + { + "from": [15.0625, 17, 0], + "to": [15.8125, 29, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, + "faces": { + "north": {"uv": [0, 1, 0.875, 13], "texture": "#frame"}, + "east": {"uv": [15, 1, 15.9375, 13], "texture": "#frame"}, + "south": {"uv": [15, 1, 15.875, 13], "texture": "#frame"}, + "west": {"uv": [0, 1, 0.9375, 13], "texture": "#frame"}, + "down": {"uv": [15, 0, 15.9375, 0.875], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [2, 3, 9], + "to": [14, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -5.5, 8.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + }, + { + "from": [2, 12, 1], + "to": [14, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 0.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 4, 9], + "to": [14, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 8.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 11, 1], + "to": [14, 11, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 2.5, 0.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.25, 1, 1.75], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "rotation": [8, 0, 42], + "translation": [8.5, 0, -5.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0.25, 3, -3], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -4], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_lr_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_lr_model.json new file mode 100644 index 0000000..a3b1b29 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_lr_model.json @@ -0,0 +1,317 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "frame": "engineersdecor:block/material/steel_texture", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [1, 10, 7], + "to": [15, 12, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 8.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 10, 1], + "to": [15, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3.5, 7.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 10, 0], + "to": [15, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 10, 1], + "to": [2, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 7.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 15], + "to": [15, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 16.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 2, 9], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, -4.5, 15.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 8], + "to": [15, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 9.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 2, 9], + "to": [2, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 15.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [14.875, -1, 15], + "to": [15.9375, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [14.9375, 15, -1], + "to": [15.875, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [7.875, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.0625, -1, 15], + "to": [1.125, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.6875, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.0625, 14, 15.0625], + "to": [1.125, 15.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.6875, 7.5, 17.25]}, + "faces": { + "north": {"uv": [14.875, 0, 15.9375, 2], "texture": "#s"}, + "east": {"uv": [0, 0, 1.0625, 2], "texture": "#s"}, + "south": {"uv": [0.0625, 0, 1.125, 2], "texture": "#s"}, + "west": {"uv": [14.9375, 0, 16, 2], "texture": "#s"}, + "up": {"uv": [0.0625, 14.9375, 1.125, 16], "texture": "#s"}, + "down": {"uv": [0.0625, 0, 1.125, 1.0625], "texture": "#s"} + } + }, + { + "from": [0.125, 15, -1], + "to": [1.0625, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.75, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.125, 29, 0], + "to": [1.0625, 30.5, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.75, 22.5, 1.25]}, + "faces": { + "north": {"uv": [14.9375, 0, 15.875, 2], "texture": "#s"}, + "east": {"uv": [14, 0, 15.875, 2], "texture": "#s"}, + "south": {"uv": [0.125, 0, 1.0625, 2], "texture": "#s"}, + "west": {"uv": [0, 0, 1.875, 2], "texture": "#s"}, + "up": {"uv": [0.125, 0, 1.0625, 1.875], "texture": "#s"}, + "down": {"uv": [0, 14, 0.938, 15.875], "texture": "#s"} + } + }, + { + "from": [15, 8, -1.25], + "to": [15.8125, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [15.5, 11, 8]}, + "faces": { + "north": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [15, 0, 15.9375, 16], "texture": "#s"}, + "down": {"uv": [15, 0, 15.9375, 16], "texture": "#s"} + } + }, + { + "from": [0.1875, 8, -1.25], + "to": [1, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [0.5625, 11, 8]}, + "faces": { + "north": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [0.0625, 0, 1, 16], "texture": "#s"}, + "down": {"uv": [0.0625, 0, 1, 16], "texture": "#s"} + } + }, + { + "from": [0.25, 1, 15.0625], + "to": [0.9375, 14, 16], + "faces": { + "north": {"uv": [15, 2, 16, 15], "texture": "#frame"}, + "east": {"uv": [0, 2, 0.9375, 15], "texture": "#frame"}, + "south": {"uv": [0, 2, 1, 15], "texture": "#frame"}, + "west": {"uv": [15.0625, 2, 16, 15], "texture": "#frame"}, + "down": {"uv": [0, 0, 1, 0.9375], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [0.1875, 23, -8.4375], + "to": [1, 24, 12.9375], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 16, 4]}, + "faces": { + "east": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 270, "texture": "#frame"}, + "down": {"uv": [0, 14.5, 16, 16], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [0.1875, 17, 0], + "to": [0.9375, 29, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, + "faces": { + "north": {"uv": [15, 0, 15.875, 12], "texture": "#frame"}, + "east": {"uv": [15.0625, 0, 16, 12], "texture": "#frame"}, + "south": {"uv": [0.125, 0, 1, 12], "texture": "#frame"}, + "west": {"uv": [0, 0, 0.9375, 12], "texture": "#frame"}, + "down": {"uv": [0.125, 15.0625, 1.0625, 15.9375], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [2, 3, 9], + "to": [14, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -5.5, 8.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + }, + { + "from": [2, 12, 1], + "to": [14, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 0.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 4, 9], + "to": [14, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 8.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 11, 1], + "to": [14, 11, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 2.5, 0.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.25, 1, 1.75], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "rotation": [8, 0, 42], + "translation": [8.5, 0, -5.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0.25, 3, -3], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -4], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_model.json new file mode 100644 index 0000000..2096085 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_model.json @@ -0,0 +1,255 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [1, 10, 7], + "to": [15, 12, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 8.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 10, 1], + "to": [15, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3.5, 7.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 10, 0], + "to": [15, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 10, 1], + "to": [2, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 7.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 15], + "to": [15, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 16.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 2, 9], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, -4.5, 15.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 8], + "to": [15, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 9.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 2, 9], + "to": [2, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 15.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [14.875, -1, 15], + "to": [15.9375, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [14.9375, 15, -1], + "to": [15.875, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [7.875, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.0625, -1, 15], + "to": [1.125, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.6875, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.125, 15, -1], + "to": [1.0625, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.75, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [15, 8, -1.25], + "to": [15.8125, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [15.5, 11, 8]}, + "faces": { + "north": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [15, 0, 15.9375, 16], "texture": "#s"}, + "down": {"uv": [15, 0, 15.9375, 16], "texture": "#s"} + } + }, + { + "from": [0.1875, 8, -1.25], + "to": [1, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [0.5625, 11, 8]}, + "faces": { + "north": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [0.0625, 0, 1, 16], "texture": "#s"}, + "down": {"uv": [0.0625, 0, 1, 16], "texture": "#s"} + } + }, + { + "from": [2, 3, 9], + "to": [14, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -5.5, 8.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + }, + { + "from": [2, 12, 1], + "to": [14, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 0.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 4, 9], + "to": [14, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 8.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 11, 1], + "to": [14, 11, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 2.5, 0.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.25, 2, 1], + "scale": [0.2, 0.2, 0.2] + }, + "firstperson_righthand": { + "rotation": [-5, -8, 14], + "translation": [8.5, 0, -5.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, -45, 0], + "translation": [-0.25, 0, -3], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [-135, 0, 0], + "translation": [0, 0, -1], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_rr_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_rr_model.json new file mode 100644 index 0000000..a4fa69c --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_stairs_rr_model.json @@ -0,0 +1,317 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "frame": "engineersdecor:block/material/steel_texture", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [1, 10, 7], + "to": [15, 12, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 8.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 10, 1], + "to": [15, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3.5, 7.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 10, 0], + "to": [15, 12, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 10, 1], + "to": [2, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 7.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 15], + "to": [15, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 16.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 16, 0], "texture": "#s"}, + "down": {"uv": [0, 16, 16, 15], "texture": "#s"} + } + }, + { + "from": [14, 2, 9], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, -4.5, 15.25]}, + "faces": { + "north": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [15, 7, 16, 1], "texture": "#s"}, + "down": {"uv": [15, 15, 16, 9], "texture": "#s"} + } + }, + { + "from": [1, 2, 8], + "to": [15, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -4.5, 9.25]}, + "faces": { + "north": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 16, 16, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 16, 0], "texture": "#s"} + } + }, + { + "from": [1, 2, 9], + "to": [2, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 15.25]}, + "faces": { + "north": {"uv": [1, 14, 0, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 9, 16], "texture": "#s"}, + "south": {"uv": [16, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [7, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 7, 1, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 1, 9], "texture": "#s"} + } + }, + { + "from": [14.875, -1, 15], + "to": [15.9375, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [14.875, 14, 15.0625], + "to": [15.9375, 15.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, 7.5, 17.25]}, + "faces": { + "north": {"uv": [0.0625, 0, 1.125, 2], "texture": "#s"}, + "east": {"uv": [0, 0, 1.0625, 2], "texture": "#s"}, + "south": {"uv": [14.875, 0, 15.9375, 2], "texture": "#s"}, + "west": {"uv": [14.9375, 0, 16, 2], "texture": "#s"}, + "up": {"uv": [15, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [14.875, 0, 15.9375, 1.0625], "texture": "#s"} + } + }, + { + "from": [14.9375, 15, -1], + "to": [15.875, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [7.875, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [14.9375, 29, 0], + "to": [15.875, 30.5, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [7.875, 22.5, 1.25]}, + "faces": { + "north": {"uv": [0.125, 0, 1.0625, 2], "texture": "#s"}, + "east": {"uv": [14, 0, 15.875, 2], "texture": "#s"}, + "south": {"uv": [14.9375, 0, 15.875, 2], "texture": "#s"}, + "west": {"uv": [0, 0, 1.875, 2], "texture": "#s"}, + "up": {"uv": [14.9375, 0, 15.875, 1.875], "texture": "#s"}, + "down": {"uv": [15, 14, 16, 16], "texture": "#s"} + } + }, + { + "from": [0.0625, -1, 15], + "to": [1.125, 1, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.6875, -7.5, 17.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [0.125, 15, -1], + "to": [1.0625, 17, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [-6.75, 8.5, 1.25]}, + "faces": { + "north": {"uv": [16, 14, 14.75, 16], "texture": "#s"}, + "east": {"uv": [16, 14, 14, 16], "texture": "#s"}, + "south": {"uv": [1.25, 14, 0, 16], "texture": "#s"}, + "west": {"uv": [2, 14, 0, 16], "texture": "#s"}, + "up": {"uv": [14.75, 2, 16, 0], "texture": "#s"}, + "down": {"uv": [14.75, 16, 16, 14], "texture": "#s"} + } + }, + { + "from": [15, 8, -1.25], + "to": [15.8125, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [15.5, 11, 8]}, + "faces": { + "north": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [15, 0, 15.9375, 16], "texture": "#s"}, + "down": {"uv": [15, 0, 15.9375, 16], "texture": "#s"} + } + }, + { + "from": [0.1875, 8, -1.25], + "to": [1, 10, 21.5625], + "rotation": {"angle": 45, "axis": "x", "origin": [0.5625, 11, 8]}, + "faces": { + "north": {"uv": [15, 6, 15.9375, 8], "texture": "#s"}, + "east": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "south": {"uv": [0.0625, 6, 1, 8], "texture": "#s"}, + "west": {"uv": [0, 6, 16, 8], "texture": "#s"}, + "up": {"uv": [0.0625, 0, 1, 16], "texture": "#s"}, + "down": {"uv": [0.0625, 0, 1, 16], "texture": "#s"} + } + }, + { + "from": [15.0625, 1, 15.0625], + "to": [15.75, 14, 16], + "faces": { + "north": {"uv": [0, 2, 1, 15], "texture": "#frame"}, + "east": {"uv": [0, 2, 0.9375, 15], "texture": "#frame"}, + "south": {"uv": [15, 2, 16, 15], "texture": "#frame"}, + "west": {"uv": [15.0625, 2, 16, 15], "texture": "#frame"}, + "down": {"uv": [15, 0, 16, 0.9375], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [15.0625, 23, -8.4375], + "to": [15.8125, 24, 12.9375], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 16, 4]}, + "faces": { + "north": {"uv": [0.1875, 0, 0.9375, 0], "texture": "#frame"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#frame"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#frame"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#frame"} + } + }, + { + "from": [15.0625, 17, 0], + "to": [15.8125, 29, 0.9375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, + "faces": { + "north": {"uv": [0, 1, 0.875, 13], "texture": "#frame"}, + "east": {"uv": [15, 1, 15.9375, 13], "texture": "#frame"}, + "south": {"uv": [15, 1, 15.875, 13], "texture": "#frame"}, + "west": {"uv": [0, 1, 0.9375, 13], "texture": "#frame"}, + "down": {"uv": [15, 0, 15.9375, 0.875], "rotation": 90, "texture": "#frame"} + } + }, + { + "from": [2, 3, 9], + "to": [14, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -5.5, 8.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + }, + { + "from": [2, 12, 1], + "to": [14, 12, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 3.5, 0.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 4, 9], + "to": [14, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, -4.5, 8.75]}, + "faces": { + "up": {"uv": [3, 3, 15, 9], "texture": "#t"}, + "down": {"uv": [2, 9, 14, 15], "texture": "#t"} + } + }, + { + "from": [2, 11, 1], + "to": [14, 11, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 2.5, 0.75]}, + "faces": { + "up": {"uv": [2, 1, 14, 7], "texture": "#t"}, + "down": {"uv": [2, 8, 14, 14], "texture": "#t"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.25, 1, 1.75], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "rotation": [8, 0, 42], + "translation": [8.5, 0, -5.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0.25, 3, -3], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -4], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta0_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta0_model.json new file mode 100644 index 0000000..19355f0 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta0_model.json @@ -0,0 +1,103 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [0, 14, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, -0.25]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 14, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#s"} + } + }, + { + "from": [0, 14, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 14.75]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 14, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + }, + { + "from": [1, 16, 1], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 7.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} + } + }, + { + "from": [1, 15, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 6.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.25, 1, 1.75], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "rotation": [8, 0, 42], + "translation": [8.5, 0, -5.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0.25, 3, -3], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -4], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta1_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta1_model.json new file mode 100644 index 0000000..c410efe --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta1_model.json @@ -0,0 +1,150 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "side": "engineersdecor:block/pole/thick_steel_pole_side_texture", + "top": "engineersdecor:block/pole/thick_steel_pole_top_texture", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [0, 14, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, -0.25]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 14, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#s"} + } + }, + { + "from": [0, 14, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 14.75]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 14, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + }, + { + "from": [1, 16, 1], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 7.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} + } + }, + { + "from": [1, 15, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 6.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} + } + }, + { + "from": [6, 0, 10], + "to": [10, 15.125, 11], + "faces": { + "north": {"uv": [6, 1, 10, 16], "rotation": 180, "texture": "#side"}, + "south": {"uv": [6, 1, 10, 16], "texture": "#side"}, + "up": {"uv": [6, 10, 10, 11], "rotation": 180, "texture": "#top"}, + "down": {"uv": [6, 5, 10, 6], "texture": "#top"} + } + }, + { + "from": [10, 0, 5], + "to": [11, 15.125, 11], + "faces": { + "north": {"uv": [5, 1, 6, 16], "rotation": 180, "texture": "#side"}, + "east": {"uv": [5, 1, 11, 16], "texture": "#side"}, + "south": {"uv": [10, 1, 11, 16], "texture": "#side"}, + "west": {"uv": [5, 1, 11, 16], "rotation": 180, "texture": "#side"}, + "up": {"uv": [10, 5, 11, 11], "rotation": 180, "texture": "#top"}, + "down": {"uv": [10, 5, 11, 11], "texture": "#top"} + } + }, + { + "from": [5, 0, 5], + "to": [6, 15.125, 11], + "faces": { + "north": {"uv": [10, 1, 11, 16], "rotation": 180, "texture": "#side"}, + "east": {"uv": [5, 1, 11, 16], "texture": "#side"}, + "south": {"uv": [5, 1, 6, 16], "texture": "#side"}, + "west": {"uv": [5, 1, 11, 16], "rotation": 180, "texture": "#side"}, + "up": {"uv": [5, 5, 6, 11], "rotation": 180, "texture": "#top"}, + "down": {"uv": [5, 5, 6, 11], "texture": "#top"} + } + }, + { + "from": [6, 0, 5], + "to": [10, 15.125, 6], + "faces": { + "north": {"uv": [6, 1, 10, 16], "rotation": 180, "texture": "#side"}, + "south": {"uv": [6, 1, 10, 16], "texture": "#side"}, + "up": {"uv": [6, 5, 10, 6], "rotation": 180, "texture": "#top"}, + "down": {"uv": [6, 10, 10, 11], "texture": "#top"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.5, 1, -1.75], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "rotation": [16, -4, 7], + "translation": [7.25, -2.25, -3.5], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0.5, 0, -3], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, 3.25], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta2_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta2_model.json new file mode 100644 index 0000000..640b29a --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta2_model.json @@ -0,0 +1,150 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "side": "engineersdecor:block/pole/thin_steel_pole_side_texture", + "top": "engineersdecor:block/pole/thin_steel_pole_top_texture", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [0, 14, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, -0.25]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 14, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#s"} + } + }, + { + "from": [0, 14, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 14.75]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 14, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + }, + { + "from": [1, 16, 1], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 7.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} + } + }, + { + "from": [1, 15, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 6.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} + } + }, + { + "from": [7, 0, 9], + "to": [9, 15, 10], + "faces": { + "north": {"uv": [7, 1, 9, 16], "rotation": 180, "texture": "#side"}, + "south": {"uv": [7, 1, 9, 16], "texture": "#side"}, + "up": {"uv": [7, 9, 9, 10], "rotation": 180, "texture": "#top"}, + "down": {"uv": [7, 6, 9, 7], "texture": "#top"} + } + }, + { + "from": [9, 0, 6], + "to": [10, 15, 10], + "faces": { + "north": {"uv": [6, 1, 7, 16], "rotation": 180, "texture": "#side"}, + "east": {"uv": [6, 1, 10, 16], "texture": "#side"}, + "south": {"uv": [9, 1, 10, 16], "texture": "#side"}, + "west": {"uv": [6, 1, 10, 16], "rotation": 180, "texture": "#side"}, + "up": {"uv": [9, 6, 10, 10], "rotation": 180, "texture": "#top"}, + "down": {"uv": [9, 6, 10, 10], "texture": "#top"} + } + }, + { + "from": [6, 0, 6], + "to": [7, 15, 10], + "faces": { + "north": {"uv": [9, 1, 10, 16], "rotation": 180, "texture": "#side"}, + "east": {"uv": [6, 1, 10, 16], "texture": "#side"}, + "south": {"uv": [6, 1, 7, 16], "texture": "#side"}, + "west": {"uv": [6, 1, 10, 16], "rotation": 180, "texture": "#side"}, + "up": {"uv": [6, 6, 7, 10], "rotation": 180, "texture": "#top"}, + "down": {"uv": [6, 6, 7, 10], "texture": "#top"} + } + }, + { + "from": [7, 0, 6], + "to": [9, 15, 7], + "faces": { + "north": {"uv": [7, 1, 9, 16], "rotation": 180, "texture": "#side"}, + "south": {"uv": [7, 1, 9, 16], "texture": "#side"}, + "up": {"uv": [7, 6, 9, 7], "rotation": 180, "texture": "#top"}, + "down": {"uv": [7, 9, 9, 10], "texture": "#top"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.25, 1, 1.75], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "rotation": [8, 0, 42], + "translation": [8.5, 0, -5.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0.25, 3, -3], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -4], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta3_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta3_model.json new file mode 100644 index 0000000..144617d --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_catwalk_ta3_model.json @@ -0,0 +1,217 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "engineersdecor:block/furniture/steel_catwalk_side", + "s": "engineersdecor:block/furniture/steel_catwalk_side", + "t": "engineersdecor:block/furniture/steel_catwalk_top" + }, + "elements": [ + { + "from": [0, 14, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, -0.25]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 14, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#s"} + } + }, + { + "from": [0, 14, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.5, 14.75]}, + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 14, 1, 16], "texture": "#s"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#s"}, + "west": {"uv": [15, 14, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 14, 1], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, 7.5, 0.75]}, + "faces": { + "east": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 14, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + }, + { + "from": [1, 16, 1], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 7.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#t"} + } + }, + { + "from": [1, 15, 1], + "to": [15, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-6, 6.5, 0.75]}, + "faces": { + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#t"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "east": {"uv": [15, 15, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 15, 1, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#s"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "east": {"uv": [1, 15, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 15, 15, 16], "texture": "#s"}, + "up": {"uv": [15, 1, 16, 15], "texture": "#s"}, + "down": {"uv": [15, 1, 16, 15], "texture": "#s"} + } + }, + { + "from": [0, 0, 15], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 15, 1, 16], "texture": "#s"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "west": {"uv": [15, 15, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "east": {"uv": [1, 15, 15, 16], "texture": "#s"}, + "west": {"uv": [1, 15, 15, 16], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#s"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + }, + { + "from": [7.5, 0.25, -2.0773], + "to": [8.5, 0.9375, 18.1727], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "east": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, + "west": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, + "up": {"uv": [7, 0, 8, 16], "texture": "#s"}, + "down": {"uv": [7, 0, 8, 16], "texture": "#s"} + } + }, + { + "from": [-1.94166, 0.125, 7.5], + "to": [18.30834, 0.8125, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "north": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, + "south": {"uv": [1, 15.5625, 15, 15.75], "texture": "#s"}, + "up": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"}, + "down": {"uv": [7, 0, 8, 16], "rotation": 90, "texture": "#s"} + } + }, + { + "from": [0, 1, 15], + "to": [1, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [15, 2, 16, 15], "texture": "#s"}, + "east": {"uv": [0, 2, 1, 15], "texture": "#s"}, + "south": {"uv": [0, 2, 1, 15], "texture": "#s"}, + "west": {"uv": [15, 2, 16, 15], "texture": "#s"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, -7]}, + "faces": { + "north": {"uv": [15, 2, 16, 15], "texture": "#s"}, + "east": {"uv": [15, 2, 16, 15], "texture": "#s"}, + "south": {"uv": [0, 2, 1, 15], "texture": "#s"}, + "west": {"uv": [0, 2, 1, 15], "texture": "#s"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 14, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 3, -7]}, + "faces": { + "north": {"uv": [0, 2, 1, 15], "texture": "#s"}, + "east": {"uv": [15, 2, 16, 15], "texture": "#s"}, + "south": {"uv": [15, 2, 16, 15], "texture": "#s"}, + "west": {"uv": [0, 2, 1, 15], "texture": "#s"} + } + }, + { + "from": [15, 1, 15], + "to": [16, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 3, 8]}, + "faces": { + "north": {"uv": [0, 2, 1, 15], "texture": "#s"}, + "east": {"uv": [0, 2, 1, 15], "texture": "#s"}, + "south": {"uv": [15, 2, 16, 15], "texture": "#s"}, + "west": {"uv": [15, 2, 16, 15], "texture": "#s"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [70, -2, 3], + "translation": [0.25, 1, 1.75], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "rotation": [8, 0, 42], + "translation": [8.5, 0, -5.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0.25, 3, -3], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -4], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json index c0dec34..855f119 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "s": "engineersdecor:block/furniture/steel_table_side_texture", "particle": "engineersdecor:block/furniture/steel_table_side_texture", + "s": "engineersdecor:block/furniture/steel_table_side_texture", "t": "engineersdecor:block/furniture/steel_table_top_texture" }, "elements": [ @@ -44,8 +44,8 @@ }, { "from": [1, 15, 13.625], - "to": [15, 15.875, 14.375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 14.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [1.625, 0.125, 2.375, 1], "texture": "#s"}, @@ -57,8 +57,8 @@ }, { "from": [1, 15, 12.125], - "to": [15, 15.875, 12.875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 12.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [3.125, 0.125, 3.875, 1], "texture": "#s"}, @@ -70,8 +70,8 @@ }, { "from": [1, 15, 10.625], - "to": [15, 15.875, 11.375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 11.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [4.625, 0.125, 5.375, 1], "texture": "#s"}, @@ -83,8 +83,8 @@ }, { "from": [1, 15, 9.125], - "to": [15, 15.875, 9.875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 9.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [6.125, 0.125, 6.875, 1], "texture": "#s"}, @@ -96,8 +96,8 @@ }, { "from": [1, 15, 7.625], - "to": [15, 15.875, 8.375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 8.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [7.625, 0.125, 8.375, 1], "texture": "#s"}, @@ -109,8 +109,8 @@ }, { "from": [1, 15, 6.125], - "to": [15, 15.875, 6.875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 6.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [9.125, 0.125, 9.875, 1], "texture": "#s"}, @@ -122,8 +122,8 @@ }, { "from": [1, 15, 4.625], - "to": [15, 15.875, 5.375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 5.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [10.625, 0.125, 11.375, 1], "texture": "#s"}, @@ -135,8 +135,8 @@ }, { "from": [1, 15, 3.125], - "to": [15, 15.875, 3.875], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 3.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [12.125, 0.125, 12.875, 1], "texture": "#s"}, @@ -148,8 +148,8 @@ }, { "from": [1, 15, 1.625], - "to": [15, 15.875, 2.375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "to": [15, 16, 2.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.125, 8.375]}, "faces": { "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, "east": {"uv": [13.625, 0.125, 14.375, 1], "texture": "#s"}, diff --git a/src/main/resources/assets/engineersdecor/models/item/steel_catwalk_stairs.json b/src/main/resources/assets/engineersdecor/models/item/steel_catwalk_stairs.json new file mode 100644 index 0000000..f78b5ba --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/steel_catwalk_stairs.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/furniture/steel_catwalk_stairs_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/steel_catwalk_ta.json b/src/main/resources/assets/engineersdecor/models/item/steel_catwalk_ta.json new file mode 100644 index 0000000..2cec118 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/steel_catwalk_ta.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/furniture/steel_catwalk_ta1_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_catwalk_side.png b/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_catwalk_side.png new file mode 100644 index 0000000000000000000000000000000000000000..8cd5e7b5947dec18e394abe8a0fea8ff33d888dd GIT binary patch literal 369 zcmV-%0gnEOP)VGd009w6L_t(I%Ux4j4umiW93EcH`=18| z_QxS~O&XQ9^P-jezT3q0G;gm$w%!I0r zM1oz{b=aXg-N9rg+! z)|CAw!)_g!yL&de`&gox0KAZ!jSgi z*}3fJ1JNVt-FwzKS5=b*gZ0hwzxbbxRw81^d?QE1T&#V`_C@1S=C%I;T=rnVOYv;k P00000NkvXXu0mjfgm$Hk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_catwalk_top.png b/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_catwalk_top.png index 8cd5e7b5947dec18e394abe8a0fea8ff33d888dd..8d6055b5c52f774b2939678593381f1a84426a09 100644 GIT binary patch delta 529 zcmV+s0`C3s0?`DJOMmf6L_t(I%VkqrlG`v014ub?>~wcewfDbCJ8c}lM4}&#J<}=w zC=N*wfcX9WEq6yopmZJfeTSLh43Z#uy+s5_A~Qh}#ogiVyxnecca~B_k`W=2T-Q~7 z-;<;yk)!}nk}?w(5da`b{PpwaRV<}YnHq-SYR*iNq?yUxX@6!10y853eSUpWM{wVF z)mr~+zJ?zG%S=RTDy7iO1c2?G&-1Lz4Qny;U%(F@<1Rwy+O#S%ypu3+Nm6_KW0AOYY zNo=jD_C4p47 zDKoG7LE>Ri0?_?_=dvt^1D8d&TKVVqZ)GOeWx0m!`+v?jR6CrwE{h_9&*xKp-yin9 z-j-cpW_2QyRWG61|zC|$?Q)Z$*$#Q|HX& zx~{6V5`ZFtk~9nhw{5$mEa%s3t!djfxVt1FBINGa_g#|kh7EUDL?9vr0Dl4C9>_8K T?dk#m015yANkvXXu0mjfKQsfN delta 303 zcmV+~0nq-@1n~lpOMekbL_t(I%Ux4j4umiW93EcH`=18|_QxS~O&XQ9^P-jezT3q0G;gm$w%!I0rM1O)^*LB#TI^Dr!Cft3p zpgJ=f#;O_{U*~iRs(PeM@7%<^n9=vI2RhFKz3*=Tc;6RhHrAB=Cc|zWnY(*7y8BqF zDk$Y<<`ED8xckwah?rdFyl`^+rgTbXjm*#UOt+NGw8D_~;n}(D=L69r>D_zQIagJa z1%vg?^1t|>jVM+kV#s_WN5ovLeaZGk<5A|d{{dX~V8Bc9Y}o(+002ovPDHLkV1k>) Bmy`ei diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_catwalk_ta.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_catwalk_ta.json new file mode 100644 index 0000000..ba91872 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_catwalk_ta.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "steel_catwalk_ta_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:steel_catwalk_ta" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_recipe.json new file mode 100644 index 0000000..fca78aa --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_recipe.json @@ -0,0 +1,31 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:steel_catwalk", + "required": ["engineersdecor:metal_bar"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + " S ", + "S S" + ], + "key": { + "S": { + "item": "engineersdecor:metal_bar" + } + }, + "result": { + "item": "engineersdecor:steel_catwalk", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_stairs_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_stairs_recipe.json new file mode 100644 index 0000000..db5cdad --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_stairs_recipe.json @@ -0,0 +1,31 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:steel_catwalk_stairs", + "required": ["engineersdecor:steel_catwalk"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "engineersdecor:steel_catwalk" + } + }, + "result": { + "item": "engineersdecor:steel_catwalk_stairs", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe.json new file mode 100644 index 0000000..f1bbf30 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe.json @@ -0,0 +1,23 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:steel_catwalk_ta", + "required": ["engineersdecor:steel_catwalk"] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:steel_catwalk" } + ], + "result": { + "item": "engineersdecor:steel_catwalk_ta" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe_decompose.json b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe_decompose.json new file mode 100644 index 0000000..b2c3813 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/steel_catwalk_ta_recipe_decompose.json @@ -0,0 +1,23 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:steel_catwalk", + "required": ["engineersdecor:steel_catwalk_ta"] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:steel_catwalk_ta" } + ], + "result": { + "item": "engineersdecor:steel_catwalk" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/steel_floor_grating_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/steel_floor_grating_recipe.json index 797e32f..1e4bc40 100644 --- a/src/main/resources/data/engineersdecor/recipes/independent/steel_floor_grating_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/independent/steel_floor_grating_recipe.json @@ -6,19 +6,18 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:steel_floor_grating", - "required": ["engineersdecor:metal_bar"] + "required": ["engineersdecor:steel_catwalk"] } ], "recipe": { "type": "minecraft:crafting_shaped", "pattern": [ - "S S", - " S ", - "S S" + "SS", + "SS" ], "key": { "S": { - "item": "engineersdecor:metal_bar" + "item": "engineersdecor:steel_catwalk" } }, "result": { diff --git a/src/main/resources/data/engineersdecor/recipes/independent/steel_railing_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/steel_railing_recipe.json new file mode 100644 index 0000000..d341dce --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/steel_railing_recipe.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:steel_railing", + "required": ["engineersdecor:metal_bar"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "PPP", + "P P", + "P P" + ], + "key": { + "P": { "item": "engineersdecor:metal_bar" } + }, + "result": { + "item": "engineersdecor:steel_railing", + "count": 4 + } + } + } + ] +} \ No newline at end of file