From 510bdabd1a8c30239d7b4ffef467318fb5e2ad2b Mon Sep 17 00:00:00 2001 From: DArkHekRoMaNT Date: Thu, 14 Jan 2021 12:45:08 +0300 Subject: [PATCH] Fix JRE, add creative tab --- .gitignore | 3 +- .vscode/settings.json | 2 +- .../FixTypedContainer_20201224230751.cs | 160 +++ .../FixTypedContainer_20210109135727.cs | 162 +++ MoreVariantsFixes/.vscode/launch.json | 3 +- MoreVariantsFixes/.vscode/settings.json | 2 +- MoreVariantsFixes/MoreVariantsFixes.csproj | 2 +- .../patches/add-behavior.json | 16 - .../src/EntityBehavior/FixTypedContainer.cs | 4 +- .../block/wood/chest/outdated-labeled.json | 1101 ----------------- .../blocktypes/metal/chandelier.json | 3 +- .../morevariants/blocktypes/metal/door.json | 191 ++- .../morevariants/blocktypes/metal/fence.json | 5 +- .../blocktypes/metal/sheet/block.json | 33 +- .../blocktypes/metal/sheet/slab.json | 36 +- .../blocktypes/metal/sheet/stairs.json | 103 +- .../blocktypes/metal/torchholder.json | 5 +- .../morevariants/blocktypes/stone/forge.json | 6 +- .../morevariants/blocktypes/wood/barrel.json | 8 +- .../morevariants/blocktypes/wood/bed.json | 11 +- .../morevariants/blocktypes/wood/chair.json | 28 +- .../morevariants/blocktypes/wood/chest.json | 72 +- .../morevariants/blocktypes/wood/door.json | 177 ++- .../{chest-labeled.json => labeledchest.json} | 93 +- .../morevariants/blocktypes/wood/ladder.json | 11 +- .../morevariants/blocktypes/wood/shelf.json | 18 +- .../morevariants/blocktypes/wood/table.json | 10 +- .../blocktypes/wood/trapdoor.json | 107 +- .../recipes/grid/bettercrate.json | 2 +- .../bettercrates/recipes/grid/upgrade.json | 4 +- .../recipes/grid/copper-chest.json | 2 +- .../recipes/grid/copper-labeledchest.json | 2 +- .../blocktypes/wood/chest-labeled.json | 142 --- .../blocktypes/wood/chest.json | 139 --- .../wood/outdated/old-chest-labeled.json | 234 ---- .../blocktypes/wood/outdated/old-chest.json | 222 ---- .../recipes/grid/outdated-chest.json | 186 --- .../tradeomat/recipes/grid/tomat-crate.json | 4 +- .../tradeomat/recipes/grid/tomat-tall.json | 4 +- .../assets/morevariants/itemtypes/stick.json | 6 +- resources/assets/morevariants/lang/en.json | 28 +- resources/assets/morevariants/lang/pt-br.json | 24 +- resources/assets/morevariants/lang/ru.json | 24 +- .../recipes/grid/wood/chest-labeled.json | 4 +- .../morevariants/recipes/grid/wood/chest.json | 2 +- .../block/wood/chest/normal-acacia.json} | 51 +- .../shapes/block/wood/chest/normal-aged.json} | 8 +- .../shapes/block/wood/chest/normal-birch.json | 554 +++++++++ .../shapes/block/wood/chest/normal-kapok.json | 554 +++++++++ .../shapes/block/wood/chest/normal-maple.json | 554 +++++++++ .../shapes/block/wood/chest/normal-pine.json} | 39 +- .../textures/block/wood/trunk/accessories.png | Bin 0 -> 2294 bytes .../acacia.png} | Bin .../accessories.png => accessories/aged.png} | Bin .../accessories.png => accessories/birch.png} | Bin .../accessories.png => accessories/kapok.png} | Bin .../accessories.png => accessories/maple.png} | Bin .../accessories.png => accessories/pine.png} | Bin .../textures/block/wood/trunk/lid.png | Bin 0 -> 2662 bytes .../trunk/{acacia/lid.png => lid/acacia.png} | Bin .../wood/trunk/{aged/lid.png => lid/aged.png} | Bin .../trunk/{birch/lid.png => lid/birch.png} | Bin .../trunk/{kapok/lid.png => lid/kapok.png} | Bin .../trunk/{maple/lid.png => lid/maple.png} | Bin .../wood/trunk/{pine/lid.png => lid/pine.png} | Bin .../block/wood/trunk/outdated/accessories.png | Bin 10597 -> 0 bytes .../block/wood/trunk/outdated/lid.png | Bin 10860 -> 0 bytes .../block/wood/trunk/outdated/sides.png | Bin 11148 -> 0 bytes .../textures/block/wood/trunk/sides.png | Bin 0 -> 2729 bytes .../{acacia/sides.png => sides/acacia.png} | Bin .../trunk/{aged/sides.png => sides/aged.png} | Bin .../{birch/sides.png => sides/birch.png} | Bin .../{kapok/sides.png => sides/kapok.png} | Bin .../{maple/sides.png => sides/maple.png} | Bin .../trunk/{pine/sides.png => sides/pine.png} | Bin resources/modinfo.json | 2 +- 76 files changed, 2810 insertions(+), 2353 deletions(-) create mode 100644 MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20201224230751.cs create mode 100644 MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20210109135727.cs delete mode 100644 MoreVariantsFixes/resources/assets/morevariantsfixes/patches/add-behavior.json delete mode 100644 resources/assets/game/shapes/block/wood/chest/outdated-labeled.json rename resources/assets/morevariants/blocktypes/wood/{chest-labeled.json => labeledchest.json} (56%) delete mode 100644 resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest-labeled.json delete mode 100644 resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest.json delete mode 100644 resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest-labeled.json delete mode 100644 resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest.json delete mode 100644 resources/assets/morevariants/compatibility/morevariantsfixes/recipes/grid/outdated-chest.json rename resources/assets/{game/shapes/block/wood/chest/outdated-labeled-opened.json => morevariants/shapes/block/wood/chest/normal-acacia.json} (96%) rename resources/assets/{game/shapes/block/wood/chest/outdated.json => morevariants/shapes/block/wood/chest/normal-aged.json} (99%) create mode 100644 resources/assets/morevariants/shapes/block/wood/chest/normal-birch.json create mode 100644 resources/assets/morevariants/shapes/block/wood/chest/normal-kapok.json create mode 100644 resources/assets/morevariants/shapes/block/wood/chest/normal-maple.json rename resources/assets/{game/shapes/block/wood/chest/outdated-opened.json => morevariants/shapes/block/wood/chest/normal-pine.json} (97%) create mode 100644 resources/assets/morevariants/textures/block/wood/trunk/accessories.png rename resources/assets/morevariants/textures/block/wood/trunk/{acacia/accessories.png => accessories/acacia.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{aged/accessories.png => accessories/aged.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{birch/accessories.png => accessories/birch.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{kapok/accessories.png => accessories/kapok.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{maple/accessories.png => accessories/maple.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{pine/accessories.png => accessories/pine.png} (100%) create mode 100644 resources/assets/morevariants/textures/block/wood/trunk/lid.png rename resources/assets/morevariants/textures/block/wood/trunk/{acacia/lid.png => lid/acacia.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{aged/lid.png => lid/aged.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{birch/lid.png => lid/birch.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{kapok/lid.png => lid/kapok.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{maple/lid.png => lid/maple.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{pine/lid.png => lid/pine.png} (100%) delete mode 100644 resources/assets/morevariants/textures/block/wood/trunk/outdated/accessories.png delete mode 100644 resources/assets/morevariants/textures/block/wood/trunk/outdated/lid.png delete mode 100644 resources/assets/morevariants/textures/block/wood/trunk/outdated/sides.png create mode 100644 resources/assets/morevariants/textures/block/wood/trunk/sides.png rename resources/assets/morevariants/textures/block/wood/trunk/{acacia/sides.png => sides/acacia.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{aged/sides.png => sides/aged.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{birch/sides.png => sides/birch.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{kapok/sides.png => sides/kapok.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{maple/sides.png => sides/maple.png} (100%) rename resources/assets/morevariants/textures/block/wood/trunk/{pine/sides.png => sides/pine.png} (100%) diff --git a/.gitignore b/.gitignore index 41e0d19..28a4927 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /bin /obj /mods -/releases \ No newline at end of file +/releases +/.history \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index eebfe60..7f031fa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "vsversion": "1.14.0" + "vsversion": "1.14.5" } diff --git a/MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20201224230751.cs b/MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20201224230751.cs new file mode 100644 index 0000000..fb80a2e --- /dev/null +++ b/MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20201224230751.cs @@ -0,0 +1,160 @@ +using Vintagestory.API; +using Vintagestory.API.Common; +using Vintagestory.API.Common.Entities; +using Vintagestory.API.Datastructures; +using Vintagestory.API.MathTools; +using Vintagestory.GameContent; + +namespace MoreVariantsFixes +{ + public class FixTypedContainer : EntityBehavior + { + ICoreAPI Api { get => player?.Api; } + IWorldAccessor World { get => player?.World; } + EntityPlayer player; + public FixTypedContainer(Entity entity) : base(entity) + { + player = entity as EntityPlayer; + } + public override string PropertyName() + { + return "fixtypedcontainer"; + } + public override void OnGameTick(float deltaTime) + { + base.OnGameTick(deltaTime); + + if (player.BlockSelection != null && false) + { + BlockPos pos = player.BlockSelection.Position; + BlockEntityGenericTypedContainer be = World.BlockAccessor.GetBlockEntity(pos) as BlockEntityGenericTypedContainer; + + if (be?.Block?.Code?.Domain == "morevariants") + { + if (be.Block.FirstCodePart() == "chest") + { + if (be.type != "normal" && be.type != "normal-generic") + { + BlockGenericTypedContainer newBlock = World.BlockAccessor.GetBlock(new AssetLocation("morevariants", + be.Block.FirstCodePart() + "-" + be.type + "-" + be.Block.LastCodePart() + )) as BlockGenericTypedContainer; + + if (newBlock != null) + { + be.Block = newBlock; + be.type = "normal-generic"; + World.BlockAccessor.SetBlock(newBlock.BlockId, pos); + } + } + else + { + be.type = "normal-generic"; + } + } + else if (be.Block.FirstCodePart() == "labeledchest") + { + if (be.type != "normal" && be.type != "normal-labeled" && be.type != "normal-generic") + { + BlockLabeledChest newBlock = World.BlockAccessor.GetBlock(new AssetLocation("morevariants", + be.Block.FirstCodePart() + "-" + be.type.Split('-')[0] + "-" + be.Block.LastCodePart() + )) as BlockLabeledChest; + + if (newBlock != null) + { + be.Block = newBlock; + World.BlockAccessor.SetBlock(newBlock.BlockId, pos); + be.type = "normal-labeled"; + } + } + else + { + + be.type = "normal-labeled"; + } + } + } + + + + /*World.Api.Logger.Warning("{0}: Obsolete {1} on {2} will be removed", Constants.MOD_ID, block.Code, pos); + //try + { + TreeAttribute tree = new TreeAttribute(); + be.Inventory.ToTreeAttributes(tree); + + AssetLocation code = new AssetLocation("morevariants", + block.FirstCodePart() + "-" + be.type.Split('-')[0] + "-" + block.LastCodePart() + ); + Block newBlock = World.BlockAccessor.GetBlock(code); + + World.BlockAccessor.SetBlock(newBlock.BlockId, pos); + be = World.BlockAccessor.GetBlockEntity(pos) as BlockEntityGenericTypedContainer; + + be.Inventory.FromTreeAttributes(tree); + World.Api.Logger.Warning("{0}: Success", Constants.MOD_ID); + } + /*catch (Exception e) + { + World.Api.Logger.Warning("{0}: Fail", Constants.MOD_ID); + World.Api.Logger.Error(e.Message); + }*/ + } + } + } + public class BEFixTypedChest : BlockEntityBehavior + { + public BEFixTypedChest(BlockEntity blockentity) : base(blockentity) { } + public override void Initialize(ICoreAPI api, JsonObject properties) + { + base.Initialize(api, properties); + Blockentity.RegisterGameTickListener(OnGameTick, 10000); + } + private void OnGameTick(float dt) + { + BlockEntityGenericTypedContainer be = Blockentity as BlockEntityGenericTypedContainer; + + if (be?.Block?.Code?.Domain == "morevariants" && be.type != "normal-labeled" && be.type != "normal-generic") + { + IBlockAccessor blockAccessor = Blockentity.Api.World.BlockAccessor; + + string newBEType; + if (be.Block.FirstCodePart() == "chest") + { + newBEType = "normal-generic"; + } + else if (be.Block.FirstCodePart() == "labeledchest") + { + newBEType = "normal-labeled"; + } + else return; + + BlockGenericTypedContainer newBlock; + if (be.type == "normal") + { + newBlock = blockAccessor.GetBlock(be.Block.BlockId) as BlockGenericTypedContainer; + } + else + { + newBlock = blockAccessor.GetBlock(new AssetLocation("morevariants", + be.Block.FirstCodePart() + "-" + be.type.Split('-')[0] + "-" + be.Block.LastCodePart() + )) as BlockGenericTypedContainer; + } + + if (newBlock != null) + { + TreeAttribute tree = new TreeAttribute(); + be.Inventory.ToTreeAttributes(tree); + float angle = be.MeshAngle; + + be.Block = newBlock; + blockAccessor.SetBlock(newBlock.BlockId, be.Pos); + + be = blockAccessor.GetBlockEntity(be.Pos.Copy()) as BlockEntityGenericTypedContainer; + be.Inventory.FromTreeAttributes(tree); + be.type = newBEType; + be.MeshAngle = angle; + } + } + } + } +} diff --git a/MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20210109135727.cs b/MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20210109135727.cs new file mode 100644 index 0000000..9c9c534 --- /dev/null +++ b/MoreVariantsFixes/.history/src/EntityBehavior/FixTypedContainer_20210109135727.cs @@ -0,0 +1,162 @@ +using Vintagestory.API; +using Vintagestory.API.Common; +using Vintagestory.API.Common.Entities; +using Vintagestory.API.Datastructures; +using Vintagestory.API.MathTools; +using Vintagestory.GameContent; + +namespace MoreVariantsFixes +{ + public class FixTypedContainer : EntityBehavior + { + + BlockEntityLabeledChest + ICoreAPI Api { get => player?.Api; } + IWorldAccessor World { get => player?.World; } + EntityPlayer player; + public FixTypedContainer(Entity entity) : base(entity) + { + player = entity as EntityPlayer; + } + public override string PropertyName() + { + return "fixtypedcontainer"; + } + public override void OnGameTick(float deltaTime) + { + base.OnGameTick(deltaTime); + + if (player.BlockSelection != null && false) + { + BlockPos pos = player.BlockSelection.Position; + BlockEntityGenericTypedContainer be = World.BlockAccessor.GetBlockEntity(pos) as BlockEntityGenericTypedContainer; + + if (be?.Block?.Code?.Domain == "morevariants") + { + if (be.Block.FirstCodePart() == "chest") + { + if (be.type != "normal" && be.type != "normal-generic") + { + BlockGenericTypedContainer newBlock = World.BlockAccessor.GetBlock(new AssetLocation("morevariants", + be.Block.FirstCodePart() + "-" + be.type + "-" + be.Block.LastCodePart() + )) as BlockGenericTypedContainer; + + if (newBlock != null) + { + be.Block = newBlock; + be.type = "normal-generic"; + World.BlockAccessor.SetBlock(newBlock.BlockId, pos); + } + } + else + { + be.type = "normal-generic"; + } + } + else if (be.Block.FirstCodePart() == "labeledchest") + { + if (be.type != "normal" && be.type != "normal-labeled" && be.type != "normal-generic") + { + BlockLabeledChest newBlock = World.BlockAccessor.GetBlock(new AssetLocation("morevariants", + be.Block.FirstCodePart() + "-" + be.type.Split('-')[0] + "-" + be.Block.LastCodePart() + )) as BlockLabeledChest; + + if (newBlock != null) + { + be.Block = newBlock; + World.BlockAccessor.SetBlock(newBlock.BlockId, pos); + be.type = "normal-labeled"; + } + } + else + { + + be.type = "normal-labeled"; + } + } + } + + + + /*World.Api.Logger.Warning("{0}: Obsolete {1} on {2} will be removed", Constants.MOD_ID, block.Code, pos); + //try + { + TreeAttribute tree = new TreeAttribute(); + be.Inventory.ToTreeAttributes(tree); + + AssetLocation code = new AssetLocation("morevariants", + block.FirstCodePart() + "-" + be.type.Split('-')[0] + "-" + block.LastCodePart() + ); + Block newBlock = World.BlockAccessor.GetBlock(code); + + World.BlockAccessor.SetBlock(newBlock.BlockId, pos); + be = World.BlockAccessor.GetBlockEntity(pos) as BlockEntityGenericTypedContainer; + + be.Inventory.FromTreeAttributes(tree); + World.Api.Logger.Warning("{0}: Success", Constants.MOD_ID); + } + /*catch (Exception e) + { + World.Api.Logger.Warning("{0}: Fail", Constants.MOD_ID); + World.Api.Logger.Error(e.Message); + }*/ + } + } +} +public class BEFixTypedChest : BlockEntityBehavior +{ + public BEFixTypedChest(BlockEntity blockentity) : base(blockentity) { } + public override void Initialize(ICoreAPI api, JsonObject properties) + { + base.Initialize(api, properties); + Blockentity.RegisterGameTickListener(OnGameTick, 10000); + } + private void OnGameTick(float dt) + { + BlockEntityGenericTypedContainer be = Blockentity as BlockEntityGenericTypedContainer; + + if (be?.Block?.Code?.Domain == "morevariants" && be.type != "normal-labeled" && be.type != "normal-generic") + { + IBlockAccessor blockAccessor = Blockentity.Api.World.BlockAccessor; + + string newBEType; + if (be.Block.FirstCodePart() == "chest") + { + newBEType = "normal-generic"; + } + else if (be.Block.FirstCodePart() == "labeledchest") + { + newBEType = "normal-labeled"; + } + else return; + + BlockGenericTypedContainer newBlock; + if (be.type == "normal") + { + newBlock = blockAccessor.GetBlock(be.Block.BlockId) as BlockGenericTypedContainer; + } + else + { + newBlock = blockAccessor.GetBlock(new AssetLocation("morevariants", + be.Block.FirstCodePart() + "-" + be.type.Split('-')[0] + "-" + be.Block.LastCodePart() + )) as BlockGenericTypedContainer; + } + + if (newBlock != null) + { + TreeAttribute tree = new TreeAttribute(); + be.Inventory.ToTreeAttributes(tree); + float angle = be.MeshAngle; + + be.Block = newBlock; + blockAccessor.SetBlock(newBlock.BlockId, be.Pos); + + be = blockAccessor.GetBlockEntity(be.Pos.Copy()) as BlockEntityGenericTypedContainer; + be.Inventory.FromTreeAttributes(tree); + be.type = newBEType; + be.MeshAngle = angle; + } + } + } +} +} diff --git a/MoreVariantsFixes/.vscode/launch.json b/MoreVariantsFixes/.vscode/launch.json index 01cb15a..0d3796e 100644 --- a/MoreVariantsFixes/.vscode/launch.json +++ b/MoreVariantsFixes/.vscode/launch.json @@ -21,7 +21,8 @@ "internalConsoleOptions": "openOnSessionStart", "env": { "TEXTURE_DEBUG_DISPOSE": "0" - } + }, + "justMyCode": false }, { "name": "Launch Client (Mono)", diff --git a/MoreVariantsFixes/.vscode/settings.json b/MoreVariantsFixes/.vscode/settings.json index eebfe60..16ac464 100644 --- a/MoreVariantsFixes/.vscode/settings.json +++ b/MoreVariantsFixes/.vscode/settings.json @@ -1,3 +1,3 @@ { - "vsversion": "1.14.0" + "vsversion": "1.14.2" } diff --git a/MoreVariantsFixes/MoreVariantsFixes.csproj b/MoreVariantsFixes/MoreVariantsFixes.csproj index db16d33..d731bb2 100644 --- a/MoreVariantsFixes/MoreVariantsFixes.csproj +++ b/MoreVariantsFixes/MoreVariantsFixes.csproj @@ -1,7 +1,7 @@ net452 - 1.14.0 + 1.14.2 diff --git a/MoreVariantsFixes/resources/assets/morevariantsfixes/patches/add-behavior.json b/MoreVariantsFixes/resources/assets/morevariantsfixes/patches/add-behavior.json deleted file mode 100644 index 9b073dd..0000000 --- a/MoreVariantsFixes/resources/assets/morevariantsfixes/patches/add-behavior.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "file": "game:entities/humanoid/player.json", - "reason": "add", - "path": "/server/behaviors/-", - "value": { "code": "fixtypedcontainer" }, - "side": "Server" - }, - { - "file": "game:entities/humanoid/player.json", - "reason": "add", - "path": "/client/behaviors/-", - "value": { "code": "fixtypedcontainer" }, - "side": "Client" - } -] diff --git a/MoreVariantsFixes/src/EntityBehavior/FixTypedContainer.cs b/MoreVariantsFixes/src/EntityBehavior/FixTypedContainer.cs index 46de88e..fb80a2e 100644 --- a/MoreVariantsFixes/src/EntityBehavior/FixTypedContainer.cs +++ b/MoreVariantsFixes/src/EntityBehavior/FixTypedContainer.cs @@ -1,5 +1,3 @@ -using System; -using System.Text; using Vintagestory.API; using Vintagestory.API.Common; using Vintagestory.API.Common.Entities; @@ -9,7 +7,7 @@ namespace MoreVariantsFixes { - public class FixTypedContainer : EntityBehaviorPlaceBlock + public class FixTypedContainer : EntityBehavior { ICoreAPI Api { get => player?.Api; } IWorldAccessor World { get => player?.World; } diff --git a/resources/assets/game/shapes/block/wood/chest/outdated-labeled.json b/resources/assets/game/shapes/block/wood/chest/outdated-labeled.json deleted file mode 100644 index 4ddeb78..0000000 --- a/resources/assets/game/shapes/block/wood/chest/outdated-labeled.json +++ /dev/null @@ -1,1101 +0,0 @@ -{ - "editor": { - "allAngles": false, - "singleTexture": false - }, - "textureWidth": 16, - "textureHeight": 16, - "textures": { - "sides2": "block/wood/trunk/outdated/sides", - "lid": "block/wood/trunk/outdated/lid", - "accessories": "block/wood/trunk/outdated/accessories" - }, - "elements": [ - { - "name": "origin", - "from": [0.0, 0.0, 0.0], - "to": [0.0, 0.0, 0.0], - "rotationOrigin": [8.0, 0.0, 8.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [0.0, 0.0, 0.5, 0.5], - "enabled": false - }, - "east": { - "texture": "#sides2", - "uv": [0.0, 0.0, 0.5, 0.5], - "enabled": false - }, - "south": { - "texture": "#sides2", - "uv": [0.0, 0.0, 0.5, 0.5], - "enabled": false - }, - "west": { - "texture": "#sides2", - "uv": [0.0, 0.0, 0.5, 0.5], - "enabled": false - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 0.5, 0.5], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [0.0, 0.0, 0.5, 0.5], - "enabled": false - } - }, - "children": [ - { - "name": "floor", - "from": [2.0, 1.0, 2.0], - "to": [14.0, 2.0, 13.0], - "rotationOrigin": [1.0, 1.0, 1.0], - "faces": { - "north": { - "texture": "#lid", - "uv": [0.0, 0.0, 12.0, 1.0], - "rotation": 180, - "enabled": false - }, - "east": { - "texture": "#lid", - "uv": [1.0, 0.0, 12.0, 1.0], - "rotation": 180, - "enabled": false - }, - "south": { - "texture": "#lid", - "uv": [1.0, 14.0, 13.0, 15.0], - "rotation": 180, - "enabled": false - }, - "west": { - "texture": "#lid", - "uv": [1.0, 0.0, 12.0, 1.0], - "rotation": 180, - "enabled": false - }, - "up": { "texture": "#lid", "uv": [1.0, 3.5, 13.0, 14.5] }, - "down": { "texture": "#lid", "uv": [1.0, 2.0, 13.0, 13.0] } - }, - "children": [ - { - "name": "S", - "from": [-1.0, 0.0, 11.0], - "to": [13.0, 10.0, 12.0], - "rotationOrigin": [-2.0, -1.0, -1.0], - "faces": { - "north": { "texture": "#lid", "uv": [0.5, 4.0, 14.5, 14.0] }, - "east": { "texture": "#sides2", "uv": [0.0, 2.0, 1.0, 12.0] }, - "south": { "texture": "#sides2", "uv": [0.0, 2.0, 14.0, 12.0] }, - "west": { "texture": "#sides2", "uv": [13.0, 2.0, 14.0, 12.0] }, - "up": { "texture": "#lid", "uv": [2.0, 9.0, 16.0, 10.0] }, - "down": { "texture": "#sides2", "uv": [2.0, 3.0, 16.0, 4.0] } - } - }, - { - "name": "W", - "from": [-1.0, 0.0, 0.0], - "to": [0.0, 10.0, 11.0], - "rotationOrigin": [-2.0, -1.0, -2.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [13.0, 2.0, 14.0, 12.0], - "enabled": false - }, - "east": { "texture": "#lid", "uv": [1.5, 2.0, 12.5, 12.0] }, - "south": { - "texture": "#sides2", - "uv": [0.0, 2.0, 1.0, 12.0], - "enabled": false - }, - "west": { "texture": "#sides2", "uv": [1.5, 2.0, 12.5, 12.0] }, - "up": { - "texture": "#lid", - "uv": [4.5, 9.0, 15.5, 10.0], - "rotation": 90 - }, - "down": { "texture": "#sides2", "uv": [1.0, 2.0, 2.0, 13.0] } - }, - "children": [ - { - "name": "L holder", - "from": [-0.5, 7.0, 3.0], - "to": [0.0, 8.5, 4.5], - "rotationOrigin": [4.0, 9.0, -10.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 1.0, 0.5, 2.5] - }, - "east": { - "texture": "#accessories", - "uv": [0.5, 1.0, 2.0, 2.5], - "enabled": false - }, - "south": { - "texture": "#accessories", - "uv": [4.0, 1.0, 4.5, 2.5] - }, - "west": { - "texture": "#accessories", - "uv": [1.0, 0.5, 2.5, 2.0] - }, - "up": { - "texture": "#accessories", - "uv": [4.0, 1.0, 4.5, 2.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 1.5, 0.5, 3.0] - } - } - }, - { - "name": "R holder", - "from": [-0.5, 7.0, 6.5], - "to": [0.0, 8.5, 8.0], - "rotationOrigin": [4.0, 9.0, -6.5], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 1.0, 0.5, 2.5] - }, - "east": { - "texture": "#accessories", - "uv": [1.5, 1.5, 3.0, 3.0], - "enabled": false - }, - "south": { - "texture": "#accessories", - "uv": [4.0, 0.5, 4.5, 2.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.5, 1.0, 2.0, 2.5] - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 1.0, 0.5, 2.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 1.5] - } - } - }, - { - "name": "handle 1", - "from": [-1.0, 7.5, 3.5], - "to": [-0.5, 8.0, 7.5], - "rotationOrigin": [3.5, 9.5, -9.5], - "faces": { - "north": { - "texture": "#accessories", - "uv": [2.5, 3.0, 3.0, 3.5] - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 3.0, 4.0, 3.5] - }, - "south": { - "texture": "#accessories", - "uv": [4.0, 2.5, 4.5, 3.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 3.0, 4.0, 3.5] - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 1.0, 4.0, 1.5], - "rotation": 90 - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 2.5, 4.0, 3.0], - "rotation": 90 - } - } - } - ] - }, - { - "name": "E", - "from": [12.0, 0.0, 0.0], - "to": [13.0, 10.0, 11.0], - "rotationOrigin": [0.0, -1.0, -2.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [14.0, 2.0, 15.0, 12.0], - "enabled": false - }, - "east": { "texture": "#sides2", "uv": [1.5, 2.0, 12.5, 12.0] }, - "south": { - "texture": "#sides2", - "uv": [0.0, 2.0, 1.0, 12.0], - "enabled": false - }, - "west": { "texture": "#lid", "uv": [1.5, 2.0, 12.5, 12.0] }, - "up": { - "texture": "#lid", - "uv": [1.0, 1.5, 12.0, 2.5], - "rotation": 90 - }, - "down": { "texture": "#sides2", "uv": [1.0, 2.0, 2.0, 13.0] } - }, - "children": [ - { - "name": "L holder1", - "from": [1.0, 7.0, 3.0], - "to": [1.5, 8.5, 4.5], - "rotationOrigin": [1.0, 8.5, 3.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 1.0, 0.5, 2.5] - }, - "east": { - "texture": "#accessories", - "uv": [0.5, 1.0, 2.0, 2.5] - }, - "south": { - "texture": "#accessories", - "uv": [4.0, 1.0, 4.5, 2.5] - }, - "west": { - "texture": "#accessories", - "uv": [1.0, 0.5, 2.5, 2.0], - "enabled": false - }, - "up": { - "texture": "#accessories", - "uv": [4.0, 1.0, 4.5, 2.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 1.5, 0.5, 3.0] - } - } - }, - { - "name": "R holder2", - "from": [1.0, 7.0, 6.5], - "to": [1.5, 8.5, 8.0], - "rotationOrigin": [1.0, 8.5, 8.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 1.0, 0.5, 2.5] - }, - "east": { - "texture": "#accessories", - "uv": [1.5, 1.5, 3.0, 3.0] - }, - "south": { - "texture": "#accessories", - "uv": [4.0, 0.5, 4.5, 2.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.5, 1.0, 2.0, 2.5], - "enabled": false - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 1.0, 0.5, 2.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 1.5] - } - } - }, - { - "name": "handle 2", - "from": [1.5, 7.5, 3.5], - "to": [2.0, 8.0, 7.5], - "rotationOrigin": [2.0, 7.5, 3.5], - "faces": { - "north": { - "texture": "#accessories", - "uv": [2.5, 3.0, 3.0, 3.5] - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 3.0, 4.0, 3.5] - }, - "south": { - "texture": "#accessories", - "uv": [4.0, 2.5, 4.5, 3.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 3.0, 4.0, 3.5] - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 1.0, 4.0, 1.5], - "rotation": 90 - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 2.5, 4.0, 3.0], - "rotation": 90 - } - } - } - ] - }, - { - "name": "N", - "from": [-1.0, 0.0, -1.0], - "to": [13.0, 10.0, 0.0], - "rotationOrigin": [-2.0, -1.0, -2.0], - "faces": { - "north": { "texture": "#sides2", "uv": [0.0, 2.0, 14.0, 12.0] }, - "east": { "texture": "#sides2", "uv": [13.0, 2.0, 14.0, 12.0] }, - "south": { "texture": "#lid", "uv": [1.0, 2.0, 15.0, 12.0] }, - "west": { "texture": "#sides2", "uv": [0.0, 2.0, 1.0, 12.0] }, - "up": { - "texture": "#lid", - "uv": [2.0, 4.0, 16.0, 5.0], - "rotation": 180 - }, - "down": { "texture": "#sides2", "uv": [1.0, 4.0, 15.0, 5.0] } - }, - "children": [ - { - "name": "hinge 1", - "from": [2.5, 9.0, 0.8], - "to": [3.5, 11.0, 1.3], - "rotationOrigin": [3.0, 9.0, 1.1], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "south": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - } - } - }, - { - "name": "hinge 2", - "from": [10.5, 9.0, 0.8], - "to": [11.5, 11.0, 1.3], - "rotationOrigin": [11.0, 9.0, 1.1], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "south": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - } - } - } - ] - }, - { - "name": "feet 1", - "from": [-1.0, -1.0, -1.0], - "to": [1.0, 0.0, 1.0], - "rotationOrigin": [-1.0, -1.0, -1.0], - "faces": { - "north": { "texture": "#sides2", "uv": [0.0, 12.0, 2.0, 13.0] }, - "east": { "texture": "#sides2", "uv": [2.0, 12.0, 4.0, 13.0] }, - "south": { "texture": "#sides2", "uv": [2.5, 12.0, 4.5, 13.0] }, - "west": { "texture": "#sides2", "uv": [3.5, 12.0, 5.5, 13.0] }, - "up": { - "texture": "#sides2", - "uv": [0.0, 14.0, 2.0, 16.0], - "enabled": false - }, - "down": { "texture": "#sides2", "uv": [0.0, 14.0, 2.0, 16.0] } - }, - "children": [ - { - "name": "Cube14", - "from": [2.0, 0.5, 0.0], - "to": [3.5, 1.0, 1.0], - "rotationOrigin": [2.0, 0.5, 0.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [1.0, 12.0, 2.5, 12.5] - }, - "east": { - "texture": "#sides2", - "uv": [2.5, 12.0, 3.5, 12.5] - }, - "south": { - "texture": "#sides2", - "uv": [6.5, 12.0, 8.0, 12.5] - }, - "west": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.5, 1.0], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [6.0, 12.0, 7.5, 13.0] - } - } - }, - { - "name": "Cube15", - "from": [0.0, 0.5, 2.0], - "to": [1.0, 1.0, 3.5], - "rotationOrigin": [0.0, 0.5, 2.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "east": { - "texture": "#sides2", - "uv": [0.0, 12.0, 1.5, 12.5] - }, - "south": { - "texture": "#sides2", - "uv": [1.5, 12.0, 2.5, 12.5] - }, - "west": { - "texture": "#sides2", - "uv": [2.5, 12.0, 4.0, 12.5] - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 14.5, 1.0, 16.0], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [0.0, 14.5, 1.0, 16.0] - } - } - } - ] - }, - { - "name": "feet 16", - "from": [11.0, -1.0, -1.0], - "to": [13.0, 0.0, 1.0], - "rotationOrigin": [11.0, -1.0, -1.0], - "faces": { - "north": { "texture": "#sides2", "uv": [1.5, 12.0, 3.5, 13.0] }, - "east": { "texture": "#sides2", "uv": [6.0, 12.0, 8.0, 13.0] }, - "south": { - "texture": "#sides2", - "uv": [9.5, 12.0, 11.5, 13.0] - }, - "west": { - "texture": "#sides2", - "uv": [10.0, 12.0, 12.0, 13.0] - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 2.0, 2.0], - "enabled": false - }, - "down": { "texture": "#sides2", "uv": [0.0, 14.0, 2.0, 16.0] } - }, - "children": [ - { - "name": "Cube17", - "from": [-1.5, 0.5, 0.0], - "to": [0.0, 1.0, 1.0], - "rotationOrigin": [-1.5, 0.5, 0.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [2.5, 12.5, 4.0, 13.0] - }, - "east": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "south": { - "texture": "#sides2", - "uv": [8.5, 13.0, 10.0, 13.5] - }, - "west": { - "texture": "#sides2", - "uv": [10.0, 12.0, 11.0, 12.5] - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.5, 1.0], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [4.5, 12.0, 6.0, 13.0] - } - } - }, - { - "name": "Cube18", - "from": [1.0, 0.5, 2.0], - "to": [2.0, 1.0, 3.5], - "rotationOrigin": [1.0, 0.5, 2.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "east": { - "texture": "#sides2", - "uv": [4.5, 12.0, 6.0, 12.5] - }, - "south": { - "texture": "#sides2", - "uv": [14.5, 12.0, 15.5, 12.5] - }, - "west": { - "texture": "#sides2", - "uv": [3.0, 12.0, 4.5, 12.5] - }, - "up": { - "texture": "#sides2", - "uv": [0.5, 14.5, 2.0, 15.5], - "rotation": 90, - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [1.5, 15.0, 3.0, 16.0], - "rotation": 90 - } - } - } - ] - }, - { - "name": "feet 19", - "from": [11.0, -1.0, 10.0], - "to": [13.0, 0.0, 12.0], - "rotationOrigin": [11.0, -1.0, 10.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [8.5, 12.0, 10.5, 13.0] - }, - "east": { "texture": "#sides2", "uv": [6.0, 12.0, 8.0, 13.0] }, - "south": { "texture": "#sides2", "uv": [4.5, 12.0, 6.5, 13.0] }, - "west": { "texture": "#sides2", "uv": [6.0, 12.0, 8.0, 13.0] }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 2.0, 2.0], - "enabled": false - }, - "down": { "texture": "#sides2", "uv": [0.0, 14.0, 2.0, 16.0] } - }, - "children": [ - { - "name": "Cube20", - "from": [-1.5, 0.5, 1.0], - "to": [0.0, 1.0, 2.0], - "rotationOrigin": [-1.5, 0.5, 1.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [5.5, 12.0, 7.0, 12.5] - }, - "east": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "south": { - "texture": "#sides2", - "uv": [5.0, 12.0, 6.5, 12.5] - }, - "west": { - "texture": "#sides2", - "uv": [2.5, 12.0, 3.5, 12.5] - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.5, 1.0], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [0.0, 12.0, 1.5, 13.0] - } - } - }, - { - "name": "Cube21", - "from": [1.0, 0.5, -1.5], - "to": [2.0, 1.0, 0.0], - "rotationOrigin": [1.0, 0.5, -1.5], - "faces": { - "north": { - "texture": "#sides2", - "uv": [10.0, 12.0, 11.0, 12.5] - }, - "east": { - "texture": "#sides2", - "uv": [6.0, 12.0, 7.5, 12.5] - }, - "south": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "west": { - "texture": "#sides2", - "uv": [1.0, 12.0, 2.5, 12.5] - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 1.5], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [2.0, 12.0, 3.5, 13.0], - "rotation": 90 - } - } - } - ] - }, - { - "name": "feet 22", - "from": [-1.0, -1.0, 10.0], - "to": [1.0, 0.0, 12.0], - "rotationOrigin": [-1.0, -1.0, 10.0], - "faces": { - "north": { "texture": "#sides2", "uv": [5.5, 12.0, 7.5, 13.0] }, - "east": { "texture": "#sides2", "uv": [6.5, 12.0, 8.5, 13.0] }, - "south": { "texture": "#sides2", "uv": [4.0, 12.0, 6.0, 13.0] }, - "west": { "texture": "#sides2", "uv": [1.5, 12.0, 3.5, 13.0] }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 2.0, 2.0], - "enabled": false - }, - "down": { "texture": "#sides2", "uv": [0.0, 14.0, 2.0, 16.0] } - }, - "children": [ - { - "name": "Cube23", - "from": [2.0, 0.5, 1.0], - "to": [3.5, 1.0, 2.0], - "rotationOrigin": [2.0, 0.5, 1.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [6.0, 12.0, 7.5, 12.5] - }, - "east": { - "texture": "#sides2", - "uv": [0.5, 12.0, 1.5, 12.5] - }, - "south": { - "texture": "#sides2", - "uv": [9.0, 12.0, 10.5, 12.5] - }, - "west": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.5, 1.0], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [0.5, 12.0, 2.0, 13.0] - } - } - }, - { - "name": "Cube24", - "from": [0.0, 0.5, -1.5], - "to": [1.0, 1.0, 0.0], - "rotationOrigin": [0.0, 0.5, -1.5], - "faces": { - "north": { - "texture": "#sides2", - "uv": [4.5, 12.0, 5.5, 12.5] - }, - "east": { - "texture": "#sides2", - "uv": [4.5, 11.5, 6.0, 12.0] - }, - "south": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 0.5], - "enabled": false - }, - "west": { - "texture": "#sides2", - "uv": [3.5, 12.0, 5.0, 12.5] - }, - "up": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 1.5], - "enabled": false - }, - "down": { - "texture": "#sides2", - "uv": [2.0, 14.5, 3.5, 15.5], - "rotation": 90 - } - } - } - ] - } - ] - }, - { - "name": "lid", - "from": [2.0, 12.0, 2.0], - "to": [14.0, 13.0, 13.0], - "rotationOrigin": [8.0, 11.0, 1.0], - "faces": { - "north": { - "texture": "#lid", - "uv": [0.0, 0.0, 12.0, 1.0], - "enabled": false - }, - "east": { - "texture": "#lid", - "uv": [0.5, 0.0, 11.5, 1.0], - "enabled": false - }, - "south": { - "texture": "#lid", - "uv": [0.0, 0.0, 12.0, 1.0], - "enabled": false - }, - "west": { - "texture": "#lid", - "uv": [0.5, 0.0, 11.5, 1.0], - "enabled": false - }, - "up": { "texture": "#lid", "uv": [0.0, 0.0, 12.0, 11.0] }, - "down": { - "texture": "#lid", - "uv": [0.0, 0.0, 12.0, 11.0], - "rotation": 180 - } - }, - "children": [ - { - "name": "West", - "from": [-1.0, -1.0, 0.0], - "to": [0.0, 1.0, 11.0], - "rotationOrigin": [-1.0, -1.0, 0.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 2.0], - "enabled": false - }, - "east": { "texture": "#sides2", "uv": [1.0, 11.0, 12.0, 13.0] }, - "south": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 2.0], - "enabled": false - }, - "west": { "texture": "#sides2", "uv": [1.5, 0.0, 12.5, 2.0] }, - "up": { "texture": "#sides2", "uv": [0.0, 0.0, 1.0, 11.0] }, - "down": { - "texture": "#sides2", - "uv": [3.5, 12.5, 14.5, 13.5], - "rotation": 90 - } - } - }, - { - "name": "East", - "from": [12.0, -1.0, 0.0], - "to": [13.0, 1.0, 11.0], - "rotationOrigin": [12.0, -1.0, 0.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 2.0], - "enabled": false - }, - "east": { "texture": "#sides2", "uv": [1.5, 0.0, 12.5, 2.0] }, - "south": { - "texture": "#sides2", - "uv": [0.0, 0.0, 1.0, 2.0], - "enabled": false - }, - "west": { "texture": "#sides2", "uv": [3.0, 11.0, 14.0, 13.0] }, - "up": { "texture": "#sides2", "uv": [13.0, 0.0, 14.0, 11.0] }, - "down": { - "texture": "#sides2", - "uv": [2.5, 13.5, 13.5, 14.5], - "rotation": 90 - } - } - }, - { - "name": "North", - "from": [-1.0, -1.0, -1.0], - "to": [13.0, 1.0, 0.0], - "rotationOrigin": [-1.0, -1.0, -1.0], - "faces": { - "north": { "texture": "#sides2", "uv": [0.0, 0.0, 14.0, 2.0] }, - "east": { "texture": "#sides2", "uv": [13.0, 0.0, 14.0, 2.0] }, - "south": { - "texture": "#sides2", - "uv": [2.0, 11.0, 16.0, 13.0] - }, - "west": { "texture": "#sides2", "uv": [0.0, 0.0, 1.0, 2.0] }, - "up": { "texture": "#sides2", "uv": [0.0, 0.0, 14.0, 1.0] }, - "down": { "texture": "#sides2", "uv": [0.0, 14.5, 14.0, 15.5] } - }, - "children": [ - { - "name": "hinge 3", - "from": [2.5, -0.8, 1.0], - "to": [3.5, 1.2, 1.5], - "rotationOrigin": [3.0, -0.8, 1.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "south": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - } - } - }, - { - "name": "hinge 4", - "from": [10.5, -0.8, 1.0], - "to": [11.5, 1.2, 1.5], - "rotationOrigin": [11.0, -0.8, 1.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "south": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 2.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.0] - }, - "up": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 1.0, 0.5] - } - } - } - ] - }, - { - "name": "South", - "from": [-1.0, -1.0, 11.0], - "to": [13.0, 1.0, 12.0], - "rotationOrigin": [-1.0, -1.0, 11.0], - "faces": { - "north": { - "texture": "#sides2", - "uv": [0.5, 11.0, 14.5, 13.0] - }, - "east": { "texture": "#sides2", "uv": [0.0, 0.0, 1.0, 2.0] }, - "south": { "texture": "#sides2", "uv": [0.0, 0.0, 14.0, 2.0] }, - "west": { "texture": "#sides2", "uv": [13.0, 0.0, 14.0, 2.0] }, - "up": { "texture": "#sides2", "uv": [0.0, 0.0, 14.0, 1.0] }, - "down": { "texture": "#sides2", "uv": [0.5, 13.5, 14.5, 14.5] } - } - }, - { - "name": "Cube34", - "from": [4.5, -2.5, 12.0], - "to": [7.5, 0.0, 12.5], - "rotationOrigin": [4.5, -2.5, 12.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 0.0, 3.0, 2.5] - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.5] - }, - "south": { - "texture": "#accessories", - "uv": [9.0, 0.5, 12.0, 3.0] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 2.5] - }, - "up": { "texture": "#accessories", "uv": [0.0, 0.0, 3.0, 0.5] }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 3.0, 0.5] - } - } - }, - { - "name": "Cube35", - "from": [5.0, 0.0, 12.0], - "to": [7.0, 0.5, 12.5], - "rotationOrigin": [5.0, 0.0, 12.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 0.0, 2.0, 0.5], - "enabled": false - }, - "east": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 0.5] - }, - "south": { - "texture": "#accessories", - "uv": [9.5, 0.0, 11.5, 0.5] - }, - "west": { - "texture": "#accessories", - "uv": [0.0, 0.0, 0.5, 0.5] - }, - "up": { "texture": "#accessories", "uv": [0.0, 0.0, 2.0, 0.5] }, - "down": { - "texture": "#accessories", - "uv": [0.0, 0.0, 2.0, 0.5], - "enabled": false - } - } - } - ] - } - ] - }, - { - "name": "label", - "from": [3.0, 3.0, 14.0], - "to": [13.0, 9.0, 14.5], - "rotationOrigin": [3.0, 3.0, 14.0], - "faces": { - "north": { - "texture": "#accessories", - "uv": [0.0, 0.0, 10.0, 6.0], - "enabled": false - }, - "east": { "texture": "#accessories", "uv": [0.0, 10.0, 0.5, 16.0] }, - "south": { "texture": "#accessories", "uv": [0.0, 10.0, 10.0, 16.0] }, - "west": { "texture": "#accessories", "uv": [9.5, 10.0, 10.0, 16.0] }, - "up": { "texture": "#accessories", "uv": [0.0, 10.0, 10.0, 10.5] }, - "down": { "texture": "#accessories", "uv": [0.0, 10.0, 10.0, 10.5] } - } - } - ], - "animations": [ - { - "name": "lidopen", - "code": "lidopen", - "quantityframes": 30, - "onActivityStopped": "Rewind", - "onAnimationEnd": "Hold", - "keyframes": [ - { - "frame": 0, - "elements": { - "origin": {}, - "lid": { "rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0 } - } - }, - { - "frame": 29, - "elements": { - "origin": {}, - "lid": { "rotationX": -67.5, "rotationY": 0.0, "rotationZ": 0.0 } - } - } - ] - } - ] -} diff --git a/resources/assets/morevariants/blocktypes/metal/chandelier.json b/resources/assets/morevariants/blocktypes/metal/chandelier.json index 257b4a6..8884a96 100644 --- a/resources/assets/morevariants/blocktypes/metal/chandelier.json +++ b/resources/assets/morevariants/blocktypes/metal/chandelier.json @@ -45,7 +45,8 @@ ], "creativeinventory": { "general": ["*-candle0", "*-candle8"], - "decorative": ["*-candle0", "*-candle8"] + "decorative": ["*-candle0", "*-candle8"], + "morevariants": ["*-candle0", "*-candle8"] }, "textures": { "blackbronze": { "base": "block/metal/chandelier/{material}" }, diff --git a/resources/assets/morevariants/blocktypes/metal/door.json b/resources/assets/morevariants/blocktypes/metal/door.json index ea263ec..2867f2d 100644 --- a/resources/assets/morevariants/blocktypes/metal/door.json +++ b/resources/assets/morevariants/blocktypes/metal/door.json @@ -14,54 +14,177 @@ } } }, - "variantgroups": [{ "code": "metal", "states": ["iron", "copper", "tinbronze", "bismuthbronze", "blackbronze", "silver", "gold", "steel", "brass", "bismuth", "tin", "molybdochalkos", "cursed"] }, { "loadFromProperties": "game:abstract/horizontalorientation" }, { "code": "part", "states": ["down", "up"] }, { "code": "state", "states": ["closed", "opened"] }, { "code": "knobOrientation", "states": ["left", "right"] }], + "variantgroups": [ + { + "code": "metal", + "states": [ + "iron", + "copper", + "tinbronze", + "bismuthbronze", + "blackbronze", + "silver", + "gold", + "steel", + "brass", + "bismuth", + "tin", + "molybdochalkos", + "cursed" + ] + }, + { "loadFromProperties": "game:abstract/horizontalorientation" }, + { "code": "part", "states": ["down", "up"] }, + { "code": "state", "states": ["closed", "opened"] }, + { "code": "knobOrientation", "states": ["left", "right"] } + ], "textures": { "bottom-right": { "base": "block/metal/door/{metal}/bottom-right" }, "sides": { "base": "block/metal/door/{metal}/sides" }, "top-right": { "base": "block/metal/door/{metal}/top-right" } }, - "creativeinventory": { "general": ["metaldoor-*-north-down-closed-left"], "decorative": ["metaldoor-*-north-down-closed-left"] }, + "creativeinventory": { + "general": ["metaldoor-*-north-down-closed-left"], + "decorative": ["metaldoor-*-north-down-closed-left"], + "morevariants": ["metaldoor-*-north-down-closed-left"] + }, "shapeinventory": { "base": "game:block/metal/iron/door/inventory" }, "shapebytype": { - "*-north-down-closed-left": { "base": "game:block/metal/iron/door/down_closed_left", "rotateY": 90 }, - "*-north-up-closed-left": { "base": "game:block/metal/iron/door/up_closed_left", "rotateY": 90 }, - "*-north-down-opened-left": { "base": "game:block/metal/iron/door/down_opened_left", "rotateY": 90 }, - "*-north-up-opened-left": { "base": "game:block/metal/iron/door/up_opened_left", "rotateY": 90 }, + "*-north-down-closed-left": { + "base": "game:block/metal/iron/door/down_closed_left", + "rotateY": 90 + }, + "*-north-up-closed-left": { + "base": "game:block/metal/iron/door/up_closed_left", + "rotateY": 90 + }, + "*-north-down-opened-left": { + "base": "game:block/metal/iron/door/down_opened_left", + "rotateY": 90 + }, + "*-north-up-opened-left": { + "base": "game:block/metal/iron/door/up_opened_left", + "rotateY": 90 + }, - "*-east-down-closed-left": { "base": "game:block/metal/iron/door/down_closed_left", "rotateY": 0 }, - "*-east-up-closed-left": { "base": "game:block/metal/iron/door/up_closed_left", "rotateY": 0 }, - "*-east-down-opened-left": { "base": "game:block/metal/iron/door/down_opened_left", "rotateY": 0 }, - "*-east-up-opened-left": { "base": "game:block/metal/iron/door/up_opened_left", "rotateY": 0 }, + "*-east-down-closed-left": { + "base": "game:block/metal/iron/door/down_closed_left", + "rotateY": 0 + }, + "*-east-up-closed-left": { + "base": "game:block/metal/iron/door/up_closed_left", + "rotateY": 0 + }, + "*-east-down-opened-left": { + "base": "game:block/metal/iron/door/down_opened_left", + "rotateY": 0 + }, + "*-east-up-opened-left": { + "base": "game:block/metal/iron/door/up_opened_left", + "rotateY": 0 + }, - "*-south-down-closed-left": { "base": "game:block/metal/iron/door/down_closed_left", "rotateY": 270 }, - "*-south-up-closed-left": { "base": "game:block/metal/iron/door/up_closed_left", "rotateY": 270 }, - "*-south-down-opened-left": { "base": "game:block/metal/iron/door/down_opened_left", "rotateY": 270 }, - "*-south-up-opened-left": { "base": "game:block/metal/iron/door/up_opened_left", "rotateY": 270 }, + "*-south-down-closed-left": { + "base": "game:block/metal/iron/door/down_closed_left", + "rotateY": 270 + }, + "*-south-up-closed-left": { + "base": "game:block/metal/iron/door/up_closed_left", + "rotateY": 270 + }, + "*-south-down-opened-left": { + "base": "game:block/metal/iron/door/down_opened_left", + "rotateY": 270 + }, + "*-south-up-opened-left": { + "base": "game:block/metal/iron/door/up_opened_left", + "rotateY": 270 + }, - "*-west-down-closed-left": { "base": "game:block/metal/iron/door/down_closed_left", "rotateY": 180 }, - "*-west-up-closed-left": { "base": "game:block/metal/iron/door/up_closed_left", "rotateY": 180 }, - "*-west-down-opened-left": { "base": "game:block/metal/iron/door/down_opened_left", "rotateY": 180 }, - "*-west-up-opened-left": { "base": "game:block/metal/iron/door/up_opened_left", "rotateY": 180 }, + "*-west-down-closed-left": { + "base": "game:block/metal/iron/door/down_closed_left", + "rotateY": 180 + }, + "*-west-up-closed-left": { + "base": "game:block/metal/iron/door/up_closed_left", + "rotateY": 180 + }, + "*-west-down-opened-left": { + "base": "game:block/metal/iron/door/down_opened_left", + "rotateY": 180 + }, + "*-west-up-opened-left": { + "base": "game:block/metal/iron/door/up_opened_left", + "rotateY": 180 + }, - "*-north-down-closed-right": { "base": "game:block/metal/iron/door/down_closed_right", "rotateY": 90 }, - "*-north-up-closed-right": { "base": "game:block/metal/iron/door/up_closed_right", "rotateY": 90 }, - "*-north-down-opened-right": { "base": "game:block/metal/iron/door/down_opened_right", "rotateY": 90 }, - "*-north-up-opened-right": { "base": "game:block/metal/iron/door/up_opened_right", "rotateY": 90 }, + "*-north-down-closed-right": { + "base": "game:block/metal/iron/door/down_closed_right", + "rotateY": 90 + }, + "*-north-up-closed-right": { + "base": "game:block/metal/iron/door/up_closed_right", + "rotateY": 90 + }, + "*-north-down-opened-right": { + "base": "game:block/metal/iron/door/down_opened_right", + "rotateY": 90 + }, + "*-north-up-opened-right": { + "base": "game:block/metal/iron/door/up_opened_right", + "rotateY": 90 + }, - "*-east-down-closed-right": { "base": "game:block/metal/iron/door/down_closed_right", "rotateY": 0 }, - "*-east-up-closed-right": { "base": "game:block/metal/iron/door/up_closed_right", "rotateY": 0 }, - "*-east-down-opened-right": { "base": "game:block/metal/iron/door/down_opened_right", "rotateY": 0 }, - "*-east-up-opened-right": { "base": "game:block/metal/iron/door/up_opened_right", "rotateY": 0 }, + "*-east-down-closed-right": { + "base": "game:block/metal/iron/door/down_closed_right", + "rotateY": 0 + }, + "*-east-up-closed-right": { + "base": "game:block/metal/iron/door/up_closed_right", + "rotateY": 0 + }, + "*-east-down-opened-right": { + "base": "game:block/metal/iron/door/down_opened_right", + "rotateY": 0 + }, + "*-east-up-opened-right": { + "base": "game:block/metal/iron/door/up_opened_right", + "rotateY": 0 + }, - "*-south-down-closed-right": { "base": "game:block/metal/iron/door/down_closed_right", "rotateY": 270 }, - "*-south-up-closed-right": { "base": "game:block/metal/iron/door/up_closed_right", "rotateY": 270 }, - "*-south-down-opened-right": { "base": "game:block/metal/iron/door/down_opened_right", "rotateY": 270 }, - "*-south-up-opened-right": { "base": "game:block/metal/iron/door/up_opened_right", "rotateY": 270 }, + "*-south-down-closed-right": { + "base": "game:block/metal/iron/door/down_closed_right", + "rotateY": 270 + }, + "*-south-up-closed-right": { + "base": "game:block/metal/iron/door/up_closed_right", + "rotateY": 270 + }, + "*-south-down-opened-right": { + "base": "game:block/metal/iron/door/down_opened_right", + "rotateY": 270 + }, + "*-south-up-opened-right": { + "base": "game:block/metal/iron/door/up_opened_right", + "rotateY": 270 + }, - "*-west-down-closed-right": { "base": "game:block/metal/iron/door/down_closed_right", "rotateY": 180 }, - "*-west-up-closed-right": { "base": "game:block/metal/iron/door/up_closed_right", "rotateY": 180 }, - "*-west-down-opened-right": { "base": "game:block/metal/iron/door/down_opened_right", "rotateY": 180 }, - "*-west-up-opened-right": { "base": "game:block/metal/iron/door/up_opened_right", "rotateY": 180 } + "*-west-down-closed-right": { + "base": "game:block/metal/iron/door/down_closed_right", + "rotateY": 180 + }, + "*-west-up-closed-right": { + "base": "game:block/metal/iron/door/up_closed_right", + "rotateY": 180 + }, + "*-west-down-opened-right": { + "base": "game:block/metal/iron/door/down_opened_right", + "rotateY": 180 + }, + "*-west-up-opened-right": { + "base": "game:block/metal/iron/door/up_opened_right", + "rotateY": 180 + } }, "blockmaterial": "Metal", "replaceable": 500, diff --git a/resources/assets/morevariants/blocktypes/metal/fence.json b/resources/assets/morevariants/blocktypes/metal/fence.json index bc62f2d..c92f698 100644 --- a/resources/assets/morevariants/blocktypes/metal/fence.json +++ b/resources/assets/morevariants/blocktypes/metal/fence.json @@ -48,7 +48,7 @@ ], "attributes": { "handbook": { - "groupBy": ["metalfence-*"] + "groupBy": ["metalfence-*-base-ew", "metalfence-*-top-ew"] } }, "textures": { @@ -58,7 +58,8 @@ }, "creativeinventory": { "general": ["metalfence-*-base-ew", "metalfence-*-top-ew"], - "decorative": ["metalfence-*-base-ew", "metalfence-*-top-ew"] + "decorative": ["metalfence-*-base-ew", "metalfence-*-top-ew"], + "morevariants": ["metalfence-*-base-ew", "metalfence-*-top-ew"] }, "shapebytype": { "*-empty": { "base": "game:block/metal/fence/base/empty" }, diff --git a/resources/assets/morevariants/blocktypes/metal/sheet/block.json b/resources/assets/morevariants/blocktypes/metal/sheet/block.json index 2eb3ed9..a036487 100644 --- a/resources/assets/morevariants/blocktypes/metal/sheet/block.json +++ b/resources/assets/morevariants/blocktypes/metal/sheet/block.json @@ -1,6 +1,12 @@ { "code": "metalsheet", - "variantgroups": [{ "code": "metal", "states": ["cursed"], "loadFromProperties": "game:block/metal" }], + "variantgroups": [ + { + "code": "metal", + "states": ["cursed"], + "loadFromProperties": "game:block/metal" + } + ], "attributes": { "handbook": { "groupBy": ["sheetmetal-*"], @@ -15,7 +21,11 @@ } } }, - "creativeinventory": { "general": ["*"], "construction": ["*"] }, + "creativeinventory": { + "general": ["*"], + "construction": ["*"], + "morevariants": ["*"] + }, "shape": { "base": "game:block/basic/cube" }, "drawtype": "cube", "blockmaterial": "Metal", @@ -23,13 +33,23 @@ "*-cursed": { "all": { "base": "block/metal/sheet/{metal}1", - "alternates": [{ "base": "block/metal/sheet/{metal}2" }, { "base": "block/metal/sheet/{metal}3" }, { "base": "block/metal/sheet/{metal}4" }, { "base": "block/metal/sheet/{metal}5" }] + "alternates": [ + { "base": "block/metal/sheet/{metal}2" }, + { "base": "block/metal/sheet/{metal}3" }, + { "base": "block/metal/sheet/{metal}4" }, + { "base": "block/metal/sheet/{metal}5" } + ] } }, "*": { "all": { "base": "game:block/metal/sheet/{metal}1", - "alternates": [{ "base": "game:block/metal/sheet/{metal}2" }, { "base": "game:block/metal/sheet/{metal}3" }, { "base": "game:block/metal/sheet/{metal}4" }, { "base": "game:block/metal/sheet/{metal}5" }] + "alternates": [ + { "base": "game:block/metal/sheet/{metal}2" }, + { "base": "game:block/metal/sheet/{metal}3" }, + { "base": "game:block/metal/sheet/{metal}4" }, + { "base": "game:block/metal/sheet/{metal}5" } + ] } } }, @@ -40,7 +60,10 @@ "walk": "game:walk/stone", "hit": "game:block/anvil", "byTool": { - "Pickaxe": { "hit": "game:block/rock-hit-pickaxe", "break": "game:block/rock-break-pickaxe" } + "Pickaxe": { + "hit": "game:block/rock-hit-pickaxe", + "break": "game:block/rock-break-pickaxe" + } } }, "heldTpIdleAnimation": "holdbothhandslarge", diff --git a/resources/assets/morevariants/blocktypes/metal/sheet/slab.json b/resources/assets/morevariants/blocktypes/metal/sheet/slab.json index af35a54..50a96f1 100644 --- a/resources/assets/morevariants/blocktypes/metal/sheet/slab.json +++ b/resources/assets/morevariants/blocktypes/metal/sheet/slab.json @@ -12,8 +12,15 @@ } ], "variantgroups": [ - { "code": "metal", "states": ["cursed"], "loadFromProperties": "game:block/metal" }, - { "code": "rot", "states": ["north", "east", "south", "west", "up", "down"] }, + { + "code": "metal", + "states": ["cursed"], + "loadFromProperties": "game:block/metal" + }, + { + "code": "rot", + "states": ["north", "east", "south", "west", "up", "down"] + }, { "code": "cover", "states": ["free", "snow"] } ], "skipVariants": ["morevariants:*-up-snow"], @@ -39,7 +46,11 @@ }, "replaceable": 200, "resistance": 4, - "creativeinventory": { "general": ["*-down-free"], "construction": ["*-down-free"] }, + "creativeinventory": { + "general": ["*-down-free"], + "construction": ["*-down-free"], + "morevariants": ["*-down-free"] + }, "drops": [{ "code": "metalsheetslab-{metal}-down-free" }], "shapeByType": { "*-snow": { "base": "game:block/basic/slab/snow-slab-{rot}" }, @@ -49,13 +60,23 @@ "*-cursed-*": { "all": { "base": "block/metal/sheet/{metal}1", - "alternates": [{ "base": "block/metal/sheet/{metal}2" }, { "base": "block/metal/sheet/{metal}3" }, { "base": "block/metal/sheet/{metal}4" }, { "base": "block/metal/sheet/{metal}5" }] + "alternates": [ + { "base": "block/metal/sheet/{metal}2" }, + { "base": "block/metal/sheet/{metal}3" }, + { "base": "block/metal/sheet/{metal}4" }, + { "base": "block/metal/sheet/{metal}5" } + ] } }, "*": { "all": { "base": "game:block/metal/sheet/{metal}1", - "alternates": [{ "base": "game:block/metal/sheet/{metal}2" }, { "base": "game:block/metal/sheet/{metal}3" }, { "base": "game:block/metal/sheet/{metal}4" }, { "base": "game:block/metal/sheet/{metal}5" }] + "alternates": [ + { "base": "game:block/metal/sheet/{metal}2" }, + { "base": "game:block/metal/sheet/{metal}3" }, + { "base": "game:block/metal/sheet/{metal}4" }, + { "base": "game:block/metal/sheet/{metal}5" } + ] } } }, @@ -112,7 +133,10 @@ "walk": "game:walk/stone", "hit": "game:block/anvil", "byTool": { - "Pickaxe": { "hit": "game:block/rock-hit-pickaxe", "break": "game:block/rock-break-pickaxe" } + "Pickaxe": { + "hit": "game:block/rock-hit-pickaxe", + "break": "game:block/rock-break-pickaxe" + } } }, "guiTransform": { diff --git a/resources/assets/morevariants/blocktypes/metal/sheet/stairs.json b/resources/assets/morevariants/blocktypes/metal/sheet/stairs.json index 52c6000..55c12db 100644 --- a/resources/assets/morevariants/blocktypes/metal/sheet/stairs.json +++ b/resources/assets/morevariants/blocktypes/metal/sheet/stairs.json @@ -1,8 +1,22 @@ { "code": "metalsheetstairs", "class": "BlockStairs", - "variantgroups": [{ "code": "metal", "states": ["cursed"], "loadFromProperties": "game:block/metal" }, { "loadFromProperties": "game:abstract/verticalorientation" }, { "loadFromProperties": "game:abstract/horizontalorientation" }, { "code": "cover", "states": ["free", "snow"] }], - "skipVariants": ["morevariants:*-down-north-snow", "morevariants:*-down-east-snow", "morevariants:*-down-south-snow", "morevariants:*-down-west-snow"], + "variantgroups": [ + { + "code": "metal", + "states": ["cursed"], + "loadFromProperties": "game:block/metal" + }, + { "loadFromProperties": "game:abstract/verticalorientation" }, + { "loadFromProperties": "game:abstract/horizontalorientation" }, + { "code": "cover", "states": ["free", "snow"] } + ], + "skipVariants": [ + "morevariants:*-down-north-snow", + "morevariants:*-down-east-snow", + "morevariants:*-down-south-snow", + "morevariants:*-down-west-snow" + ], "attributes": { "canChisel": true, "chiselShapeFromCollisionBox": true, @@ -20,7 +34,11 @@ } } }, - "creativeinventory": { "general": ["*-up-north-free"], "construction": ["*-up-north-free"] }, + "creativeinventory": { + "general": ["*-up-north-free"], + "construction": ["*-up-north-free"], + "morevariants": ["*-up-north-free"] + }, "sidesolidByType": { "*-up-north-*": { "all": false, "down": true, "north": true }, "*-up-west-*": { "all": false, "down": true, "west": true }, @@ -42,31 +60,77 @@ "*-down-east-*": { "all": false, "up": true, "east": true } }, "shapebytype": { - "*-up-north-free": { "base": "game:block/basic/stairs/normal", "rotateY": 0 }, - "*-up-west-free": { "base": "game:block/basic/stairs/normal", "rotateY": 90 }, - "*-up-south-free": { "base": "game:block/basic/stairs/normal", "rotateY": 180 }, - "*-up-east-free": { "base": "game:block/basic/stairs/normal", "rotateY": 270 }, - "*-up-north-snow": { "base": "game:block/basic/stairs/snow-normal", "rotateY": 0 }, - "*-up-west-snow": { "base": "game:block/basic/stairs/snow-normal", "rotateY": 90 }, - "*-up-south-snow": { "base": "game:block/basic/stairs/snow-normal", "rotateY": 180 }, - "*-up-east-snow": { "base": "game:block/basic/stairs/snow-normal", "rotateY": 270 }, - "*-down-north-free": { "base": "game:block/basic/stairs/flipped", "rotateY": 0 }, - "*-down-west-free": { "base": "game:block/basic/stairs/flipped", "rotateY": 90 }, - "*-down-south-free": { "base": "game:block/basic/stairs/flipped", "rotateY": 180 }, - "*-down-east-free": { "base": "game:block/basic/stairs/flipped", "rotateY": 270 } + "*-up-north-free": { + "base": "game:block/basic/stairs/normal", + "rotateY": 0 + }, + "*-up-west-free": { + "base": "game:block/basic/stairs/normal", + "rotateY": 90 + }, + "*-up-south-free": { + "base": "game:block/basic/stairs/normal", + "rotateY": 180 + }, + "*-up-east-free": { + "base": "game:block/basic/stairs/normal", + "rotateY": 270 + }, + "*-up-north-snow": { + "base": "game:block/basic/stairs/snow-normal", + "rotateY": 0 + }, + "*-up-west-snow": { + "base": "game:block/basic/stairs/snow-normal", + "rotateY": 90 + }, + "*-up-south-snow": { + "base": "game:block/basic/stairs/snow-normal", + "rotateY": 180 + }, + "*-up-east-snow": { + "base": "game:block/basic/stairs/snow-normal", + "rotateY": 270 + }, + "*-down-north-free": { + "base": "game:block/basic/stairs/flipped", + "rotateY": 0 + }, + "*-down-west-free": { + "base": "game:block/basic/stairs/flipped", + "rotateY": 90 + }, + "*-down-south-free": { + "base": "game:block/basic/stairs/flipped", + "rotateY": 180 + }, + "*-down-east-free": { + "base": "game:block/basic/stairs/flipped", + "rotateY": 270 + } }, "blockmaterial": "Metal", "texturesByType": { "*-cursed-*": { "all": { "base": "block/metal/sheet/{metal}1", - "alternates": [{ "base": "block/metal/sheet/{metal}2" }, { "base": "block/metal/sheet/{metal}3" }, { "base": "block/metal/sheet/{metal}4" }, { "base": "block/metal/sheet/{metal}5" }] + "alternates": [ + { "base": "block/metal/sheet/{metal}2" }, + { "base": "block/metal/sheet/{metal}3" }, + { "base": "block/metal/sheet/{metal}4" }, + { "base": "block/metal/sheet/{metal}5" } + ] } }, "*": { "all": { "base": "game:block/metal/sheet/{metal}1", - "alternates": [{ "base": "game:block/metal/sheet/{metal}2" }, { "base": "game:block/metal/sheet/{metal}3" }, { "base": "game:block/metal/sheet/{metal}4" }, { "base": "game:block/metal/sheet/{metal}5" }] + "alternates": [ + { "base": "game:block/metal/sheet/{metal}2" }, + { "base": "game:block/metal/sheet/{metal}3" }, + { "base": "game:block/metal/sheet/{metal}4" }, + { "base": "game:block/metal/sheet/{metal}5" } + ] } } }, @@ -77,7 +141,10 @@ "walk": "game:walk/stone", "hit": "game:block/anvil", "byTool": { - "Pickaxe": { "hit": "game:block/rock-hit-pickaxe", "break": "game:block/rock-break-pickaxe" } + "Pickaxe": { + "hit": "game:block/rock-hit-pickaxe", + "break": "game:block/rock-break-pickaxe" + } } }, "collisionSelectionBoxesByType": { diff --git a/resources/assets/morevariants/blocktypes/metal/torchholder.json b/resources/assets/morevariants/blocktypes/metal/torchholder.json index 811d7cc..08b8c35 100644 --- a/resources/assets/morevariants/blocktypes/metal/torchholder.json +++ b/resources/assets/morevariants/blocktypes/metal/torchholder.json @@ -6,7 +6,7 @@ ], "attributes": { "handbook": { - "groupBy": ["torchholder-*"], + "groupBy": ["torchholder-*-empty-north"], "exclude": true } }, @@ -54,7 +54,8 @@ }, "creativeinventory": { "general": ["*-empty-north"], - "decorative": ["*-empty-north"] + "decorative": ["*-empty-north"], + "morevariants": ["*-empty-north"] }, "replaceable": 5001, "resistance": 0.5, diff --git a/resources/assets/morevariants/blocktypes/stone/forge.json b/resources/assets/morevariants/blocktypes/stone/forge.json index daac4bc..5048444 100644 --- a/resources/assets/morevariants/blocktypes/stone/forge.json +++ b/resources/assets/morevariants/blocktypes/stone/forge.json @@ -12,7 +12,11 @@ "skipVariants": ["morevariants:forge-granite"], "blockmaterial": "Stone", "renderpass": "OpaqueNoCull", - "creativeinventory": { "general": ["*"], "decorative": ["*"] }, + "creativeinventory": { + "general": ["*"], + "decorative": ["*"], + "morevariants": ["*"] + }, "replaceable": 500, "lightAbsorption": 0, "resistance": 3.5, diff --git a/resources/assets/morevariants/blocktypes/wood/barrel.json b/resources/assets/morevariants/blocktypes/wood/barrel.json index cbee4bf..da3d9e3 100644 --- a/resources/assets/morevariants/blocktypes/wood/barrel.json +++ b/resources/assets/morevariants/blocktypes/wood/barrel.json @@ -12,12 +12,16 @@ "shape": { "base": "game:block/wood/barrel/empty" }, "attributes": { "handbook": { - "groupBy": ["game:barrel", "barrel-*"] + "groupBy": ["barrel-*"] }, "partialAttachable": true, "capacityLitres": 50 }, - "creativeinventory": { "general": ["*"], "decorative": ["*"] }, + "creativeinventory": { + "general": ["*"], + "decorative": ["*"], + "morevariants": ["*"] + }, "blockmaterial": "Wood", "replaceable": 900, "resistance": 1.5, diff --git a/resources/assets/morevariants/blocktypes/wood/bed.json b/resources/assets/morevariants/blocktypes/wood/bed.json index 25714a7..206eade 100644 --- a/resources/assets/morevariants/blocktypes/wood/bed.json +++ b/resources/assets/morevariants/blocktypes/wood/bed.json @@ -20,11 +20,18 @@ }, "heldTpIdleAnimation": "holdunderarm", "variantgroups": [ - { "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] }, + { + "code": "type", + "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] + }, { "code": "part", "states": ["head", "feet"] }, { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } ], - "creativeinventory": { "general": ["*-head-north"], "decorative": ["*-head-north"] }, + "creativeinventory": { + "general": ["*-head-north"], + "decorative": ["*-head-north"], + "morevariants": ["*-head-north"] + }, "shapeinventory": { "base": "game:block/wood/bed-inventory" }, "shapebytype": { "*-head-north": { "base": "game:block/wood/bed-head", "rotateY": 90 }, diff --git a/resources/assets/morevariants/blocktypes/wood/chair.json b/resources/assets/morevariants/blocktypes/wood/chair.json index bd265c2..ffeb58d 100644 --- a/resources/assets/morevariants/blocktypes/wood/chair.json +++ b/resources/assets/morevariants/blocktypes/wood/chair.json @@ -5,10 +5,16 @@ "groupBy": ["chair-*"] } }, - "variantgroups": [{ "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok"] }], + "variantgroups": [ + { "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok"] } + ], "shape": { "base": "game:block/wood/chair-normal" }, "heldTpIdleAnimation": "holdunderarm", - "creativeinventory": { "general": ["*"], "decorative": ["*"] }, + "creativeinventory": { + "general": ["*"], + "decorative": ["*"], + "morevariants": ["*"] + }, "blockmaterial": "Wood", "replaceable": 900, "resistance": 1.5, @@ -36,8 +42,22 @@ "3": { "base": "block/wood/chair/{type}/legs" } }, "materialDensity": 400, - "selectionbox": { "x1": 0.0625, "y1": 0, "z1": 0.0625, "x2": 0.9375, "y2": 0.5, "z2": 0.9375 }, - "collisionbox": { "x1": 0.0625, "y1": 0, "z1": 0.0625, "x2": 0.9375, "y2": 0.5, "z2": 0.9375 }, + "selectionbox": { + "x1": 0.0625, + "y1": 0, + "z1": 0.0625, + "x2": 0.9375, + "y2": 0.5, + "z2": 0.9375 + }, + "collisionbox": { + "x1": 0.0625, + "y1": 0, + "z1": 0.0625, + "x2": 0.9375, + "y2": 0.5, + "z2": 0.9375 + }, "guiTransform": { "translation": { "x": 0, "y": 2, "z": 0 }, "origin": { "x": 0.5, "y": 0.25, "z": 0.5 } diff --git a/resources/assets/morevariants/blocktypes/wood/chest.json b/resources/assets/morevariants/blocktypes/wood/chest.json index 444360d..1a17407 100644 --- a/resources/assets/morevariants/blocktypes/wood/chest.json +++ b/resources/assets/morevariants/blocktypes/wood/chest.json @@ -2,10 +2,9 @@ "code": "chest", "class": "BlockGenericTypedContainer", "entityclass": "GenericTypedContainer", + "behaviors": [{ "name": "Lockable" }, { "name": "Container" }], + "entityBehaviors": [{ "name": "Animatable" }], "attributes": { - "handbook": { - "groupBy": ["chest-*"] - }, "partialAttachable": true, "inventoryClassName": "chest", "defaultType": "normal-generic", @@ -31,58 +30,55 @@ "shape": { "normal-generic": "game:block/wood/chest/normal" }, + "variantByGroup": "variant", + "variantByGroupInventory": "variant", "openSound": "game:sounds/block/largechestopen", - "closeSound": "game:sounds/block/largechestclose", - "variantByGroup": "side", - "variantByGroupInventory": null + "closeSound": "game:sounds/block/largechestclose" }, - "behaviors": [{ "name": "Lockable" }, { "name": "Container" }], - "entityBehaviors": [{ "name": "Animatable" }], "variantgroups": [ { "code": "variant", "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] - }, - { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } + } ], - "creativeinventory": {}, - "creativeinventoryStacksByType": { - "*-east": [ - { - "tabs": ["general", "decorative"], - "stacks": [ - { - "type": "block", - "code": "chest-{variant}-east", - "attributes": { "type": "normal-generic" } - } - ] - } - ] - }, - "heldTpIdleAnimation": "holdunderarm", "shapeInventory": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "shapeByType": { - "*-north": { "base": "game:block/wood/chest/normal", "rotateY": 0 }, - "*-east": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "*-west": { "base": "game:block/wood/chest/normal", "rotateY": 90 }, - "*-south": { "base": "game:block/wood/chest/normal", "rotateY": 180 } - }, - "_comment": "Must declare textures so they get added to the block texture atlas", + "shape": { "base": "game:block/wood/chest/normal" }, "textures": { - "normal-generic-sides2": { "base": "block/wood/trunk/{variant}/sides" }, - "normal-generic-lid": { "base": "block/wood/trunk/{variant}/lid" }, "normal-generic-accessories": { - "base": "block/wood/trunk/{variant}/accessories" + "base": "morevariants:block/wood/trunk/accessories" + }, + "normal-generic-lid": { + "base": "morevariants:block/wood/trunk/lid/{variant}" + }, + "normal-generic-sides2": { + "base": "morevariants:block/wood/trunk/sides/{variant}" } }, + "creativeinventory": {}, + "creativeinventoryStacks": [ + { + "tabs": ["general", "decorative", "morevariants"], + "stacks": [ + { + "type": "block", + "code": "chest-{variant}", + "attributes": { "type": "normal-generic" } + } + ] + } + ], + "heldTpIdleAnimation": "holdunderarm", "blockmaterial": "Wood", "replaceable": 900, "resistance": 3, "lightAbsorption": 0, "sideAo": { "all": false }, - "sidesolid": { "all": false }, - "sideopaque": { "all": false }, + "sidesolid": { + "all": false + }, + "sideopaque": { + "all": false + }, "collisionbox": { "x1": 0.0625, "y1": 0, diff --git a/resources/assets/morevariants/blocktypes/wood/door.json b/resources/assets/morevariants/blocktypes/wood/door.json index 3fe149a..c824fb3 100644 --- a/resources/assets/morevariants/blocktypes/wood/door.json +++ b/resources/assets/morevariants/blocktypes/wood/door.json @@ -9,55 +9,164 @@ "groupBy": ["woodendoor-*"] } }, - "variantgroups": [{ "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] }, { "loadFromProperties": "abstract/horizontalorientation" }, { "code": "part", "states": ["down", "up"] }, { "code": "state", "states": ["closed", "opened"] }, { "code": "knobOrientation", "states": ["left", "right"] }], + "variantgroups": [ + { + "code": "type", + "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] + }, + { "loadFromProperties": "abstract/horizontalorientation" }, + { "code": "part", "states": ["down", "up"] }, + { "code": "state", "states": ["closed", "opened"] }, + { "code": "knobOrientation", "states": ["left", "right"] } + ], "textures": { "bottom_left": { "base": "block/wood/door/{type}/bottom_left" }, "bottom_right": { "base": "block/wood/door/{type}/bottom_right" }, "top_left": { "base": "block/wood/door/{type}/top_left" }, "top_right": { "base": "block/wood/door/{type}/top_right" } }, - "creativeinventory": { "general": ["woodendoor-{type}-north-down-closed-left"], "decorative": ["woodendoor-{type}-north-down-closed-left"] }, + "creativeinventory": { + "general": ["woodendoor-{type}-north-down-closed-left"], + "decorative": ["woodendoor-{type}-north-down-closed-left"], + "morevariants": ["woodendoor-{type}-north-down-closed-left"] + }, "shapeinventory": { "base": "block/wood/door/inventory" }, "shapebytype": { - "*-north-down-closed-left": { "base": "block/wood/door/down_closed_left", "rotateY": 90 }, - "*-north-up-closed-left": { "base": "block/wood/door/up_closed_left", "rotateY": 90 }, - "*-north-down-opened-left": { "base": "block/wood/door/down_opened_left", "rotateY": 90 }, - "*-north-up-opened-left": { "base": "block/wood/door/up_opened_left", "rotateY": 90 }, + "*-north-down-closed-left": { + "base": "block/wood/door/down_closed_left", + "rotateY": 90 + }, + "*-north-up-closed-left": { + "base": "block/wood/door/up_closed_left", + "rotateY": 90 + }, + "*-north-down-opened-left": { + "base": "block/wood/door/down_opened_left", + "rotateY": 90 + }, + "*-north-up-opened-left": { + "base": "block/wood/door/up_opened_left", + "rotateY": 90 + }, - "*-east-down-closed-left": { "base": "block/wood/door/down_closed_left", "rotateY": 0 }, - "*-east-up-closed-left": { "base": "block/wood/door/up_closed_left", "rotateY": 0 }, - "*-east-down-opened-left": { "base": "block/wood/door/down_opened_left", "rotateY": 0 }, - "*-east-up-opened-left": { "base": "block/wood/door/up_opened_left", "rotateY": 0 }, + "*-east-down-closed-left": { + "base": "block/wood/door/down_closed_left", + "rotateY": 0 + }, + "*-east-up-closed-left": { + "base": "block/wood/door/up_closed_left", + "rotateY": 0 + }, + "*-east-down-opened-left": { + "base": "block/wood/door/down_opened_left", + "rotateY": 0 + }, + "*-east-up-opened-left": { + "base": "block/wood/door/up_opened_left", + "rotateY": 0 + }, - "*-south-down-closed-left": { "base": "block/wood/door/down_closed_left", "rotateY": 270 }, - "*-south-up-closed-left": { "base": "block/wood/door/up_closed_left", "rotateY": 270 }, - "*-south-down-opened-left": { "base": "block/wood/door/down_opened_left", "rotateY": 270 }, - "*-south-up-opened-left": { "base": "block/wood/door/up_opened_left", "rotateY": 270 }, + "*-south-down-closed-left": { + "base": "block/wood/door/down_closed_left", + "rotateY": 270 + }, + "*-south-up-closed-left": { + "base": "block/wood/door/up_closed_left", + "rotateY": 270 + }, + "*-south-down-opened-left": { + "base": "block/wood/door/down_opened_left", + "rotateY": 270 + }, + "*-south-up-opened-left": { + "base": "block/wood/door/up_opened_left", + "rotateY": 270 + }, - "*-west-down-closed-left": { "base": "block/wood/door/down_closed_left", "rotateY": 180 }, - "*-west-up-closed-left": { "base": "block/wood/door/up_closed_left", "rotateY": 180 }, - "*-west-down-opened-left": { "base": "block/wood/door/down_opened_left", "rotateY": 180 }, - "*-west-up-opened-left": { "base": "block/wood/door/up_opened_left", "rotateY": 180 }, + "*-west-down-closed-left": { + "base": "block/wood/door/down_closed_left", + "rotateY": 180 + }, + "*-west-up-closed-left": { + "base": "block/wood/door/up_closed_left", + "rotateY": 180 + }, + "*-west-down-opened-left": { + "base": "block/wood/door/down_opened_left", + "rotateY": 180 + }, + "*-west-up-opened-left": { + "base": "block/wood/door/up_opened_left", + "rotateY": 180 + }, - "*-north-down-closed-right": { "base": "block/wood/door/down_closed_right", "rotateY": 90 }, - "*-north-up-closed-right": { "base": "block/wood/door/up_closed_right", "rotateY": 90 }, - "*-north-down-opened-right": { "base": "block/wood/door/down_opened_right", "rotateY": 90 }, - "*-north-up-opened-right": { "base": "block/wood/door/up_opened_right", "rotateY": 90 }, + "*-north-down-closed-right": { + "base": "block/wood/door/down_closed_right", + "rotateY": 90 + }, + "*-north-up-closed-right": { + "base": "block/wood/door/up_closed_right", + "rotateY": 90 + }, + "*-north-down-opened-right": { + "base": "block/wood/door/down_opened_right", + "rotateY": 90 + }, + "*-north-up-opened-right": { + "base": "block/wood/door/up_opened_right", + "rotateY": 90 + }, - "*-east-down-closed-right": { "base": "block/wood/door/down_closed_right", "rotateY": 0 }, - "*-east-up-closed-right": { "base": "block/wood/door/up_closed_right", "rotateY": 0 }, - "*-east-down-opened-right": { "base": "block/wood/door/down_opened_right", "rotateY": 0 }, - "*-east-up-opened-right": { "base": "block/wood/door/up_opened_right", "rotateY": 0 }, + "*-east-down-closed-right": { + "base": "block/wood/door/down_closed_right", + "rotateY": 0 + }, + "*-east-up-closed-right": { + "base": "block/wood/door/up_closed_right", + "rotateY": 0 + }, + "*-east-down-opened-right": { + "base": "block/wood/door/down_opened_right", + "rotateY": 0 + }, + "*-east-up-opened-right": { + "base": "block/wood/door/up_opened_right", + "rotateY": 0 + }, - "*-south-down-closed-right": { "base": "block/wood/door/down_closed_right", "rotateY": 270 }, - "*-south-up-closed-right": { "base": "block/wood/door/up_closed_right", "rotateY": 270 }, - "*-south-down-opened-right": { "base": "block/wood/door/down_opened_right", "rotateY": 270 }, - "*-south-up-opened-right": { "base": "block/wood/door/up_opened_right", "rotateY": 270 }, + "*-south-down-closed-right": { + "base": "block/wood/door/down_closed_right", + "rotateY": 270 + }, + "*-south-up-closed-right": { + "base": "block/wood/door/up_closed_right", + "rotateY": 270 + }, + "*-south-down-opened-right": { + "base": "block/wood/door/down_opened_right", + "rotateY": 270 + }, + "*-south-up-opened-right": { + "base": "block/wood/door/up_opened_right", + "rotateY": 270 + }, - "*-west-down-closed-right": { "base": "block/wood/door/down_closed_right", "rotateY": 180 }, - "*-west-up-closed-right": { "base": "block/wood/door/up_closed_right", "rotateY": 180 }, - "*-west-down-opened-right": { "base": "block/wood/door/down_opened_right", "rotateY": 180 }, - "*-west-up-opened-right": { "base": "block/wood/door/up_opened_right", "rotateY": 180 } + "*-west-down-closed-right": { + "base": "block/wood/door/down_closed_right", + "rotateY": 180 + }, + "*-west-up-closed-right": { + "base": "block/wood/door/up_closed_right", + "rotateY": 180 + }, + "*-west-down-opened-right": { + "base": "block/wood/door/down_opened_right", + "rotateY": 180 + }, + "*-west-up-opened-right": { + "base": "block/wood/door/up_opened_right", + "rotateY": 180 + } }, "blockmaterial": "Wood", "replaceable": 500, diff --git a/resources/assets/morevariants/blocktypes/wood/chest-labeled.json b/resources/assets/morevariants/blocktypes/wood/labeledchest.json similarity index 56% rename from resources/assets/morevariants/blocktypes/wood/chest-labeled.json rename to resources/assets/morevariants/blocktypes/wood/labeledchest.json index 556eaa1..9f2b538 100644 --- a/resources/assets/morevariants/blocktypes/wood/chest-labeled.json +++ b/resources/assets/morevariants/blocktypes/wood/labeledchest.json @@ -1,15 +1,17 @@ { "code": "labeledchest", - "class": "BlockLabeledChest", - "entityclass": "LabeledChest", + "class": "BlockGenericTypedContainer", + "entityclass": "GenericTypedContainer", + "behaviors": [{ "name": "Lockable" }, { "name": "Container" }], + "entityBehaviors": [{ "name": "Animatable" }], "attributes": { - "handbook": { - "groupBy": ["labeledchest-*"] - }, "partialAttachable": true, "inventoryClassName": "chest", "defaultType": "normal-labeled", "types": ["normal-labeled"], + "rotatatableInterval": { + "normal-labeled": "22.5degnot45deg" + }, "drop": { "normal-labeled": true }, @@ -28,70 +30,59 @@ "shape": { "normal-labeled": "game:block/wood/chest/normal-labeled" }, + "variantByGroup": "variant", + "variantByGroupInventory": "null", "openSound": "game:sounds/block/largechestopen", - "closeSound": "game:sounds/block/largechestclose", - "variantByGroup": "side", - "variantByGroupInventory": null + "closeSound": "game:sounds/block/largechestclose" }, - "behaviors": [ - { "name": "Lockable" }, - { "name": "Container" }, - { - "name": "HorizontalOrientable", - "properties": { "dropBlockFace": "east" } - } - ], - "entityBehaviors": [{ "name": "Animatable" }], "variantgroups": [ { "code": "variant", "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] - }, - { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } + } ], - "creativeinventory": {}, - "creativeinventoryStacksByType": { - "*-east": [ - { - "tabs": ["general", "decorative"], - "stacks": [ - { - "type": "block", - "code": "labeledchest-{variant}-east", - "attributes": { "type": "normal-labeled" } - } - ] - } - ] + "shapeInventory": { + "base": "game:block/wood/chest/normal-labeled", + "rotateY": 270 }, - "heldTpIdleAnimation": "holdunderarm", - "shapeInventory": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "shapeByType": { - "*-north": { "base": "game:block/wood/chest/normal", "rotateY": 0 }, - "*-east": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "*-west": { "base": "game:block/wood/chest/normal", "rotateY": 90 }, - "*-south": { "base": "game:block/wood/chest/normal", "rotateY": 180 } - }, - "_comment": "Must declare textures so they get added to the block texture atlas", + "shape": { "base": "game:block/wood/chest/normal-labeled" }, "textures": { - "normal-labeled-sides2": { - "base": "morevariants:block/wood/trunk/{variant}/sides" + "normal-labeled-label": { "base": "game:block/wood/chest/label" }, + "normal-labeled-accessories": { + "base": "morevariants:block/wood/trunk/accessories" }, "normal-labeled-lid": { - "base": "morevariants:block/wood/trunk/{variant}/lid" - }, - "normal-labeled-accessories": { - "base": "morevariants:block/wood/trunk/{variant}/accessories" + "base": "morevariants:block/wood/trunk/lid/{variant}" }, - "normal-labeled-label": { "base": "game:block/wood/chest/label" } + "normal-labeled-sides2": { + "base": "morevariants:block/wood/trunk/sides/{variant}" + } }, + "creativeinventory": {}, + "creativeinventoryStacks": [ + { + "tabs": ["general", "decorative", "morevariants"], + "stacks": [ + { + "type": "block", + "code": "labeledchest-{variant}", + "attributes": { "type": "normal-labeled" } + } + ] + } + ], + "heldTpIdleAnimation": "holdunderarm", "blockmaterial": "Wood", "replaceable": 900, "resistance": 3, "lightAbsorption": 0, "sideAo": { "all": false }, - "sidesolid": { "all": false }, - "sideopaque": { "all": false }, + "sidesolid": { + "all": false + }, + "sideopaque": { + "all": false + }, "collisionbox": { "x1": 0.0625, "y1": 0, diff --git a/resources/assets/morevariants/blocktypes/wood/ladder.json b/resources/assets/morevariants/blocktypes/wood/ladder.json index e6bf5f6..fdaef96 100644 --- a/resources/assets/morevariants/blocktypes/wood/ladder.json +++ b/resources/assets/morevariants/blocktypes/wood/ladder.json @@ -8,11 +8,18 @@ } }, "variantgroups": [ - { "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] }, + { + "code": "type", + "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] + }, { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } ], "texture": { "base": "block/wood/ladder/{type}" }, - "creativeinventory": { "general": ["ladder-*-north"], "decorative": ["ladder-*-north"] }, + "creativeinventory": { + "general": ["ladder-*-north"], + "decorative": ["ladder-*-north"], + "morevariants": ["ladder-*-north"] + }, "shapeinventory": { "base": "game:block/wood/ladder-inventory" }, "shapebytype": { "*-north": { "base": "game:block/wood/ladder", "rotateY": 0 }, diff --git a/resources/assets/morevariants/blocktypes/wood/shelf.json b/resources/assets/morevariants/blocktypes/wood/shelf.json index 14e2b5f..c4a9a5c 100644 --- a/resources/assets/morevariants/blocktypes/wood/shelf.json +++ b/resources/assets/morevariants/blocktypes/wood/shelf.json @@ -8,10 +8,18 @@ } }, "variantgroups": [ - { "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] }, + { + "code": "type", + "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] + }, { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } ], - "behaviors": [{ "name": "HorizontalAttachable", "properties": { "dropBlockFace": "east" } }], + "behaviors": [ + { + "name": "HorizontalAttachable", + "properties": { "dropBlockFace": "east" } + } + ], "shapeByType": { "*-north": { "base": "game:block/wood/shelf", "rotateY": 0 }, "*-east": { "base": "game:block/wood/shelf", "rotateY": 270 }, @@ -23,7 +31,11 @@ "wood2": { "base": "block/wood/shelf/{type}/wood" } }, "heldTpIdleAnimation": "holdunderarm", - "creativeinventory": { "general": ["*-east"], "decorative": ["*-east"] }, + "creativeinventory": { + "general": ["*-east"], + "decorative": ["*-east"], + "morevariants": ["*-east"] + }, "blockmaterial": "Wood", "replaceable": 900, "resistance": 1.5, diff --git a/resources/assets/morevariants/blocktypes/wood/table.json b/resources/assets/morevariants/blocktypes/wood/table.json index 24a3e46..2ecf347 100644 --- a/resources/assets/morevariants/blocktypes/wood/table.json +++ b/resources/assets/morevariants/blocktypes/wood/table.json @@ -1,9 +1,15 @@ { "code": "table", - "variantgroups": [{ "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok"] }], + "variantgroups": [ + { "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok"] } + ], "shape": { "base": "game:block/wood/table" }, "heldTpIdleAnimation": "holdunderarm", - "creativeinventory": { "general": ["*"], "decorative": ["*"] }, + "creativeinventory": { + "general": ["*"], + "decorative": ["*"], + "morevariants": ["*"] + }, "attributes": { "handbook": { "groupBy": ["table-*"] diff --git a/resources/assets/morevariants/blocktypes/wood/trapdoor.json b/resources/assets/morevariants/blocktypes/wood/trapdoor.json index 6157fe1..f0ee65e 100644 --- a/resources/assets/morevariants/blocktypes/wood/trapdoor.json +++ b/resources/assets/morevariants/blocktypes/wood/trapdoor.json @@ -26,7 +26,10 @@ } }, "variantgroups": [ - { "code": "type", "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] }, + { + "code": "type", + "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] + }, { "code": "state", "states": ["closed", "opened"] }, { "code": "v", "states": ["up", "left", "down", "right"] }, { "code": "rot", "loadFromProperties": "abstract/horizontalorientation" } @@ -36,24 +39,92 @@ "wood": { "base": "block/wood/trapdoor/{type}/wood" } }, "shapeByType": { - "*-up-north": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 0, "rotateZ": 0 }, - "*-up-west": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 90, "rotateX": 0 }, - "*-up-south": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 180, "rotateZ": 0 }, - "*-up-east": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 270, "rotateX": 0 }, - "*-left-north": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 0, "rotateZ": 270 }, - "*-left-west": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 90, "rotateX": 90 }, - "*-left-south": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 180, "rotateZ": 90 }, - "*-left-east": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 270, "rotateX": 90 }, - "*-down-north": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 0, "rotateZ": 180 }, - "*-down-west": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 90, "rotateX": 180 }, - "*-down-south": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 180, "rotateZ": 180 }, - "*-down-east": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 270, "rotateX": 180 }, - "*-right-north": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 0, "rotateZ": 90 }, - "*-right-west": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 90, "rotateX": 270 }, - "*-right-south": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 180, "rotateZ": 270 }, - "*-right-east": { "base": "game:block/wood/trapdoor-{state}", "rotateY": 270, "rotateX": 270 } + "*-up-north": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 0, + "rotateZ": 0 + }, + "*-up-west": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 90, + "rotateX": 0 + }, + "*-up-south": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 180, + "rotateZ": 0 + }, + "*-up-east": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 270, + "rotateX": 0 + }, + "*-left-north": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 0, + "rotateZ": 270 + }, + "*-left-west": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 90, + "rotateX": 90 + }, + "*-left-south": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 180, + "rotateZ": 90 + }, + "*-left-east": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 270, + "rotateX": 90 + }, + "*-down-north": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 0, + "rotateZ": 180 + }, + "*-down-west": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 90, + "rotateX": 180 + }, + "*-down-south": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 180, + "rotateZ": 180 + }, + "*-down-east": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 270, + "rotateX": 180 + }, + "*-right-north": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 0, + "rotateZ": 90 + }, + "*-right-west": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 90, + "rotateX": 270 + }, + "*-right-south": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 180, + "rotateZ": 270 + }, + "*-right-east": { + "base": "game:block/wood/trapdoor-{state}", + "rotateY": 270, + "rotateX": 270 + } + }, + "creativeinventory": { + "general": ["*-closed-up-north"], + "decorative": ["*-closed-up-north"], + "morevariants": ["*-closed-up-north"] }, - "creativeinventory": { "general": ["*-closed-up-north"], "decorative": ["*-closed-up-north"] }, "drops": [{ "code": "trapdoor-{type}-closed-up-north" }], "blockmaterial": "Wood", "replaceable": 900, diff --git a/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/bettercrate.json b/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/bettercrate.json index 2e1f09a..9bf2900 100644 --- a/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/bettercrate.json +++ b/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/bettercrate.json @@ -10,7 +10,7 @@ "L": { "type": "block", "code": "game:linen-*-down" }, "C": { "type": "block", - "code": "chest-*-east", + "code": "chest-*", "attributes": { "type": "normal-generic" } } }, diff --git a/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/upgrade.json b/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/upgrade.json index 056e655..f0d00ea 100644 --- a/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/upgrade.json +++ b/resources/assets/morevariants/compatibility/bettercrates/recipes/grid/upgrade.json @@ -11,7 +11,7 @@ }, "C": { "type": "block", - "code": "chest-*-east", + "code": "chest-*", "attributes": { "type": "normal-generic" } } }, @@ -30,7 +30,7 @@ }, "C": { "type": "block", - "code": "chest-*-east", + "code": "chest-*", "attributes": { "type": "normal-generic" } } }, diff --git a/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-chest.json b/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-chest.json index 17d719b..6a7649b 100644 --- a/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-chest.json +++ b/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-chest.json @@ -3,7 +3,7 @@ "ingredients": { "C": { "type": "block", - "code": "chest-*-east", + "code": "chest-*", "attributes": { "type": "normal-generic" } }, "P": { diff --git a/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-labeledchest.json b/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-labeledchest.json index 836a63d..8dd8e03 100644 --- a/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-labeledchest.json +++ b/resources/assets/morevariants/compatibility/extrachests/recipes/grid/copper-labeledchest.json @@ -4,7 +4,7 @@ "ingredients": { "C": { "type": "block", - "code": "labeledchest-*-east", + "code": "labeledchest-*", "attributes": { "type": "normal-labeled" } }, "P": { diff --git a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest-labeled.json b/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest-labeled.json deleted file mode 100644 index d6918ce..0000000 --- a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest-labeled.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "code": "labeledchest", - "class": "BlockLabeledChest", - "entityclass": "LabeledChest", - "attributes": { - "handbook": { - "groupBy": ["labeledchest-*"] - }, - "partialAttachable": true, - "inventoryClassName": "chest", - "defaultType": "normal-labeled", - "types": ["normal-labeled", "normal"], - "drop": { - "normal-labeled": true, - "normal": true - }, - "quantitySlots": { - "normal-labeled": 16, - "normal": 16 - }, - "dialogTitleLangCode": { - "normal-labeled": "chestcontents", - "normal": "chestcontents" - }, - "storageType": { - "normal-labeled": 189, - "normal": 189 - }, - "retrieveOnly": { - "normal-labeled": false, - "normal": false - }, - "shape": { - "normal-labeled": "game:block/wood/chest/normal-labeled", - "normal": "game:block/wood/chest/outdated-labeled" - }, - "openSound": "game:sounds/block/largechestopen", - "closeSound": "game:sounds/block/largechestclose", - "variantByGroup": "side", - "variantByGroupInventory": null - }, - "behaviors": [ - { "name": "Lockable" }, - { "name": "Container" }, - { - "name": "HorizontalOrientable", - "properties": { "dropBlockFace": "east" } - } - ], - "entityBehaviors": [{ "name": "Animatable" }, { "name": "BEFixTypedChest" }], - "variantgroups": [ - { - "code": "variant", - "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] - }, - { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } - ], - "creativeinventory": {}, - "creativeinventoryStacksByType": { - "*-east": [ - { - "tabs": ["general", "decorative"], - "stacks": [ - { - "type": "block", - "code": "labeledchest-{variant}-east", - "attributes": { "type": "normal-labeled" } - }, - { - "type": "block", - "code": "labeledchest-{variant}-east", - "attributes": { "type": "normal" } - } - ] - } - ] - }, - "heldTpIdleAnimation": "holdunderarm", - "shapeInventory": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "shapeByType": { - "*-north": { "base": "game:block/wood/chest/normal", "rotateY": 0 }, - "*-east": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "*-west": { "base": "game:block/wood/chest/normal", "rotateY": 90 }, - "*-south": { "base": "game:block/wood/chest/normal", "rotateY": 180 } - }, - "_comment": "Must declare textures so they get added to the block texture atlas", - "textures": { - "normal-labeled-sides2": { "base": "block/wood/trunk/{variant}/sides" }, - "normal-labeled-lid": { "base": "block/wood/trunk/{variant}/lid" }, - "normal-labeled-accessories": { - "base": "block/wood/trunk/{variant}/accessories" - }, - "normal-labeled-label": { "base": "game:block/wood/chest/label" }, - - "normal-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "normal-lid": { "base": "block/wood/trunk/outdated/lid" }, - "normal-accessories": { "base": "block/wood/trunk/outdated/accessories" } - }, - "blockmaterial": "Wood", - "replaceable": 900, - "resistance": 3, - "lightAbsorption": 0, - "sideAo": { "all": false }, - "sidesolid": { "all": false }, - "sideopaque": { "all": false }, - "collisionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "selectionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "combustibleProps": { - "burnTemperature": 600, - "burnDuration": 35 - }, - "sounds": { - "place": "game:block/planks", - "hit": "game:block/planks", - "break": "game:block/planks", - "walk": "game:walk/wood" - }, - "materialDensity": 600, - "tpHandTransform": { - "translation": { "x": -0.9, "y": -0.5, "z": -0.3 }, - "rotation": { "x": 0, "y": 90, "z": -102 }, - "scale": 0.56 - }, - "guiTransform": { - "origin": { "x": 0.5, "y": 0.4, "z": 0.5 }, - "scale": 1.16 - } -} diff --git a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest.json b/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest.json deleted file mode 100644 index 5c82ef1..0000000 --- a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/chest.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "code": "chest", - "class": "BlockGenericTypedContainer", - "entityclass": "GenericTypedContainer", - "attributes": { - "handbook": { - "groupBy": ["chest-*"] - }, - "partialAttachable": true, - "inventoryClassName": "chest", - "defaultType": "normal-generic", - "types": ["normal-generic", "normal"], - "rotatatableInterval": { - "normal-generic": "22.5degnot45deg", - "normal": "22.5degnot45deg" - }, - "drop": { - "normal-generic": true, - "normal": true - }, - "quantitySlots": { - "normal-generic": 16, - "normal": 16 - }, - "dialogTitleLangCode": { - "normal-generic": "chestcontents", - "normal": "chestcontents" - }, - "storageType": { - "normal-generic": 189, - "normal": 189 - }, - "retrieveOnly": { - "normal-generic": false, - "normal": false - }, - "shape": { - "normal-generic": "game:block/wood/chest/normal", - "normal": "game:block/wood/chest/outdated" - }, - "variantByGroup": "side", - "variantByGroupInventory": null, - "openSound": "game:sounds/block/largechestopen", - "closeSound": "game:sounds/block/largechestclose" - }, - "behaviors": [{ "name": "Lockable" }, { "name": "Container" }], - "entityBehaviors": [{ "name": "Animatable" }, { "name": "BEFixTypedChest" }], - "variantgroups": [ - { - "code": "variant", - "states": ["birch", "maple", "pine", "acacia", "kapok", "aged"] - }, - { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } - ], - "creativeinventory": {}, - "creativeinventoryStacksByType": { - "*-east": [ - { - "tabs": ["general", "decorative"], - "stacks": [ - { - "type": "block", - "code": "chest-{variant}-east", - "attributes": { "type": "normal-generic" } - }, - { - "type": "block", - "code": "chest-{variant}-east", - "attributes": { "type": "normal" } - } - ] - } - ] - }, - "heldTpIdleAnimation": "holdunderarm", - "shapeInventory": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "shapeByType": { - "*-north": { "base": "game:block/wood/chest/normal", "rotateY": 0 }, - "*-east": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "*-west": { "base": "game:block/wood/chest/normal", "rotateY": 90 }, - "*-south": { "base": "game:block/wood/chest/normal", "rotateY": 180 } - }, - "_comment": "Must declare textures so they get added to the block texture atlas", - "textures": { - "normal-generic-sides2": { "base": "block/wood/trunk/{variant}/sides" }, - "normal-generic-lid": { "base": "block/wood/trunk/{variant}/lid" }, - "normal-generic-accessories": { - "base": "block/wood/trunk/{variant}/accessories" - }, - - "normal-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "normal-lid": { "base": "block/wood/trunk/outdated/lid" }, - "normal-accessories": { "base": "block/wood/trunk/outdated/accessories" }, - "normal-label": { "base": "game:block/wood/chest/label" } - }, - "blockmaterial": "Wood", - "replaceable": 900, - "resistance": 3, - "lightAbsorption": 0, - "sideAo": { "all": false }, - "sidesolid": { "all": false }, - "sideopaque": { "all": false }, - "collisionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "selectionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "combustibleProps": { - "burnTemperature": 600, - "burnDuration": 35 - }, - "sounds": { - "place": "game:block/planks", - "hit": "game:block/planks", - "break": "game:block/planks", - "walk": "game:walk/wood" - }, - "materialDensity": 600, - "tpHandTransform": { - "translation": { "x": -0.9, "y": -0.5, "z": -0.3 }, - "rotation": { "x": 0, "y": 90, "z": -102 }, - "scale": 0.56 - }, - "guiTransform": { - "origin": { "x": 0.5, "y": 0.4, "z": 0.5 }, - "scale": 1.16 - } -} diff --git a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest-labeled.json b/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest-labeled.json deleted file mode 100644 index 5222aa3..0000000 --- a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest-labeled.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "code": "labeledchest", - "class": "BlockLabeledChest", - "entityclass": "LabeledChest", - "attributes": { - "handbook": { - "groupBy": ["labeledchest-*"] - }, - "partialAttachable": true, - "inventoryClassName": "chest", - "defaultType": "birch-labeled", - "types": [ - "birch-labeled", - "maple-labeled", - "pine-labeled", - "acacia-labeled", - "kapok-labeled", - "aged-labeled" - ], - "drop": { - "birch-labeled": true, - "maple-labeled": true, - "pine-labeled": true, - "acacia-labeled": true, - "kapok-labeled": true, - "aged-labeled": true - }, - "quantitySlots": { - "birch-labeled": 16, - "maple-labeled": 16, - "pine-labeled": 16, - "acacia-labeled": 16, - "kapok-labeled": 16, - "aged-labeled": 16 - }, - "dialogTitleLangCode": { - "birch-labeled": "chestcontents", - "maple-labeled": "chestcontents", - "pine-labeled": "chestcontents", - "acacia-labeled": "chestcontents", - "kapok-labeled": "chestcontents", - "aged-labeled": "chestcontents" - }, - "storageType": { - "birch-labeled": 189, - "maple-labeled": 189, - "pine-labeled": 189, - "acacia-labeled": 189, - "kapok-labeled": 189, - "aged-labeled": 189 - }, - "retrieveOnly": { - "birch-labeled": false, - "maple-labeled": false, - "pine-labeled": false, - "acacia-labeled": false, - "kapok-labeled": false, - "aged-labeled": false - }, - "shape": { - "birch-labeled": "game:block/wood/chest/outdated-labeled", - "maple-labeled": "game:block/wood/chest/outdated-labeled", - "pine-labeled": "game:block/wood/chest/outdated-labeled", - "acacia-labeled": "game:block/wood/chest/outdated-labeled", - "kapok-labeled": "game:block/wood/chest/outdated-labeled", - "aged-labeled": "game:block/wood/chest/outdated-labeled" - }, - "typedOpenSound": { - "birch-labeled": "game:sounds/block/largechestopen", - "maple-labeled": "game:sounds/block/largechestopen", - "pine-labeled": "game:sounds/block/largechestopen", - "acacia-labeled": "game:sounds/block/largechestopen", - "kapok-labeled": "game:sounds/block/largechestopen", - "aged-labeled": "game:sounds/block/largechestopen" - }, - "typedCloseSound": { - "birch-labeled": "game:sounds/block/largechestclose", - "maple-labeled": "game:sounds/block/largechestclose", - "pine-labeled": "game:sounds/block/largechestclose", - "acacia-labeled": "game:sounds/block/largechestclose", - "kapok-labeled": "game:sounds/block/largechestclose", - "aged-labeled": "game:sounds/block/largechestclose" - }, - "variantByGroup": "side", - "variantByGroupInventory": null - }, - "behaviors": [ - { "name": "Lockable" }, - { "name": "Container" }, - { - "name": "HorizontalOrientable", - "properties": { "dropBlockFace": "east" } - } - ], - "entityBehaviors": [{ "name": "Animatable" }, { "name": "BEFixTypedChest" }], - "variantgroups": [ - { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } - ], - "creativeinventory": {}, - "creativeinventoryStacksByType": { - "*-east": [ - { - "tabs": ["general", "decorative"], - "stacks": [ - { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "birch-labeled" } - }, - { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "maple-labeled" } - }, - { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "pine-labeled" } - }, - { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "acacia-labeled" } - }, - { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "kapok-labeled" } - }, - { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "aged-labeled" } - } - ] - } - ] - }, - "heldTpIdleAnimation": "holdunderarm", - "shapeInventory": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "shapeByType": { - "*-north": { "base": "game:block/wood/chest/normal", "rotateY": 0 }, - "*-east": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "*-west": { "base": "game:block/wood/chest/normal", "rotateY": 90 }, - "*-south": { "base": "game:block/wood/chest/normal", "rotateY": 180 } - }, - "_comment": "Must declare textures so they get added to the block texture atlas", - "textures": { - "birch-labeled-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "birch-labeled-lid": { "base": "block/wood/trunk/outdated/lid" }, - "birch-labeled-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - "birch-labeled-label": { "base": "game:block/wood/chest/label" }, - - "maple-labeled-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "maple-labeled-lid": { "base": "block/wood/trunk/outdated/lid" }, - "maple-labeled-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - "maple-labeled-label": { "base": "game:block/wood/chest/label" }, - - "pine-labeled-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "pine-labeled-lid": { "base": "block/wood/trunk/outdated/lid" }, - "pine-labeled-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - "pine-labeled-label": { "base": "game:block/wood/chest/label" }, - - "acacia-labeled-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "acacia-labeled-lid": { "base": "block/wood/trunk/outdated/lid" }, - "acacia-labeled-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - "acacia-labeled-label": { "base": "game:block/wood/chest/label" }, - - "kapok-labeled-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "kapok-labeled-lid": { "base": "block/wood/trunk/outdated/lid" }, - "kapok-labeled-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - "kapok-labeled-label": { "base": "game:block/wood/chest/label" }, - - "aged-labeled-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "aged-labeled-lid": { "base": "block/wood/trunk/outdated/lid" }, - "aged-labeled-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - "aged-labeled-label": { "base": "game:block/wood/chest/label" } - }, - "blockmaterial": "Wood", - "replaceable": 900, - "resistance": 3, - "lightAbsorption": 0, - "sideAo": { "all": false }, - "sidesolid": { "all": false }, - "sideopaque": { "all": false }, - "collisionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "selectionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "combustibleProps": { - "burnTemperature": 600, - "burnDuration": 35 - }, - "sounds": { - "place": "game:block/planks", - "hit": "game:block/planks", - "break": "game:block/planks", - "walk": "game:walk/wood" - }, - "materialDensity": 600, - "tpHandTransform": { - "translation": { "x": -0.9, "y": -0.5, "z": -0.3 }, - "rotation": { "x": 0, "y": 90, "z": -102 }, - "scale": 0.56 - }, - "guiTransform": { - "origin": { "x": 0.5, "y": 0.4, "z": 0.5 }, - "scale": 1.16 - } -} diff --git a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest.json b/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest.json deleted file mode 100644 index a55271b..0000000 --- a/resources/assets/morevariants/compatibility/morevariantsfixes/blocktypes/wood/outdated/old-chest.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "code": "chest", - "class": "BlockGenericTypedContainer", - "entityclass": "GenericTypedContainer", - "attributes": { - "handbook": { - "groupBy": ["chest-*"] - }, - "partialAttachable": true, - "inventoryClassName": "chest", - "defaultType": "birch", - "types": ["birch", "maple", "pine", "acacia", "kapok", "aged"], - "rotatatableInterval": { - "birch": "22.5degnot45deg", - "maple": "22.5degnot45deg", - "pine": "22.5degnot45deg", - "acacia": "22.5degnot45deg", - "kapok": "22.5degnot45deg", - "aged": "22.5degnot45deg" - }, - "drop": { - "birch": true, - "maple": true, - "pine": true, - "acacia": true, - "kapok": true, - "aged": true - }, - "quantitySlots": { - "birch": 16, - "maple": 16, - "pine": 16, - "acacia": 16, - "kapok": 16, - "aged": 16 - }, - "dialogTitleLangCode": { - "birch": "chestcontents", - "maple": "chestcontents", - "pine": "chestcontents", - "acacia": "chestcontents", - "kapok": "chestcontents", - "aged": "chestcontents" - }, - "storageType": { - "birch": 189, - "maple": 189, - "pine": 189, - "acacia": 189, - "kapok": 189, - "aged": 189 - }, - "retrieveOnly": { - "birch": false, - "maple": false, - "pine": false, - "acacia": false, - "kapok": false, - "aged": false - }, - "shape": { - "birch": "game:block/wood/chest/outdated", - "maple": "game:block/wood/chest/outdated", - "pine": "game:block/wood/chest/outdated", - "acacia": "game:block/wood/chest/outdated", - "kapok": "game:block/wood/chest/outdated", - "aged": "game:block/wood/chest/outdated" - }, - "typedOpenSound": { - "birch": "game:sounds/block/largechestopen", - "maple": "game:sounds/block/largechestopen", - "pine": "game:sounds/block/largechestopen", - "acacia": "game:sounds/block/largechestopen", - "kapok": "game:sounds/block/largechestopen", - "aged": "game:sounds/block/largechestopen" - }, - "typedCloseSound": { - "birch": "game:sounds/block/largechestclose", - "maple": "game:sounds/block/largechestclose", - "pine": "game:sounds/block/largechestclose", - "acacia": "game:sounds/block/largechestclose", - "kapok": "game:sounds/block/largechestclose", - "aged": "game:sounds/block/largechestclose" - }, - "variantByGroup": "side", - "variantByGroupInventory": null - }, - "behaviors": [{ "name": "Lockable" }, { "name": "Container" }], - "entityBehaviors": [{ "name": "Animatable" }, { "name": "BEFixTypedChest" }], - "variantgroups": [ - { "code": "side", "loadFromProperties": "abstract/horizontalorientation" } - ], - "creativeinventory": {}, - "creativeinventoryStacksByType": { - "*-east": [ - { - "tabs": ["general", "decorative"], - "stacks": [ - { - "type": "block", - "code": "chest-east", - "attributes": { "type": "birch" } - }, - { - "type": "block", - "code": "chest-east", - "attributes": { "type": "maple" } - }, - { - "type": "block", - "code": "chest-east", - "attributes": { "type": "pine" } - }, - { - "type": "block", - "code": "chest-east", - "attributes": { "type": "acacia" } - }, - { - "type": "block", - "code": "chest-east", - "attributes": { "type": "kapok" } - }, - { - "type": "block", - "code": "chest-east", - "attributes": { "type": "aged" } - } - ] - } - ] - }, - "heldTpIdleAnimation": "holdunderarm", - "shapeInventory": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "shapeByType": { - "*-north": { "base": "game:block/wood/chest/normal", "rotateY": 0 }, - "*-east": { "base": "game:block/wood/chest/normal", "rotateY": 270 }, - "*-west": { "base": "game:block/wood/chest/normal", "rotateY": 90 }, - "*-south": { "base": "game:block/wood/chest/normal", "rotateY": 180 } - }, - "_comment": "Must declare textures so they get added to the block texture atlas", - "textures": { - "birch-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "birch-lid": { "base": "block/wood/trunk/outdated/lid" }, - "birch-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - - "maple-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "maple-lid": { "base": "block/wood/trunk/outdated/lid" }, - "maple-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - - "pine-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "pine-lid": { "base": "block/wood/trunk/outdated/lid" }, - "pine-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - - "acacia-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "acacia-lid": { "base": "block/wood/trunk/outdated/lid" }, - "acacia-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - - "kapok-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "kapok-lid": { "base": "block/wood/trunk/outdated/lid" }, - "kapok-accessories": { - "base": "block/wood/trunk/outdated/accessories" - }, - - "aged-sides2": { "base": "block/wood/trunk/outdated/sides" }, - "aged-lid": { "base": "block/wood/trunk/outdated/lid" }, - "aged-accessories": { - "base": "block/wood/trunk/outdated/accessories" - } - }, - "blockmaterial": "Wood", - "replaceable": 900, - "resistance": 3, - "lightAbsorption": 0, - "sideAo": { "all": false }, - "sidesolid": { "all": false }, - "sideopaque": { "all": false }, - "collisionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "selectionbox": { - "x1": 0.0625, - "y1": 0, - "z1": 0.0625, - "x2": 0.9375, - "y2": 0.8125, - "z2": 0.9375 - }, - "combustibleProps": { - "burnTemperature": 600, - "burnDuration": 35 - }, - "sounds": { - "place": "game:block/planks", - "hit": "game:block/planks", - "break": "game:block/planks", - "walk": "game:walk/wood" - }, - "materialDensity": 600, - "tpHandTransform": { - "translation": { "x": -0.9, "y": -0.5, "z": -0.3 }, - "rotation": { "x": 0, "y": 90, "z": -102 }, - "scale": 0.56 - }, - "guiTransform": { - "origin": { "x": 0.5, "y": 0.4, "z": 0.5 }, - "scale": 1.16 - } -} diff --git a/resources/assets/morevariants/compatibility/morevariantsfixes/recipes/grid/outdated-chest.json b/resources/assets/morevariants/compatibility/morevariantsfixes/recipes/grid/outdated-chest.json deleted file mode 100644 index cfb83fc..0000000 --- a/resources/assets/morevariants/compatibility/morevariantsfixes/recipes/grid/outdated-chest.json +++ /dev/null @@ -1,186 +0,0 @@ -[ - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "chest-east", - "attributes": { "type": "birch" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-birch", "quantity": 8 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "chest-east", - "attributes": { "type": "maple" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-maple", "quantity": 8 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "chest-east", - "attributes": { "type": "pine" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-pine", "quantity": 8 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "chest-east", - "attributes": { "type": "acacia" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-acacia", "quantity": 8 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "chest-east", - "attributes": { "type": "kapok" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-kapok", "quantity": 8 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "chest-east", - "attributes": { "type": "aged" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-aged", "quantity": 8 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "birch-labeled" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-birch", "quantity": 10 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "maple-labeled" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-maple", "quantity": 10 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "pine-labeled" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-pine", "quantity": 10 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "acacia-labeled" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-acacia", "quantity": 10 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "kapok-labeled" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-kapok", "quantity": 10 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "labeledchest-east", - "attributes": { "type": "aged-labeled" } - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-aged", "quantity": 10 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "chest-*-east", - "attributes": { "type": "normal" }, - "name": "type" - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-{type}", "quantity": 8 } - }, - { - "ingredientPattern": "C", - "ingredients": { - "C": { - "type": "block", - "code": "labeledchest-*-east", - "attributes": { "type": "normal" }, - "name": "type" - } - }, - "width": 1, - "height": 1, - "output": { "type": "item", "code": "game:plank-{type}", "quantity": 10 } - } -] diff --git a/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-crate.json b/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-crate.json index 28328b4..571fb09 100644 --- a/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-crate.json +++ b/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-crate.json @@ -7,8 +7,8 @@ }, "C": { "type": "block", - "code": "morevariants:chest-*-east", - "attributes": { "type": "normal" } + "code": "morevariants:chest-*", + "attributes": { "type": "normal-generic" } } }, "width": 2, diff --git a/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-tall.json b/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-tall.json index 2dd3054..6ac12a4 100644 --- a/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-tall.json +++ b/resources/assets/morevariants/compatibility/tradeomat/recipes/grid/tomat-tall.json @@ -11,8 +11,8 @@ }, "C": { "type": "block", - "code": "morevariants:chest-*-east", - "attributes": { "type": "normal" } + "code": "morevariants:chest-*", + "attributes": { "type": "normal-generic" } } }, "width": 3, diff --git a/resources/assets/morevariants/itemtypes/stick.json b/resources/assets/morevariants/itemtypes/stick.json index b9614b5..b9d7430 100644 --- a/resources/assets/morevariants/itemtypes/stick.json +++ b/resources/assets/morevariants/itemtypes/stick.json @@ -1,7 +1,11 @@ { "code": "stick", "shape": { "base": "item/stick" }, - "creativeinventory": { "general": ["*"], "items": ["*"] }, + "creativeinventory": { + "general": ["*"], + "items": ["*"], + "morevariants": ["*"] + }, "variantgroups": [ { "code": "wood", diff --git a/resources/assets/morevariants/lang/en.json b/resources/assets/morevariants/lang/en.json index b585ef3..a318cec 100644 --- a/resources/assets/morevariants/lang/en.json +++ b/resources/assets/morevariants/lang/en.json @@ -56,19 +56,19 @@ "block-trapdoor-kapok-closed-up-north": "Trapdoor (Kapok)", "block-trapdoor-aged-closed-up-north": "Trapdoor (Aged)", "game:block-normal-generic-chest-east": "Wooden chest (Oak)", - "block-normal-generic-chest-birch-east": "Wooden chest (Birch)", - "block-normal-generic-chest-maple-east": "Wooden chest (Maple)", - "block-normal-generic-chest-pine-east": "Wooden chest (Pine)", - "block-normal-generic-chest-acacia-east": "Wooden chest (Acacia)", - "block-normal-generic-chest-kapok-east": "Wooden chest (Kapok)", - "block-normal-generic-chest-aged-east": "Wooden chest (Aged)", + "block-normal-generic-chest-birch": "Wooden chest (Birch)", + "block-normal-generic-chest-maple": "Wooden chest (Maple)", + "block-normal-generic-chest-pine": "Wooden chest (Pine)", + "block-normal-generic-chest-acacia": "Wooden chest (Acacia)", + "block-normal-generic-chest-kapok": "Wooden chest (Kapok)", + "block-normal-generic-chest-aged": "Wooden chest (Aged)", "game:block-normal-labeled-labeledchest-east": "Labeled chest (Oak)", - "block-normal-labeled-labeledchest-birch-east": "Labeled chest (Birch)", - "block-normal-labeled-labeledchest-maple-east": "Labeled chest (Maple)", - "block-normal-labeled-labeledchest-pine-east": "Labeled chest (Pine)", - "block-normal-labeled-labeledchest-acacia-east": "Labeled chest (Acacia)", - "block-normal-labeled-labeledchest-kapok-east": "Labeled chest (Kapok)", - "block-normal-labeled-labeledchest-aged-east": "Labeled chest (Aged)", + "block-normal-labeled-labeledchest-birch": "Labeled chest (Birch)", + "block-normal-labeled-labeledchest-maple": "Labeled chest (Maple)", + "block-normal-labeled-labeledchest-pine": "Labeled chest (Pine)", + "block-normal-labeled-labeledchest-acacia": "Labeled chest (Acacia)", + "block-normal-labeled-labeledchest-kapok": "Labeled chest (Kapok)", + "block-normal-labeled-labeledchest-aged": "Labeled chest (Aged)", "block-metalsheet-bismuth": "Bismuth block", "block-metalsheet-bismuthbronze": "Bismuth bronze block", @@ -216,5 +216,7 @@ "item-stick-pine": "Stick (Pine)", "item-stick-acacia": "Stick (Acacia)", "item-stick-kapok": "Stick (Kapok)", - "item-stick-aged": "Stick (Aged)" + "item-stick-aged": "Stick (Aged)", + + "game:tabname-morevariants": "MoreVariants" } diff --git a/resources/assets/morevariants/lang/pt-br.json b/resources/assets/morevariants/lang/pt-br.json index 43a52c1..b8f660b 100644 --- a/resources/assets/morevariants/lang/pt-br.json +++ b/resources/assets/morevariants/lang/pt-br.json @@ -56,19 +56,19 @@ "block-trapdoor-kapok-closed-up-north": "Alçapão de mafumeira", "block-trapdoor-aged-closed-up-north": "Alçapão envelhecido", "game:block-normal-generic-chest-east": "Baú de carvalho", - "block-normal-generic-chest-birch-east": "Baú de bétula", - "block-normal-generic-chest-maple-east": "Baú de bordo", - "block-normal-generic-chest-pine-east": "Baú de pinho", - "block-normal-generic-chest-acacia-east": "Baú de acácia", - "block-normal-generic-chest-kapok-east": "Baú de mafumeira", - "block-normal-generic-chest-aged-east": "Baú envelhecido", + "block-normal-generic-chest-birch": "Baú de bétula", + "block-normal-generic-chest-maple": "Baú de bordo", + "block-normal-generic-chest-pine": "Baú de pinho", + "block-normal-generic-chest-acacia": "Baú de acácia", + "block-normal-generic-chest-kapok": "Baú de mafumeira", + "block-normal-generic-chest-aged": "Baú envelhecido", "game:block-normal-labeled-labeledchest-east": "Baú de carvalho com rótulo", - "block-normal-labeled-labeledchest-birch-east": "Baú de bétula com rótulo", - "block-normal-labeled-labeledchest-maple-east": "Baú de bordo com rótulo", - "block-normal-labeled-labeledchest-pine-east": "Baú de pinho com rótulo", - "block-normal-labeled-labeledchest-acacia-east": "Baú de acácia com rótulo", - "block-normal-labeled-labeledchest-kapok-east": "Baú de mafumeira com rótulo", - "block-normal-labeled-labeledchest-aged-east": "Baú envelhecido com rótulo", + "block-normal-labeled-labeledchest-birch": "Baú de bétula com rótulo", + "block-normal-labeled-labeledchest-maple": "Baú de bordo com rótulo", + "block-normal-labeled-labeledchest-pine": "Baú de pinho com rótulo", + "block-normal-labeled-labeledchest-acacia": "Baú de acácia com rótulo", + "block-normal-labeled-labeledchest-kapok": "Baú de mafumeira com rótulo", + "block-normal-labeled-labeledchest-aged": "Baú envelhecido com rótulo", "block-metalsheet-bismuth": "Bloco de bismuto", "block-metalsheet-bismuthbronze": "Bloco de bronze de bismuto", diff --git a/resources/assets/morevariants/lang/ru.json b/resources/assets/morevariants/lang/ru.json index 106c922..efdbc84 100644 --- a/resources/assets/morevariants/lang/ru.json +++ b/resources/assets/morevariants/lang/ru.json @@ -56,19 +56,19 @@ "block-trapdoor-kapok-closed-up-north": "Люк из капока", "block-trapdoor-aged-closed-up-north": "Люк из древних досок", "game:block-normal-generic-chest-east": "Деревянный сундук из дуба", - "block-normal-generic-chest-birch-east": "Деревянный сундук из березы", - "block-normal-generic-chest-maple-east": "Деревянный сундук из клена", - "block-normal-generic-chest-pine-east": "Деревянный сундук из сосны", - "block-normal-generic-chest-acacia-east": "Деревянный сундук из акации", - "block-normal-generic-chest-kapok-east": "Деревянный сундук из капока", - "block-normal-generic-chest-aged-east": "Деревянный сундук из древних досок", + "block-normal-generic-chest-birch": "Деревянный сундук из березы", + "block-normal-generic-chest-maple": "Деревянный сундук из клена", + "block-normal-generic-chest-pine": "Деревянный сундук из сосны", + "block-normal-generic-chest-acacia": "Деревянный сундук из акации", + "block-normal-generic-chest-kapok": "Деревянный сундук из капока", + "block-normal-generic-chest-aged": "Деревянный сундук из древних досок", "game:block-normal-labeled-labeledchest-east": "Cундук c этикеткой из дуба", - "block-normal-labeled-labeledchest-birch-east": "Cундук c этикеткой из березы", - "block-normal-labeled-labeledchest-maple-east": "Cундук c этикеткой из клена", - "block-normal-labeled-labeledchest-pine-east": "Cундук c этикеткой из сосны", - "block-normal-labeled-labeledchest-acacia-east": "Cундук c этикеткой из акации", - "block-normal-labeled-labeledchest-kapok-east": "Cундук c этикеткой из капока", - "block-normal-labeled-labeledchest-aged-east": "Cундук c этикеткой из древних досок", + "block-normal-labeled-labeledchest-birch": "Cундук c этикеткой из березы", + "block-normal-labeled-labeledchest-maple": "Cундук c этикеткой из клена", + "block-normal-labeled-labeledchest-pine": "Cундук c этикеткой из сосны", + "block-normal-labeled-labeledchest-acacia": "Cундук c этикеткой из акации", + "block-normal-labeled-labeledchest-kapok": "Cундук c этикеткой из капока", + "block-normal-labeled-labeledchest-aged": "Cундук c этикеткой из древних досок", "block-metalsheet-bismuth": "Блок висмута", "block-metalsheet-bismuthbronze": "Блок висмутовой бронзы", diff --git a/resources/assets/morevariants/recipes/grid/wood/chest-labeled.json b/resources/assets/morevariants/recipes/grid/wood/chest-labeled.json index ec145f0..34b1745 100644 --- a/resources/assets/morevariants/recipes/grid/wood/chest-labeled.json +++ b/resources/assets/morevariants/recipes/grid/wood/chest-labeled.json @@ -5,7 +5,7 @@ "S": { "type": "block", "code": "game:sign-ground-north" }, "C": { "type": "block", - "code": "chest-*-east", + "code": "chest-*", "attributes": { "type": "normal-generic" }, "name": "type" } @@ -15,7 +15,7 @@ "height": 2, "output": { "type": "block", - "code": "labeledchest-{type}-east", + "code": "labeledchest-{type}", "attributes": { "type": "normal-labeled" } } } diff --git a/resources/assets/morevariants/recipes/grid/wood/chest.json b/resources/assets/morevariants/recipes/grid/wood/chest.json index 7b61552..a16f4ed 100644 --- a/resources/assets/morevariants/recipes/grid/wood/chest.json +++ b/resources/assets/morevariants/recipes/grid/wood/chest.json @@ -12,7 +12,7 @@ "height": 3, "output": { "type": "block", - "code": "chest-{type}-east", + "code": "chest-{type}", "attributes": { "type": "normal-generic" } } } diff --git a/resources/assets/game/shapes/block/wood/chest/outdated-labeled-opened.json b/resources/assets/morevariants/shapes/block/wood/chest/normal-acacia.json similarity index 96% rename from resources/assets/game/shapes/block/wood/chest/outdated-labeled-opened.json rename to resources/assets/morevariants/shapes/block/wood/chest/normal-acacia.json index 1523d78..156bd56 100644 --- a/resources/assets/game/shapes/block/wood/chest/outdated-labeled-opened.json +++ b/resources/assets/morevariants/shapes/block/wood/chest/normal-acacia.json @@ -1,14 +1,16 @@ { "editor": { "allAngles": false, - "singleTexture": false + "entityTextureMode": false }, "textureWidth": 16, "textureHeight": 16, + "textureSizes": { + }, "textures": { - "sides2": "block/wood/trunk/outdated/sides", - "lid": "block/wood/trunk/outdated/lid", - "accessories": "block/wood/trunk/outdated/accessories" + "sides2": "morevariants:block/wood/trunk/acacia/sides", + "lid": "morevariants:block/wood/trunk/acacia/lid", + "accessories": "morevariants:block/wood/trunk/acacia/accessories" }, "elements": [ { @@ -396,7 +398,6 @@ "from": [ 2.0, 12.0, 2.0 ], "to": [ 14.0, 13.0, 13.0 ], "rotationOrigin": [ 8.0, 11.0, 1.0 ], - "rotationX": -67.5, "faces": { "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, "east": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, @@ -523,19 +524,31 @@ ] } ] - }, + } + ], + "animations": [ { - "name": "label", - "from": [ 3.0, 3.0, 14.0 ], - "to": [ 13.0, 9.0, 14.5 ], - "rotationOrigin": [ 3.0, 3.0, 14.0 ], - "faces": { - "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 10.0, 6.0 ], "enabled": false }, - "east": { "texture": "#accessories", "uv": [ 0.0, 10.0, 0.5, 16.0 ] }, - "south": { "texture": "#accessories", "uv": [ 0.0, 10.0, 10.0, 16.0 ] }, - "west": { "texture": "#accessories", "uv": [ 9.5, 10.0, 10.0, 16.0 ] }, - "up": { "texture": "#accessories", "uv": [ 0.0, 10.0, 10.0, 10.5 ] }, - "down": { "texture": "#accessories", "uv": [ 0.0, 10.0, 10.0, 10.5 ] } - } + "name": "lidopen", + "code": "lidopen", + "quantityframes": 30, + "onActivityStopped": "Rewind", + "onAnimationEnd": "Hold", + "keyframes": [ + { + "frame": 0, + "elements": { + "origin": { }, + "lid": { "rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0 } + } + }, + { + "frame": 29, + "elements": { + "origin": { }, + "lid": { "rotationX": -67.5, "rotationY": 0.0, "rotationZ": 0.0 } + } + } + ] } - ]} + ] +} \ No newline at end of file diff --git a/resources/assets/game/shapes/block/wood/chest/outdated.json b/resources/assets/morevariants/shapes/block/wood/chest/normal-aged.json similarity index 99% rename from resources/assets/game/shapes/block/wood/chest/outdated.json rename to resources/assets/morevariants/shapes/block/wood/chest/normal-aged.json index 2068d47..f7ecaaa 100644 --- a/resources/assets/game/shapes/block/wood/chest/outdated.json +++ b/resources/assets/morevariants/shapes/block/wood/chest/normal-aged.json @@ -8,9 +8,9 @@ "textureSizes": { }, "textures": { - "sides2": "block/wood/trunk/outdated/sides", - "lid": "block/wood/outdated/trunk/lid", - "accessories": "block/wood/outdated/trunk/accessories" + "sides2": "morevariants:block/wood/trunk/aged/sides", + "lid": "morevariants:block/wood/trunk/aged/lid", + "accessories": "morevariants:block/wood/trunk/aged/accessories" }, "elements": [ { @@ -551,4 +551,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/resources/assets/morevariants/shapes/block/wood/chest/normal-birch.json b/resources/assets/morevariants/shapes/block/wood/chest/normal-birch.json new file mode 100644 index 0000000..57e53ae --- /dev/null +++ b/resources/assets/morevariants/shapes/block/wood/chest/normal-birch.json @@ -0,0 +1,554 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "sides2": "morevariants:block/wood/trunk/birch/sides", + "lid": "morevariants:block/wood/trunk/birch/lid", + "accessories": "morevariants:block/wood/trunk/birch/accessories" + }, + "elements": [ + { + "name": "origin", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 0.0, 0.0, 0.0 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false } + }, + "children": [ + { + "name": "floor", + "from": [ 2.0, 1.0, 2.0 ], + "to": [ 14.0, 2.0, 13.0 ], + "rotationOrigin": [ 1.0, 1.0, 1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "east": { "texture": "#lid", "uv": [ 1.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "south": { "texture": "#lid", "uv": [ 1.0, 14.0, 13.0, 15.0 ], "rotation": 180, "enabled": false }, + "west": { "texture": "#lid", "uv": [ 1.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "up": { "texture": "#lid", "uv": [ 1.0, 3.5, 13.0, 14.5 ] }, + "down": { "texture": "#lid", "uv": [ 1.0, 2.0, 13.0, 13.0 ] } + }, + "children": [ + { + "name": "S", + "from": [ -1.0, 0.0, 11.0 ], + "to": [ 13.0, 10.0, 12.0 ], + "rotationOrigin": [ -2.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.5, 4.0, 14.5, 14.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 14.0, 12.0 ] }, + "west": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 2.0, 9.0, 16.0, 10.0 ] }, + "down": { "texture": "#sides2", "uv": [ 2.0, 3.0, 16.0, 4.0 ] } + } + }, + { + "name": "W", + "from": [ -1.0, 0.0, 0.0 ], + "to": [ 0.0, 10.0, 11.0 ], + "rotationOrigin": [ -2.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ], "enabled": false }, + "east": { "texture": "#lid", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 4.5, 9.0, 15.5, 10.0 ], "rotation": 90 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 2.0, 2.0, 13.0 ] } + }, + "children": [ + { + "name": "L holder", + "from": [ -0.5, 7.0, 3.0 ], + "to": [ 0.0, 8.5, 4.5 ], + "rotationOrigin": [ 4.0, 9.0, -10.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ], "enabled": false }, + "south": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "west": { "texture": "#accessories", "uv": [ 1.0, 0.5, 2.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 1.5, 0.5, 3.0 ] } + } + }, + { + "name": "R holder", + "from": [ -0.5, 7.0, 6.5 ], + "to": [ 0.0, 8.5, 8.0 ], + "rotationOrigin": [ 4.0, 9.0, -6.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 1.5, 1.5, 3.0, 3.0 ], "enabled": false }, + "south": { "texture": "#accessories", "uv": [ 4.0, 0.5, 4.5, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 1.5 ] } + } + }, + { + "name": "handle 1", + "from": [ -1.0, 7.5, 3.5 ], + "to": [ -0.5, 8.0, 7.5 ], + "rotationOrigin": [ 3.5, 9.5, -9.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 2.5, 3.0, 3.0, 3.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 2.5, 4.5, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 4.0, 1.5 ], "rotation": 90 }, + "down": { "texture": "#accessories", "uv": [ 0.0, 2.5, 4.0, 3.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "E", + "from": [ 12.0, 0.0, 0.0 ], + "to": [ 13.0, 10.0, 11.0 ], + "rotationOrigin": [ 0.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 14.0, 2.0, 15.0, 12.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ], "enabled": false }, + "west": { "texture": "#lid", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 1.0, 1.5, 12.0, 2.5 ], "rotation": 90 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 2.0, 2.0, 13.0 ] } + }, + "children": [ + { + "name": "L holder1", + "from": [ 1.0, 7.0, 3.0 ], + "to": [ 1.5, 8.5, 4.5 ], + "rotationOrigin": [ 1.0, 8.5, 3.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "west": { "texture": "#accessories", "uv": [ 1.0, 0.5, 2.5, 2.0 ], "enabled": false }, + "up": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 1.5, 0.5, 3.0 ] } + } + }, + { + "name": "R holder2", + "from": [ 1.0, 7.0, 6.5 ], + "to": [ 1.5, 8.5, 8.0 ], + "rotationOrigin": [ 1.0, 8.5, 8.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 1.5, 1.5, 3.0, 3.0 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 0.5, 4.5, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ], "enabled": false }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 1.5 ] } + } + }, + { + "name": "handle 2", + "from": [ 1.5, 7.5, 3.5 ], + "to": [ 2.0, 8.0, 7.5 ], + "rotationOrigin": [ 2.0, 7.5, 3.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 2.5, 3.0, 3.0, 3.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 2.5, 4.5, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 4.0, 1.5 ], "rotation": 90 }, + "down": { "texture": "#accessories", "uv": [ 0.0, 2.5, 4.0, 3.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "N", + "from": [ -1.0, 0.0, -1.0 ], + "to": [ 13.0, 10.0, 0.0 ], + "rotationOrigin": [ -2.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 2.0, 14.0, 12.0 ] }, + "east": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ] }, + "south": { "texture": "#lid", "uv": [ 1.0, 2.0, 15.0, 12.0 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 2.0, 4.0, 16.0, 5.0 ], "rotation": 180 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 4.0, 15.0, 5.0 ] } + }, + "children": [ + { + "name": "hinge 1", + "from": [ 2.5, 9.0, 0.8 ], + "to": [ 3.5, 11.0, 1.3 ], + "rotationOrigin": [ 3.0, 9.0, 1.1 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + }, + { + "name": "hinge 2", + "from": [ 10.5, 9.0, 0.8 ], + "to": [ 11.5, 11.0, 1.3 ], + "rotationOrigin": [ 11.0, 9.0, 1.1 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + } + ] + }, + { + "name": "feet 1", + "from": [ -1.0, -1.0, -1.0 ], + "to": [ 1.0, 0.0, 1.0 ], + "rotationOrigin": [ -1.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 12.0, 2.0, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 2.0, 12.0, 4.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 2.5, 12.0, 4.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 3.5, 12.0, 5.5, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube14", + "from": [ 2.0, 0.5, 0.0 ], + "to": [ 3.5, 1.0, 1.0 ], + "rotationOrigin": [ 2.0, 0.5, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 1.0, 12.0, 2.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 2.5, 12.0, 3.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 6.5, 12.0, 8.0, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 13.0 ] } + } + }, + { + "name": "Cube15", + "from": [ 0.0, 0.5, 2.0 ], + "to": [ 1.0, 1.0, 3.5 ], + "rotationOrigin": [ 0.0, 0.5, 2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 0.0, 12.0, 1.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 1.5, 12.0, 2.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 2.5, 12.0, 4.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 14.5, 1.0, 16.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.5, 1.0, 16.0 ] } + } + } + ] + }, + { + "name": "feet 16", + "from": [ 11.0, -1.0, -1.0 ], + "to": [ 13.0, 0.0, 1.0 ], + "rotationOrigin": [ 11.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 1.5, 12.0, 3.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 9.5, 12.0, 11.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 10.0, 12.0, 12.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube17", + "from": [ -1.5, 0.5, 0.0 ], + "to": [ 0.0, 1.0, 1.0 ], + "rotationOrigin": [ -1.5, 0.5, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 2.5, 12.5, 4.0, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 8.5, 13.0, 10.0, 13.5 ] }, + "west": { "texture": "#sides2", "uv": [ 10.0, 12.0, 11.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.0, 13.0 ] } + } + }, + { + "name": "Cube18", + "from": [ 1.0, 0.5, 2.0 ], + "to": [ 2.0, 1.0, 3.5 ], + "rotationOrigin": [ 1.0, 0.5, 2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.0, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 14.5, 12.0, 15.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 3.0, 12.0, 4.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.5, 14.5, 2.0, 15.5 ], "rotation": 90, "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 1.5, 15.0, 3.0, 16.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "feet 19", + "from": [ 11.0, -1.0, 10.0 ], + "to": [ 13.0, 0.0, 12.0 ], + "rotationOrigin": [ 11.0, -1.0, 10.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 8.5, 12.0, 10.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube20", + "from": [ -1.5, 0.5, 1.0 ], + "to": [ 0.0, 1.0, 2.0 ], + "rotationOrigin": [ -1.5, 0.5, 1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 5.5, 12.0, 7.0, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 5.0, 12.0, 6.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 2.5, 12.0, 3.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 12.0, 1.5, 13.0 ] } + } + }, + { + "name": "Cube21", + "from": [ 1.0, 0.5, -1.5 ], + "to": [ 2.0, 1.0, 0.0 ], + "rotationOrigin": [ 1.0, 0.5, -1.5 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 10.0, 12.0, 11.0, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.0, 12.0, 2.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 1.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 2.0, 12.0, 3.5, 13.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "feet 22", + "from": [ -1.0, -1.0, 10.0 ], + "to": [ 1.0, 0.0, 12.0 ], + "rotationOrigin": [ -1.0, -1.0, 10.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 5.5, 12.0, 7.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.5, 12.0, 8.5, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 4.0, 12.0, 6.0, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 1.5, 12.0, 3.5, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube23", + "from": [ 2.0, 0.5, 1.0 ], + "to": [ 3.5, 1.0, 2.0 ], + "rotationOrigin": [ 2.0, 0.5, 1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 0.5, 12.0, 1.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 9.0, 12.0, 10.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.5, 12.0, 2.0, 13.0 ] } + } + }, + { + "name": "Cube24", + "from": [ 0.0, 0.5, -1.5 ], + "to": [ 1.0, 1.0, 0.0 ], + "rotationOrigin": [ 0.0, 0.5, -1.5 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 4.5, 12.0, 5.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 4.5, 11.5, 6.0, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 3.5, 12.0, 5.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 1.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 2.0, 14.5, 3.5, 15.5 ], "rotation": 90 } + } + } + ] + } + ] + }, + { + "name": "lid", + "from": [ 2.0, 12.0, 2.0 ], + "to": [ 14.0, 13.0, 13.0 ], + "rotationOrigin": [ 8.0, 11.0, 1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, + "east": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, + "south": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, + "west": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, + "up": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 11.0 ] }, + "down": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 11.0 ], "rotation": 180 } + }, + "children": [ + { + "name": "West", + "from": [ -1.0, -1.0, 0.0 ], + "to": [ 0.0, 1.0, 11.0 ], + "rotationOrigin": [ -1.0, -1.0, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.0, 11.0, 12.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.5, 0.0, 12.5, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 11.0 ] }, + "down": { "texture": "#sides2", "uv": [ 3.5, 12.5, 14.5, 13.5 ], "rotation": 90 } + } + }, + { + "name": "East", + "from": [ 12.0, -1.0, 0.0 ], + "to": [ 13.0, 1.0, 11.0 ], + "rotationOrigin": [ 12.0, -1.0, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.5, 0.0, 12.5, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 3.0, 11.0, 14.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 11.0 ] }, + "down": { "texture": "#sides2", "uv": [ 2.5, 13.5, 13.5, 14.5 ], "rotation": 90 } + } + }, + { + "name": "North", + "from": [ -1.0, -1.0, -1.0 ], + "to": [ 13.0, 1.0, 0.0 ], + "rotationOrigin": [ -1.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 2.0 ] }, + "east": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 2.0, 11.0, 16.0, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.5, 14.0, 15.5 ] } + }, + "children": [ + { + "name": "hinge 3", + "from": [ 2.5, -0.8, 1.0 ], + "to": [ 3.5, 1.2, 1.5 ], + "rotationOrigin": [ 3.0, -0.8, 1.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + }, + { + "name": "hinge 4", + "from": [ 10.5, -0.8, 1.0 ], + "to": [ 11.5, 1.2, 1.5 ], + "rotationOrigin": [ 11.0, -0.8, 1.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + } + ] + }, + { + "name": "South", + "from": [ -1.0, -1.0, 11.0 ], + "to": [ 13.0, 1.0, 12.0 ], + "rotationOrigin": [ -1.0, -1.0, 11.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.5, 11.0, 14.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 2.0 ] }, + "west": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#sides2", "uv": [ 0.5, 13.5, 14.5, 14.5 ] } + } + }, + { + "name": "Cube34", + "from": [ 4.5, -2.5, 12.0 ], + "to": [ 7.5, 0.0, 12.5 ], + "rotationOrigin": [ 4.5, -2.5, 12.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.5 ] }, + "south": { "texture": "#accessories", "uv": [ 9.0, 0.5, 12.0, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 0.5 ] } + } + }, + { + "name": "Cube35", + "from": [ 5.0, 0.0, 12.0 ], + "to": [ 7.0, 0.5, 12.5 ], + "rotationOrigin": [ 5.0, 0.0, 12.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ], "enabled": false }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 0.5 ] }, + "south": { "texture": "#accessories", "uv": [ 9.5, 0.0, 11.5, 0.5 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 0.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ], "enabled": false } + } + } + ] + } + ] + } + ], + "animations": [ + { + "name": "lidopen", + "code": "lidopen", + "quantityframes": 30, + "onActivityStopped": "Rewind", + "onAnimationEnd": "Hold", + "keyframes": [ + { + "frame": 0, + "elements": { + "origin": { }, + "lid": { "rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0 } + } + }, + { + "frame": 29, + "elements": { + "origin": { }, + "lid": { "rotationX": -67.5, "rotationY": 0.0, "rotationZ": 0.0 } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/resources/assets/morevariants/shapes/block/wood/chest/normal-kapok.json b/resources/assets/morevariants/shapes/block/wood/chest/normal-kapok.json new file mode 100644 index 0000000..5dca285 --- /dev/null +++ b/resources/assets/morevariants/shapes/block/wood/chest/normal-kapok.json @@ -0,0 +1,554 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "sides2": "morevariants:block/wood/trunk/kapok/sides", + "lid": "morevariants:block/wood/trunk/kapok/lid", + "accessories": "morevariants:block/wood/trunk/kapok/accessories" + }, + "elements": [ + { + "name": "origin", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 0.0, 0.0, 0.0 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false } + }, + "children": [ + { + "name": "floor", + "from": [ 2.0, 1.0, 2.0 ], + "to": [ 14.0, 2.0, 13.0 ], + "rotationOrigin": [ 1.0, 1.0, 1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "east": { "texture": "#lid", "uv": [ 1.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "south": { "texture": "#lid", "uv": [ 1.0, 14.0, 13.0, 15.0 ], "rotation": 180, "enabled": false }, + "west": { "texture": "#lid", "uv": [ 1.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "up": { "texture": "#lid", "uv": [ 1.0, 3.5, 13.0, 14.5 ] }, + "down": { "texture": "#lid", "uv": [ 1.0, 2.0, 13.0, 13.0 ] } + }, + "children": [ + { + "name": "S", + "from": [ -1.0, 0.0, 11.0 ], + "to": [ 13.0, 10.0, 12.0 ], + "rotationOrigin": [ -2.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.5, 4.0, 14.5, 14.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 14.0, 12.0 ] }, + "west": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 2.0, 9.0, 16.0, 10.0 ] }, + "down": { "texture": "#sides2", "uv": [ 2.0, 3.0, 16.0, 4.0 ] } + } + }, + { + "name": "W", + "from": [ -1.0, 0.0, 0.0 ], + "to": [ 0.0, 10.0, 11.0 ], + "rotationOrigin": [ -2.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ], "enabled": false }, + "east": { "texture": "#lid", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 4.5, 9.0, 15.5, 10.0 ], "rotation": 90 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 2.0, 2.0, 13.0 ] } + }, + "children": [ + { + "name": "L holder", + "from": [ -0.5, 7.0, 3.0 ], + "to": [ 0.0, 8.5, 4.5 ], + "rotationOrigin": [ 4.0, 9.0, -10.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ], "enabled": false }, + "south": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "west": { "texture": "#accessories", "uv": [ 1.0, 0.5, 2.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 1.5, 0.5, 3.0 ] } + } + }, + { + "name": "R holder", + "from": [ -0.5, 7.0, 6.5 ], + "to": [ 0.0, 8.5, 8.0 ], + "rotationOrigin": [ 4.0, 9.0, -6.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 1.5, 1.5, 3.0, 3.0 ], "enabled": false }, + "south": { "texture": "#accessories", "uv": [ 4.0, 0.5, 4.5, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 1.5 ] } + } + }, + { + "name": "handle 1", + "from": [ -1.0, 7.5, 3.5 ], + "to": [ -0.5, 8.0, 7.5 ], + "rotationOrigin": [ 3.5, 9.5, -9.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 2.5, 3.0, 3.0, 3.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 2.5, 4.5, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 4.0, 1.5 ], "rotation": 90 }, + "down": { "texture": "#accessories", "uv": [ 0.0, 2.5, 4.0, 3.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "E", + "from": [ 12.0, 0.0, 0.0 ], + "to": [ 13.0, 10.0, 11.0 ], + "rotationOrigin": [ 0.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 14.0, 2.0, 15.0, 12.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ], "enabled": false }, + "west": { "texture": "#lid", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 1.0, 1.5, 12.0, 2.5 ], "rotation": 90 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 2.0, 2.0, 13.0 ] } + }, + "children": [ + { + "name": "L holder1", + "from": [ 1.0, 7.0, 3.0 ], + "to": [ 1.5, 8.5, 4.5 ], + "rotationOrigin": [ 1.0, 8.5, 3.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "west": { "texture": "#accessories", "uv": [ 1.0, 0.5, 2.5, 2.0 ], "enabled": false }, + "up": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 1.5, 0.5, 3.0 ] } + } + }, + { + "name": "R holder2", + "from": [ 1.0, 7.0, 6.5 ], + "to": [ 1.5, 8.5, 8.0 ], + "rotationOrigin": [ 1.0, 8.5, 8.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 1.5, 1.5, 3.0, 3.0 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 0.5, 4.5, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ], "enabled": false }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 1.5 ] } + } + }, + { + "name": "handle 2", + "from": [ 1.5, 7.5, 3.5 ], + "to": [ 2.0, 8.0, 7.5 ], + "rotationOrigin": [ 2.0, 7.5, 3.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 2.5, 3.0, 3.0, 3.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 2.5, 4.5, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 4.0, 1.5 ], "rotation": 90 }, + "down": { "texture": "#accessories", "uv": [ 0.0, 2.5, 4.0, 3.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "N", + "from": [ -1.0, 0.0, -1.0 ], + "to": [ 13.0, 10.0, 0.0 ], + "rotationOrigin": [ -2.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 2.0, 14.0, 12.0 ] }, + "east": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ] }, + "south": { "texture": "#lid", "uv": [ 1.0, 2.0, 15.0, 12.0 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 2.0, 4.0, 16.0, 5.0 ], "rotation": 180 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 4.0, 15.0, 5.0 ] } + }, + "children": [ + { + "name": "hinge 1", + "from": [ 2.5, 9.0, 0.8 ], + "to": [ 3.5, 11.0, 1.3 ], + "rotationOrigin": [ 3.0, 9.0, 1.1 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + }, + { + "name": "hinge 2", + "from": [ 10.5, 9.0, 0.8 ], + "to": [ 11.5, 11.0, 1.3 ], + "rotationOrigin": [ 11.0, 9.0, 1.1 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + } + ] + }, + { + "name": "feet 1", + "from": [ -1.0, -1.0, -1.0 ], + "to": [ 1.0, 0.0, 1.0 ], + "rotationOrigin": [ -1.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 12.0, 2.0, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 2.0, 12.0, 4.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 2.5, 12.0, 4.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 3.5, 12.0, 5.5, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube14", + "from": [ 2.0, 0.5, 0.0 ], + "to": [ 3.5, 1.0, 1.0 ], + "rotationOrigin": [ 2.0, 0.5, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 1.0, 12.0, 2.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 2.5, 12.0, 3.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 6.5, 12.0, 8.0, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 13.0 ] } + } + }, + { + "name": "Cube15", + "from": [ 0.0, 0.5, 2.0 ], + "to": [ 1.0, 1.0, 3.5 ], + "rotationOrigin": [ 0.0, 0.5, 2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 0.0, 12.0, 1.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 1.5, 12.0, 2.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 2.5, 12.0, 4.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 14.5, 1.0, 16.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.5, 1.0, 16.0 ] } + } + } + ] + }, + { + "name": "feet 16", + "from": [ 11.0, -1.0, -1.0 ], + "to": [ 13.0, 0.0, 1.0 ], + "rotationOrigin": [ 11.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 1.5, 12.0, 3.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 9.5, 12.0, 11.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 10.0, 12.0, 12.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube17", + "from": [ -1.5, 0.5, 0.0 ], + "to": [ 0.0, 1.0, 1.0 ], + "rotationOrigin": [ -1.5, 0.5, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 2.5, 12.5, 4.0, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 8.5, 13.0, 10.0, 13.5 ] }, + "west": { "texture": "#sides2", "uv": [ 10.0, 12.0, 11.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.0, 13.0 ] } + } + }, + { + "name": "Cube18", + "from": [ 1.0, 0.5, 2.0 ], + "to": [ 2.0, 1.0, 3.5 ], + "rotationOrigin": [ 1.0, 0.5, 2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.0, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 14.5, 12.0, 15.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 3.0, 12.0, 4.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.5, 14.5, 2.0, 15.5 ], "rotation": 90, "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 1.5, 15.0, 3.0, 16.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "feet 19", + "from": [ 11.0, -1.0, 10.0 ], + "to": [ 13.0, 0.0, 12.0 ], + "rotationOrigin": [ 11.0, -1.0, 10.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 8.5, 12.0, 10.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube20", + "from": [ -1.5, 0.5, 1.0 ], + "to": [ 0.0, 1.0, 2.0 ], + "rotationOrigin": [ -1.5, 0.5, 1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 5.5, 12.0, 7.0, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 5.0, 12.0, 6.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 2.5, 12.0, 3.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 12.0, 1.5, 13.0 ] } + } + }, + { + "name": "Cube21", + "from": [ 1.0, 0.5, -1.5 ], + "to": [ 2.0, 1.0, 0.0 ], + "rotationOrigin": [ 1.0, 0.5, -1.5 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 10.0, 12.0, 11.0, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.0, 12.0, 2.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 1.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 2.0, 12.0, 3.5, 13.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "feet 22", + "from": [ -1.0, -1.0, 10.0 ], + "to": [ 1.0, 0.0, 12.0 ], + "rotationOrigin": [ -1.0, -1.0, 10.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 5.5, 12.0, 7.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.5, 12.0, 8.5, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 4.0, 12.0, 6.0, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 1.5, 12.0, 3.5, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube23", + "from": [ 2.0, 0.5, 1.0 ], + "to": [ 3.5, 1.0, 2.0 ], + "rotationOrigin": [ 2.0, 0.5, 1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 0.5, 12.0, 1.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 9.0, 12.0, 10.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.5, 12.0, 2.0, 13.0 ] } + } + }, + { + "name": "Cube24", + "from": [ 0.0, 0.5, -1.5 ], + "to": [ 1.0, 1.0, 0.0 ], + "rotationOrigin": [ 0.0, 0.5, -1.5 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 4.5, 12.0, 5.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 4.5, 11.5, 6.0, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 3.5, 12.0, 5.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 1.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 2.0, 14.5, 3.5, 15.5 ], "rotation": 90 } + } + } + ] + } + ] + }, + { + "name": "lid", + "from": [ 2.0, 12.0, 2.0 ], + "to": [ 14.0, 13.0, 13.0 ], + "rotationOrigin": [ 8.0, 11.0, 1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, + "east": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, + "south": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, + "west": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, + "up": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 11.0 ] }, + "down": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 11.0 ], "rotation": 180 } + }, + "children": [ + { + "name": "West", + "from": [ -1.0, -1.0, 0.0 ], + "to": [ 0.0, 1.0, 11.0 ], + "rotationOrigin": [ -1.0, -1.0, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.0, 11.0, 12.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.5, 0.0, 12.5, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 11.0 ] }, + "down": { "texture": "#sides2", "uv": [ 3.5, 12.5, 14.5, 13.5 ], "rotation": 90 } + } + }, + { + "name": "East", + "from": [ 12.0, -1.0, 0.0 ], + "to": [ 13.0, 1.0, 11.0 ], + "rotationOrigin": [ 12.0, -1.0, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.5, 0.0, 12.5, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 3.0, 11.0, 14.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 11.0 ] }, + "down": { "texture": "#sides2", "uv": [ 2.5, 13.5, 13.5, 14.5 ], "rotation": 90 } + } + }, + { + "name": "North", + "from": [ -1.0, -1.0, -1.0 ], + "to": [ 13.0, 1.0, 0.0 ], + "rotationOrigin": [ -1.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 2.0 ] }, + "east": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 2.0, 11.0, 16.0, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.5, 14.0, 15.5 ] } + }, + "children": [ + { + "name": "hinge 3", + "from": [ 2.5, -0.8, 1.0 ], + "to": [ 3.5, 1.2, 1.5 ], + "rotationOrigin": [ 3.0, -0.8, 1.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + }, + { + "name": "hinge 4", + "from": [ 10.5, -0.8, 1.0 ], + "to": [ 11.5, 1.2, 1.5 ], + "rotationOrigin": [ 11.0, -0.8, 1.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + } + ] + }, + { + "name": "South", + "from": [ -1.0, -1.0, 11.0 ], + "to": [ 13.0, 1.0, 12.0 ], + "rotationOrigin": [ -1.0, -1.0, 11.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.5, 11.0, 14.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 2.0 ] }, + "west": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#sides2", "uv": [ 0.5, 13.5, 14.5, 14.5 ] } + } + }, + { + "name": "Cube34", + "from": [ 4.5, -2.5, 12.0 ], + "to": [ 7.5, 0.0, 12.5 ], + "rotationOrigin": [ 4.5, -2.5, 12.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.5 ] }, + "south": { "texture": "#accessories", "uv": [ 9.0, 0.5, 12.0, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 0.5 ] } + } + }, + { + "name": "Cube35", + "from": [ 5.0, 0.0, 12.0 ], + "to": [ 7.0, 0.5, 12.5 ], + "rotationOrigin": [ 5.0, 0.0, 12.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ], "enabled": false }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 0.5 ] }, + "south": { "texture": "#accessories", "uv": [ 9.5, 0.0, 11.5, 0.5 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 0.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ], "enabled": false } + } + } + ] + } + ] + } + ], + "animations": [ + { + "name": "lidopen", + "code": "lidopen", + "quantityframes": 30, + "onActivityStopped": "Rewind", + "onAnimationEnd": "Hold", + "keyframes": [ + { + "frame": 0, + "elements": { + "origin": { }, + "lid": { "rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0 } + } + }, + { + "frame": 29, + "elements": { + "origin": { }, + "lid": { "rotationX": -67.5, "rotationY": 0.0, "rotationZ": 0.0 } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/resources/assets/morevariants/shapes/block/wood/chest/normal-maple.json b/resources/assets/morevariants/shapes/block/wood/chest/normal-maple.json new file mode 100644 index 0000000..8f03090 --- /dev/null +++ b/resources/assets/morevariants/shapes/block/wood/chest/normal-maple.json @@ -0,0 +1,554 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "sides2": "morevariants:block/wood/trunk/maple/sides", + "lid": "morevariants:block/wood/trunk/maple/lid", + "accessories": "morevariants:block/wood/trunk/maple/accessories" + }, + "elements": [ + { + "name": "origin", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 0.0, 0.0, 0.0 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false } + }, + "children": [ + { + "name": "floor", + "from": [ 2.0, 1.0, 2.0 ], + "to": [ 14.0, 2.0, 13.0 ], + "rotationOrigin": [ 1.0, 1.0, 1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "east": { "texture": "#lid", "uv": [ 1.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "south": { "texture": "#lid", "uv": [ 1.0, 14.0, 13.0, 15.0 ], "rotation": 180, "enabled": false }, + "west": { "texture": "#lid", "uv": [ 1.0, 0.0, 12.0, 1.0 ], "rotation": 180, "enabled": false }, + "up": { "texture": "#lid", "uv": [ 1.0, 3.5, 13.0, 14.5 ] }, + "down": { "texture": "#lid", "uv": [ 1.0, 2.0, 13.0, 13.0 ] } + }, + "children": [ + { + "name": "S", + "from": [ -1.0, 0.0, 11.0 ], + "to": [ 13.0, 10.0, 12.0 ], + "rotationOrigin": [ -2.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.5, 4.0, 14.5, 14.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 14.0, 12.0 ] }, + "west": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 2.0, 9.0, 16.0, 10.0 ] }, + "down": { "texture": "#sides2", "uv": [ 2.0, 3.0, 16.0, 4.0 ] } + } + }, + { + "name": "W", + "from": [ -1.0, 0.0, 0.0 ], + "to": [ 0.0, 10.0, 11.0 ], + "rotationOrigin": [ -2.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ], "enabled": false }, + "east": { "texture": "#lid", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 4.5, 9.0, 15.5, 10.0 ], "rotation": 90 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 2.0, 2.0, 13.0 ] } + }, + "children": [ + { + "name": "L holder", + "from": [ -0.5, 7.0, 3.0 ], + "to": [ 0.0, 8.5, 4.5 ], + "rotationOrigin": [ 4.0, 9.0, -10.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ], "enabled": false }, + "south": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "west": { "texture": "#accessories", "uv": [ 1.0, 0.5, 2.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 1.5, 0.5, 3.0 ] } + } + }, + { + "name": "R holder", + "from": [ -0.5, 7.0, 6.5 ], + "to": [ 0.0, 8.5, 8.0 ], + "rotationOrigin": [ 4.0, 9.0, -6.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 1.5, 1.5, 3.0, 3.0 ], "enabled": false }, + "south": { "texture": "#accessories", "uv": [ 4.0, 0.5, 4.5, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 1.5 ] } + } + }, + { + "name": "handle 1", + "from": [ -1.0, 7.5, 3.5 ], + "to": [ -0.5, 8.0, 7.5 ], + "rotationOrigin": [ 3.5, 9.5, -9.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 2.5, 3.0, 3.0, 3.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 2.5, 4.5, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 4.0, 1.5 ], "rotation": 90 }, + "down": { "texture": "#accessories", "uv": [ 0.0, 2.5, 4.0, 3.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "E", + "from": [ 12.0, 0.0, 0.0 ], + "to": [ 13.0, 10.0, 11.0 ], + "rotationOrigin": [ 0.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 14.0, 2.0, 15.0, 12.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ], "enabled": false }, + "west": { "texture": "#lid", "uv": [ 1.5, 2.0, 12.5, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 1.0, 1.5, 12.0, 2.5 ], "rotation": 90 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 2.0, 2.0, 13.0 ] } + }, + "children": [ + { + "name": "L holder1", + "from": [ 1.0, 7.0, 3.0 ], + "to": [ 1.5, 8.5, 4.5 ], + "rotationOrigin": [ 1.0, 8.5, 3.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "west": { "texture": "#accessories", "uv": [ 1.0, 0.5, 2.5, 2.0 ], "enabled": false }, + "up": { "texture": "#accessories", "uv": [ 4.0, 1.0, 4.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 1.5, 0.5, 3.0 ] } + } + }, + { + "name": "R holder2", + "from": [ 1.0, 7.0, 6.5 ], + "to": [ 1.5, 8.5, 8.0 ], + "rotationOrigin": [ 1.0, 8.5, 8.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 1.5, 1.5, 3.0, 3.0 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 0.5, 4.5, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.5, 1.0, 2.0, 2.5 ], "enabled": false }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 0.5, 2.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 1.5 ] } + } + }, + { + "name": "handle 2", + "from": [ 1.5, 7.5, 3.5 ], + "to": [ 2.0, 8.0, 7.5 ], + "rotationOrigin": [ 2.0, 7.5, 3.5 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 2.5, 3.0, 3.0, 3.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "south": { "texture": "#accessories", "uv": [ 4.0, 2.5, 4.5, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 3.0, 4.0, 3.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 1.0, 4.0, 1.5 ], "rotation": 90 }, + "down": { "texture": "#accessories", "uv": [ 0.0, 2.5, 4.0, 3.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "N", + "from": [ -1.0, 0.0, -1.0 ], + "to": [ 13.0, 10.0, 0.0 ], + "rotationOrigin": [ -2.0, -1.0, -2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 2.0, 14.0, 12.0 ] }, + "east": { "texture": "#sides2", "uv": [ 13.0, 2.0, 14.0, 12.0 ] }, + "south": { "texture": "#lid", "uv": [ 1.0, 2.0, 15.0, 12.0 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 2.0, 1.0, 12.0 ] }, + "up": { "texture": "#lid", "uv": [ 2.0, 4.0, 16.0, 5.0 ], "rotation": 180 }, + "down": { "texture": "#sides2", "uv": [ 1.0, 4.0, 15.0, 5.0 ] } + }, + "children": [ + { + "name": "hinge 1", + "from": [ 2.5, 9.0, 0.8 ], + "to": [ 3.5, 11.0, 1.3 ], + "rotationOrigin": [ 3.0, 9.0, 1.1 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + }, + { + "name": "hinge 2", + "from": [ 10.5, 9.0, 0.8 ], + "to": [ 11.5, 11.0, 1.3 ], + "rotationOrigin": [ 11.0, 9.0, 1.1 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + } + ] + }, + { + "name": "feet 1", + "from": [ -1.0, -1.0, -1.0 ], + "to": [ 1.0, 0.0, 1.0 ], + "rotationOrigin": [ -1.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 12.0, 2.0, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 2.0, 12.0, 4.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 2.5, 12.0, 4.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 3.5, 12.0, 5.5, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube14", + "from": [ 2.0, 0.5, 0.0 ], + "to": [ 3.5, 1.0, 1.0 ], + "rotationOrigin": [ 2.0, 0.5, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 1.0, 12.0, 2.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 2.5, 12.0, 3.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 6.5, 12.0, 8.0, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 13.0 ] } + } + }, + { + "name": "Cube15", + "from": [ 0.0, 0.5, 2.0 ], + "to": [ 1.0, 1.0, 3.5 ], + "rotationOrigin": [ 0.0, 0.5, 2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 0.0, 12.0, 1.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 1.5, 12.0, 2.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 2.5, 12.0, 4.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 14.5, 1.0, 16.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.5, 1.0, 16.0 ] } + } + } + ] + }, + { + "name": "feet 16", + "from": [ 11.0, -1.0, -1.0 ], + "to": [ 13.0, 0.0, 1.0 ], + "rotationOrigin": [ 11.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 1.5, 12.0, 3.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 9.5, 12.0, 11.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 10.0, 12.0, 12.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube17", + "from": [ -1.5, 0.5, 0.0 ], + "to": [ 0.0, 1.0, 1.0 ], + "rotationOrigin": [ -1.5, 0.5, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 2.5, 12.5, 4.0, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 8.5, 13.0, 10.0, 13.5 ] }, + "west": { "texture": "#sides2", "uv": [ 10.0, 12.0, 11.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.0, 13.0 ] } + } + }, + { + "name": "Cube18", + "from": [ 1.0, 0.5, 2.0 ], + "to": [ 2.0, 1.0, 3.5 ], + "rotationOrigin": [ 1.0, 0.5, 2.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.0, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 14.5, 12.0, 15.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 3.0, 12.0, 4.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.5, 14.5, 2.0, 15.5 ], "rotation": 90, "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 1.5, 15.0, 3.0, 16.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "feet 19", + "from": [ 11.0, -1.0, 10.0 ], + "to": [ 13.0, 0.0, 12.0 ], + "rotationOrigin": [ 11.0, -1.0, 10.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 8.5, 12.0, 10.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 4.5, 12.0, 6.5, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 6.0, 12.0, 8.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube20", + "from": [ -1.5, 0.5, 1.0 ], + "to": [ 0.0, 1.0, 2.0 ], + "rotationOrigin": [ -1.5, 0.5, 1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 5.5, 12.0, 7.0, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "south": { "texture": "#sides2", "uv": [ 5.0, 12.0, 6.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 2.5, 12.0, 3.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 12.0, 1.5, 13.0 ] } + } + }, + { + "name": "Cube21", + "from": [ 1.0, 0.5, -1.5 ], + "to": [ 2.0, 1.0, 0.0 ], + "rotationOrigin": [ 1.0, 0.5, -1.5 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 10.0, 12.0, 11.0, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.0, 12.0, 2.5, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 1.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 2.0, 12.0, 3.5, 13.0 ], "rotation": 90 } + } + } + ] + }, + { + "name": "feet 22", + "from": [ -1.0, -1.0, 10.0 ], + "to": [ 1.0, 0.0, 12.0 ], + "rotationOrigin": [ -1.0, -1.0, 10.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 5.5, 12.0, 7.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 6.5, 12.0, 8.5, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 4.0, 12.0, 6.0, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 1.5, 12.0, 3.5, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 2.0, 2.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.0, 2.0, 16.0 ] } + }, + "children": [ + { + "name": "Cube23", + "from": [ 2.0, 0.5, 1.0 ], + "to": [ 3.5, 1.0, 2.0 ], + "rotationOrigin": [ 2.0, 0.5, 1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 6.0, 12.0, 7.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 0.5, 12.0, 1.5, 12.5 ] }, + "south": { "texture": "#sides2", "uv": [ 9.0, 12.0, 10.5, 12.5 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.5, 1.0 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 0.5, 12.0, 2.0, 13.0 ] } + } + }, + { + "name": "Cube24", + "from": [ 0.0, 0.5, -1.5 ], + "to": [ 1.0, 1.0, 0.0 ], + "rotationOrigin": [ 0.0, 0.5, -1.5 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 4.5, 12.0, 5.5, 12.5 ] }, + "east": { "texture": "#sides2", "uv": [ 4.5, 11.5, 6.0, 12.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 0.5 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 3.5, 12.0, 5.0, 12.5 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 1.5 ], "enabled": false }, + "down": { "texture": "#sides2", "uv": [ 2.0, 14.5, 3.5, 15.5 ], "rotation": 90 } + } + } + ] + } + ] + }, + { + "name": "lid", + "from": [ 2.0, 12.0, 2.0 ], + "to": [ 14.0, 13.0, 13.0 ], + "rotationOrigin": [ 8.0, 11.0, 1.0 ], + "faces": { + "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, + "east": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, + "south": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, + "west": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, + "up": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 11.0 ] }, + "down": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 11.0 ], "rotation": 180 } + }, + "children": [ + { + "name": "West", + "from": [ -1.0, -1.0, 0.0 ], + "to": [ 0.0, 1.0, 11.0 ], + "rotationOrigin": [ -1.0, -1.0, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.0, 11.0, 12.0, 13.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 1.5, 0.0, 12.5, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 11.0 ] }, + "down": { "texture": "#sides2", "uv": [ 3.5, 12.5, 14.5, 13.5 ], "rotation": 90 } + } + }, + { + "name": "East", + "from": [ 12.0, -1.0, 0.0 ], + "to": [ 13.0, 1.0, 11.0 ], + "rotationOrigin": [ 12.0, -1.0, 0.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "east": { "texture": "#sides2", "uv": [ 1.5, 0.0, 12.5, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ], "enabled": false }, + "west": { "texture": "#sides2", "uv": [ 3.0, 11.0, 14.0, 13.0 ] }, + "up": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 11.0 ] }, + "down": { "texture": "#sides2", "uv": [ 2.5, 13.5, 13.5, 14.5 ], "rotation": 90 } + } + }, + { + "name": "North", + "from": [ -1.0, -1.0, -1.0 ], + "to": [ 13.0, 1.0, 0.0 ], + "rotationOrigin": [ -1.0, -1.0, -1.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 2.0 ] }, + "east": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 2.0, 11.0, 16.0, 13.0 ] }, + "west": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#sides2", "uv": [ 0.0, 14.5, 14.0, 15.5 ] } + }, + "children": [ + { + "name": "hinge 3", + "from": [ 2.5, -0.8, 1.0 ], + "to": [ 3.5, 1.2, 1.5 ], + "rotationOrigin": [ 3.0, -0.8, 1.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + }, + { + "name": "hinge 4", + "from": [ 10.5, -0.8, 1.0 ], + "to": [ 11.5, 1.2, 1.5 ], + "rotationOrigin": [ 11.0, -0.8, 1.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "south": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 1.0, 0.5 ] } + } + } + ] + }, + { + "name": "South", + "from": [ -1.0, -1.0, 11.0 ], + "to": [ 13.0, 1.0, 12.0 ], + "rotationOrigin": [ -1.0, -1.0, 11.0 ], + "faces": { + "north": { "texture": "#sides2", "uv": [ 0.5, 11.0, 14.5, 13.0 ] }, + "east": { "texture": "#sides2", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "south": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 2.0 ] }, + "west": { "texture": "#sides2", "uv": [ 13.0, 0.0, 14.0, 2.0 ] }, + "up": { "texture": "#sides2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#sides2", "uv": [ 0.5, 13.5, 14.5, 14.5 ] } + } + }, + { + "name": "Cube34", + "from": [ 4.5, -2.5, 12.0 ], + "to": [ 7.5, 0.0, 12.5 ], + "rotationOrigin": [ 4.5, -2.5, 12.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 2.5 ] }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.5 ] }, + "south": { "texture": "#accessories", "uv": [ 9.0, 0.5, 12.0, 3.0 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 2.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 3.0, 0.5 ] } + } + }, + { + "name": "Cube35", + "from": [ 5.0, 0.0, 12.0 ], + "to": [ 7.0, 0.5, 12.5 ], + "rotationOrigin": [ 5.0, 0.0, 12.0 ], + "faces": { + "north": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ], "enabled": false }, + "east": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 0.5 ] }, + "south": { "texture": "#accessories", "uv": [ 9.5, 0.0, 11.5, 0.5 ] }, + "west": { "texture": "#accessories", "uv": [ 0.0, 0.0, 0.5, 0.5 ] }, + "up": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ] }, + "down": { "texture": "#accessories", "uv": [ 0.0, 0.0, 2.0, 0.5 ], "enabled": false } + } + } + ] + } + ] + } + ], + "animations": [ + { + "name": "lidopen", + "code": "lidopen", + "quantityframes": 30, + "onActivityStopped": "Rewind", + "onAnimationEnd": "Hold", + "keyframes": [ + { + "frame": 0, + "elements": { + "origin": { }, + "lid": { "rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0 } + } + }, + { + "frame": 29, + "elements": { + "origin": { }, + "lid": { "rotationX": -67.5, "rotationY": 0.0, "rotationZ": 0.0 } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/resources/assets/game/shapes/block/wood/chest/outdated-opened.json b/resources/assets/morevariants/shapes/block/wood/chest/normal-pine.json similarity index 97% rename from resources/assets/game/shapes/block/wood/chest/outdated-opened.json rename to resources/assets/morevariants/shapes/block/wood/chest/normal-pine.json index 5c33334..2c3d31b 100644 --- a/resources/assets/game/shapes/block/wood/chest/outdated-opened.json +++ b/resources/assets/morevariants/shapes/block/wood/chest/normal-pine.json @@ -1,14 +1,16 @@ { "editor": { "allAngles": false, - "singleTexture": false + "entityTextureMode": false }, "textureWidth": 16, "textureHeight": 16, + "textureSizes": { + }, "textures": { - "sides2": "block/wood/trunk/outdated/sides", - "lid": "block/wood/trunk/outdated/lid", - "accessories": "block/wood/trunk/outdated/accessories" + "sides2": "morevariants:block/wood/trunk/pine/sides", + "lid": "morevariants:block/wood/trunk/pine/lid", + "accessories": "morevariants:block/wood/trunk/pine/accessories" }, "elements": [ { @@ -396,7 +398,6 @@ "from": [ 2.0, 12.0, 2.0 ], "to": [ 14.0, 13.0, 13.0 ], "rotationOrigin": [ 8.0, 11.0, 1.0 ], - "rotationX": -67.5, "faces": { "north": { "texture": "#lid", "uv": [ 0.0, 0.0, 12.0, 1.0 ], "enabled": false }, "east": { "texture": "#lid", "uv": [ 0.5, 0.0, 11.5, 1.0 ], "enabled": false }, @@ -524,4 +525,30 @@ } ] } - ]} + ], + "animations": [ + { + "name": "lidopen", + "code": "lidopen", + "quantityframes": 30, + "onActivityStopped": "Rewind", + "onAnimationEnd": "Hold", + "keyframes": [ + { + "frame": 0, + "elements": { + "origin": { }, + "lid": { "rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0 } + } + }, + { + "frame": 29, + "elements": { + "origin": { }, + "lid": { "rotationX": -67.5, "rotationY": 0.0, "rotationZ": 0.0 } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/resources/assets/morevariants/textures/block/wood/trunk/accessories.png b/resources/assets/morevariants/textures/block/wood/trunk/accessories.png new file mode 100644 index 0000000000000000000000000000000000000000..2e47fcfa061da81ec4fa20d7a2f02417397a05b5 GIT binary patch literal 2294 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 U@yA>X7XSbN07*qoM6N<$f+Zg$m;e9( literal 0 HcmV?d00001 diff --git a/resources/assets/morevariants/textures/block/wood/trunk/acacia/lid.png b/resources/assets/morevariants/textures/block/wood/trunk/lid/acacia.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/acacia/lid.png rename to resources/assets/morevariants/textures/block/wood/trunk/lid/acacia.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/aged/lid.png b/resources/assets/morevariants/textures/block/wood/trunk/lid/aged.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/aged/lid.png rename to resources/assets/morevariants/textures/block/wood/trunk/lid/aged.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/birch/lid.png b/resources/assets/morevariants/textures/block/wood/trunk/lid/birch.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/birch/lid.png rename to resources/assets/morevariants/textures/block/wood/trunk/lid/birch.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/kapok/lid.png b/resources/assets/morevariants/textures/block/wood/trunk/lid/kapok.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/kapok/lid.png rename to resources/assets/morevariants/textures/block/wood/trunk/lid/kapok.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/maple/lid.png b/resources/assets/morevariants/textures/block/wood/trunk/lid/maple.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/maple/lid.png rename to resources/assets/morevariants/textures/block/wood/trunk/lid/maple.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/pine/lid.png b/resources/assets/morevariants/textures/block/wood/trunk/lid/pine.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/pine/lid.png rename to resources/assets/morevariants/textures/block/wood/trunk/lid/pine.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/outdated/accessories.png b/resources/assets/morevariants/textures/block/wood/trunk/outdated/accessories.png deleted file mode 100644 index 080b2e36794a7174aba608cd59ca0c712e7c62be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10597 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 diff --git a/resources/assets/morevariants/textures/block/wood/trunk/outdated/lid.png b/resources/assets/morevariants/textures/block/wood/trunk/outdated/lid.png deleted file mode 100644 index f79c8029fd0bb8e079f8dbd9f89259722047ce77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10860 zcmeI2RZ|>H6R3A_g1g(I3&AzGEEp-k-v9srEJX!~#_LG?KS4uz?L7kmt^fectN<-N zFAZ~FS~m|@8+#{fS}%V$Yg%hRdm8}2Z@D(h-h-hFEAr)%P+Zy_n6c%SaE28W6guW$ zpDs9q=cAW>qLcAO5n)uBfzRdTuwdjVqMp>kdrWDHeK)3lP6H#4=HN1kVokmq}F z=x$BGbV$h|SY$R$LMk}QBXm=aSn)jM?WM6FsYJ%ZpW8asP$q4|NMXuAmGvOntr6zF zAo$4XgYeUKEci&x56e8++PJzgl9&nkoT0!qRNB39h=?sMQ%gk~eckrlcfI^+six`j zVwFtvQ&n+aP}e%=WBq#HTdzd3lPAqS&!Nt6$x&{tcVeC-$mhE$nq7C-C&B(9FB<0b zL@hc0l)|3KPVomGah!$>cW*Pd7OuL3&aH!qX=RU`DN&4=U#w`RY+q7wpa?T84=qVQQ+QcYER70j^5g)rxTv~D&<~l3x!E`Yr?}Sc` zL36&P%5RTp#`hHgP(~uQ&Qy)}Y(2x-U*?V8*S5~DNq-v6>`XVbZ*5%=$+?-+ul5Yx z?MI_ehK+;aTW$CFm+IQyCln#Ot?umr%ROlCCmm)9IJ9U1JjEmODjND8IxgqHbt?o($fN-Ua z>NOZyTZKQ+AeKW8BX?FScSoC>HM0%J=h62#MC-)$@Zac3sA2nA#rV6llNa@O6|+xT zoqY?(INF9!QhS*8NN>(V=gMpmJB~}ZowN^^g^Z_6 zorMm~c+kFkV5kl4yBSb}t$L?&o}4gcaO7<8#4m%HPt{(6f{yF&-eSxpd~lSK$kF13 zk7eT$eXr9;%_jt=M%8trTsl!m=^LlftbUMQuSObgTq+j)G_h1ei*R~xJ;dipZ>jVh zi8encjF8a=tg;{?#5&QeY3ejlU$clMElKyAm2>zYR$MoZ&Mb-11@7zrr!Yr8f{@7ujG zXnmQ8mx2lN$MZFDsKOajbl&F7M}K0LhP+Yi$r!?NuoZcCk~`%UW>Z?9MKcm~>dw)W zDohEwqUXGL?w6%XP{u^G4{7uv9a2zh{=SQtCZu#Ir63S#do3PovC~rI`ZlCRIJvXC zvZN2Sia8J)A-l!cY+wUQcthz&`tg+fFVot}W}w4tt9*1@T^>;CF}NIvYtkoM0U8V` zfWi=y8m>dKokwzc;W?&U4S%~G&wILA9tsPSLfd~iFf?)|R?=s!35a46-!dVo6H5cf z-2J2&I@vX(1NFwMz=`+2atGlo_NnAqSkR#U_CL|B+J|ALXLhk3C3Wb2R8{yg-kIj9 z9@xORun2%$EYfiG^vt`7!ttU$RBd(u_4f~8hMi+42Cw*wFd#5VtK=p`XWp*S=y<4J z{&O`eUzpY=BDW_lnY1r*Qq1b0n2!yGlG=b7nF0k=4sPvLv5e%1Yvp^EF3&1nlT{f* z;z1cpK$|acN&GSJ@KC|#i7 zsasj^Ts>(LTrr2q#m9$NH<_U2FT3`Y0$`bB^hGDqtUh0@cuHWQ21Lmq^Rz!TY z403&3ixnodTB>D~&!qH)MuV8V(ctlf≤RW&8dB&YBtPF4C7-k7{H=keevLab6>m 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 literal 0 HcmV?d00001 diff --git a/resources/assets/morevariants/textures/block/wood/trunk/acacia/sides.png b/resources/assets/morevariants/textures/block/wood/trunk/sides/acacia.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/acacia/sides.png rename to resources/assets/morevariants/textures/block/wood/trunk/sides/acacia.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/aged/sides.png b/resources/assets/morevariants/textures/block/wood/trunk/sides/aged.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/aged/sides.png rename to resources/assets/morevariants/textures/block/wood/trunk/sides/aged.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/birch/sides.png b/resources/assets/morevariants/textures/block/wood/trunk/sides/birch.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/birch/sides.png rename to resources/assets/morevariants/textures/block/wood/trunk/sides/birch.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/kapok/sides.png b/resources/assets/morevariants/textures/block/wood/trunk/sides/kapok.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/kapok/sides.png rename to resources/assets/morevariants/textures/block/wood/trunk/sides/kapok.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/maple/sides.png b/resources/assets/morevariants/textures/block/wood/trunk/sides/maple.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/maple/sides.png rename to resources/assets/morevariants/textures/block/wood/trunk/sides/maple.png diff --git a/resources/assets/morevariants/textures/block/wood/trunk/pine/sides.png b/resources/assets/morevariants/textures/block/wood/trunk/sides/pine.png similarity index 100% rename from resources/assets/morevariants/textures/block/wood/trunk/pine/sides.png rename to resources/assets/morevariants/textures/block/wood/trunk/sides/pine.png diff --git a/resources/modinfo.json b/resources/modinfo.json index 6859443..1a1d732 100644 --- a/resources/modinfo.json +++ b/resources/modinfo.json @@ -4,7 +4,7 @@ "name": "More Variants", "description": "Adds different variants for blocks", "authors": ["DArkHekRoMaNT"], - "version": "1.3.1", + "version": "1.4.0", "dependencies": { "game": "1.14.0" },