diff --git a/gradle.properties b/gradle.properties index c6004e3..b6708a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.19.2+build.28 loader_version=0.14.14 # Mod Properties -mod_version = 1.3.2 +mod_version = 1.3.3 maven_group = net.montoyo.wd archives_base_name = webdisplays diff --git a/src/main/java/net/montoyo/wd/block/BlockKeyboardLeft.java b/src/main/java/net/montoyo/wd/block/BlockKeyboardLeft.java index e22ce6b..6ba1b93 100644 --- a/src/main/java/net/montoyo/wd/block/BlockKeyboardLeft.java +++ b/src/main/java/net/montoyo/wd/block/BlockKeyboardLeft.java @@ -40,6 +40,13 @@ public class BlockKeyboardLeft extends BlockPeripheral { public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST); // public static final DirectionProperty HALF = DirectionProperty.create("facing", Direction.EAST, Direction.WEST); + public static final VoxelShape[] KEYBOARD_AABBS = new VoxelShape[]{ + Shapes.box(0.0, 0.0, 3.0 / 16, 1.0, 1.0 / 16.0, 1.0), + Shapes.box(0.0, 0.0, 0.0, 1.0, 1.0 / 16.0, 13 / 16.0), + Shapes.box(3.0 / 16, 0.0, 0.0, 1.0, 1.0 / 16.0, 1.0), + Shapes.box(0.0, 0.0, 0.0, 13 / 16.0, 1.0 / 16.0, 1.0), + }; + private static final Property[] properties = new Property[] {TYPE, FACING}; public BlockKeyboardLeft() { @@ -110,7 +117,7 @@ public class BlockKeyboardLeft extends BlockPeripheral { @Override public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { - return state.getValue(TYPE) == DefaultPeripheral.KEYBOARD ? BlockKeyboardRight.KEYBOARD_AABB : Shapes.block(); + return KEYBOARD_AABBS[state.getValue(FACING).ordinal() - 2]; } @Override diff --git a/src/main/java/net/montoyo/wd/block/BlockKeyboardRight.java b/src/main/java/net/montoyo/wd/block/BlockKeyboardRight.java index 4752e77..56b724e 100644 --- a/src/main/java/net/montoyo/wd/block/BlockKeyboardRight.java +++ b/src/main/java/net/montoyo/wd/block/BlockKeyboardRight.java @@ -32,11 +32,12 @@ import net.montoyo.wd.utilities.BlockSide; import net.montoyo.wd.utilities.Vector3i; import org.jetbrains.annotations.NotNull; +import static net.montoyo.wd.block.BlockKeyboardLeft.KEYBOARD_AABBS; + // TODO: merge into KeyboardLeft public class BlockKeyboardRight extends Block implements IPeripheral { public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; - public static final VoxelShape KEYBOARD_AABB = Shapes.box(0.0, 0.0, 0.0, 1.0, 1.0 / 16.0, 1.0); public BlockKeyboardRight() { super(Properties.of(Material.STONE) @@ -80,7 +81,7 @@ public class BlockKeyboardRight extends Block implements IPeripheral { @Override public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { - return KEYBOARD_AABB; + return KEYBOARD_AABBS[state.getValue(FACING).ordinal() - 2]; } @Override diff --git a/src/main/java/net/montoyo/wd/block/BlockPeripheral.java b/src/main/java/net/montoyo/wd/block/BlockPeripheral.java index 7a2cd13..b16072c 100644 --- a/src/main/java/net/montoyo/wd/block/BlockPeripheral.java +++ b/src/main/java/net/montoyo/wd/block/BlockPeripheral.java @@ -102,7 +102,7 @@ public class BlockPeripheral extends WDBlockContainer { @Override public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { - return state.getValue(type) == DefaultPeripheral.KEYBOARD ? BlockKeyboardRight.KEYBOARD_AABB : Shapes.block(); + return Shapes.block(); } @Override diff --git a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java index 371847a..9acde3b 100644 --- a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java +++ b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java @@ -18,7 +18,6 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; @@ -126,7 +125,7 @@ public class TileEntityScreen extends BlockEntity { ret.upgrades = new ArrayList<>(); for (int i = 0; i < upgrades.size(); i++) - ret.upgrades.add(new ItemStack((ItemLike) upgrades.getCompound(i))); + ret.upgrades.add(ItemStack.of(upgrades.getCompound(i))); if (tag.contains("AutoVolume")) ret.autoVolume = tag.getBoolean("AutoVolume"); diff --git a/src/main/java/net/montoyo/wd/item/ItemUpgrade.java b/src/main/java/net/montoyo/wd/item/ItemUpgrade.java index 7d869b0..76fb9e1 100644 --- a/src/main/java/net/montoyo/wd/item/ItemUpgrade.java +++ b/src/main/java/net/montoyo/wd/item/ItemUpgrade.java @@ -36,7 +36,7 @@ public class ItemUpgrade extends ItemMulti implements IUpgrade, WDItem { @Override public boolean isSameUpgrade(@Nonnull ItemStack myStack, @Nonnull ItemStack otherStack) { - return otherStack.getItem() == this && otherStack == myStack; + return otherStack.getItem() == this; } @Override diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index cc7f57f..916ea02 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -10,7 +10,7 @@ issueTrackerURL="" #optional modId="webdisplays" #mandatory -version="1.3.2" #mandatory +version="1.3.3" #mandatory displayName="WebDisplays" #mandatory diff --git a/src/main/resources/assets/webdisplays/models/block/kb_right.json b/src/main/resources/assets/webdisplays/models/block/kb_right.json index eeaba91..05ce5ac 100644 --- a/src/main/resources/assets/webdisplays/models/block/kb_right.json +++ b/src/main/resources/assets/webdisplays/models/block/kb_right.json @@ -1,477 +1 @@ -{ - "__comment": "Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "webdisplays:blocks/kb_key", - "0": "webdisplays:blocks/kb_base", - "1": "webdisplays:blocks/kb_key" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 3.0 ], - "to": [ 16.0, 1.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 13.0 ], "cullface": "down" } - } - }, - { - "name": "Key1", - "from": [ 1.0, 1.0, 4.0 ], - "to": [ 2.0, 2.0, 5.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key2", - "from": [ 3.0, 1.0, 4.0 ], - "to": [ 4.0, 2.0, 5.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key3", - "from": [ 6.0, 1.0, 4.0 ], - "to": [ 7.0, 2.0, 5.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key4", - "from": [ 8.0, 1.0, 4.0 ], - "to": [ 9.0, 2.0, 5.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key5", - "from": [ 10.0, 1.0, 4.0 ], - "to": [ 11.0, 2.0, 5.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key6", - "from": [ 12.0, 1.0, 4.0 ], - "to": [ 13.0, 2.0, 5.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key7", - "from": [ 1.0, 1.0, 6.0 ], - "to": [ 2.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key8", - "from": [ 3.0, 1.0, 6.0 ], - "to": [ 4.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key9", - "from": [ 5.0, 1.0, 6.0 ], - "to": [ 6.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key10", - "from": [ 7.0, 1.0, 6.0 ], - "to": [ 8.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key11", - "from": [ 9.0, 1.0, 6.0 ], - "to": [ 11.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } - } - }, - { - "name": "Key12", - "from": [ 12.0, 1.0, 6.0 ], - "to": [ 13.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key13", - "from": [ 14.0, 1.0, 6.0 ], - "to": [ 15.0, 2.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key14", - "from": [ 0.0, 1.0, 8.0 ], - "to": [ 1.0, 2.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key15", - "from": [ 2.0, 1.0, 8.0 ], - "to": [ 3.0, 2.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key16", - "from": [ 4.0, 1.0, 8.0 ], - "to": [ 5.0, 2.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key17", - "from": [ 6.0, 1.0, 8.0 ], - "to": [ 7.0, 2.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key18", - "from": [ 8.0, 1.0, 8.0 ], - "to": [ 11.0, 2.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] } - } - }, - { - "name": "Key19", - "from": [ 12.0, 1.0, 8.0 ], - "to": [ 13.0, 2.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key20", - "from": [ 14.0, 1.0, 8.0 ], - "to": [ 15.0, 2.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key21", - "from": [ 1.0, 1.0, 10.0 ], - "to": [ 2.0, 2.0, 11.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key22", - "from": [ 3.0, 1.0, 10.0 ], - "to": [ 4.0, 2.0, 11.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key23", - "from": [ 5.0, 1.0, 10.0 ], - "to": [ 6.0, 2.0, 11.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key24", - "from": [ 7.0, 1.0, 10.0 ], - "to": [ 8.0, 2.0, 11.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key25", - "from": [ 9.0, 1.0, 9.0 ], - "to": [ 11.0, 2.0, 11.0 ], - "faces": { - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 0.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Key26", - "from": [ 12.0, 1.0, 10.0 ], - "to": [ 13.0, 2.0, 11.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key27", - "from": [ 14.0, 1.0, 10.0 ], - "to": [ 15.0, 2.0, 11.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key29", - "from": [ 0.0, 1.0, 12.0 ], - "to": [ 1.0, 2.0, 13.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key30", - "from": [ 2.0, 1.0, 12.0 ], - "to": [ 3.0, 2.0, 13.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key31", - "from": [ 4.0, 1.0, 12.0 ], - "to": [ 5.0, 2.0, 13.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key32", - "from": [ 6.0, 1.0, 12.0 ], - "to": [ 7.0, 2.0, 13.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key33", - "from": [ 8.0, 1.0, 12.0 ], - "to": [ 11.0, 2.0, 13.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] } - } - }, - { - "name": "Key34", - "from": [ 13.0, 1.0, 13.0 ], - "to": [ 14.0, 2.0, 14.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "Key35", - "from": [ 0.0, 1.0, 14.0 ], - "to": [ 2.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } - } - }, - { - "name": "Key36", - "from": [ 3.0, 1.0, 14.0 ], - "to": [ 5.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } - } - }, - { - "name": "Key37", - "from": [ 6.0, 1.0, 14.0 ], - "to": [ 8.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } - } - }, - { - "name": "Key38", - "from": [ 9.0, 1.0, 14.0 ], - "to": [ 11.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } - } - }, - { - "name": "Key39", - "from": [ 12.0, 1.0, 14.0 ], - "to": [ 15.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 1.0 ] } - } - } - ] -} \ No newline at end of file +{"credit":"Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)","textures":{"0":"webdisplays:blocks/kb_base","1":"webdisplays:blocks/kb_key","particle":"webdisplays:blocks/kb_key"},"elements":[{"from":[0,0,3],"to":[16,1,16],"faces":{"north":{"uv":[0,0,16,1],"texture":"#0"},"east":{"uv":[0,0,13,1],"texture":"#0"},"south":{"uv":[0,0,16,1],"texture":"#0"},"west":{"uv":[0,0,13,1],"texture":"#0"},"up":{"uv":[0,0,16,13],"texture":"#0"},"down":{"uv":[0,0,16,13],"texture":"#0","cullface":"down"}}},{"from":[1,1,4],"to":[2,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,4],"to":[4,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,4],"to":[7,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,4],"to":[9,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[10,1,4],"to":[11,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[12,1,4],"to":[13,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[1,1,6],"to":[2,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,6],"to":[4,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[5,1,6],"to":[6,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[7,1,6],"to":[8,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[9,1,6],"to":[11,2,7],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[12,1,6],"to":[13,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,6],"to":[15,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,8],"to":[1,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[2,1,8],"to":[3,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[4,1,8],"to":[5,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,8],"to":[7,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,8],"to":[11,2,9],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}},{"from":[12,1,8],"to":[13,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,8],"to":[15,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[1,1,10],"to":[2,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,10],"to":[4,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[5,1,10],"to":[6,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[7,1,10],"to":[8,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[9,1,9],"to":[11,2,11],"faces":{"east":{"uv":[0,0,2,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,2,1],"texture":"#1"},"up":{"uv":[0,0,2,2],"texture":"#1"}}},{"from":[12,1,10],"to":[13,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,10],"to":[15,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,12],"to":[1,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[2,1,12],"to":[3,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[4,1,12],"to":[5,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,12],"to":[7,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,12],"to":[11,2,13],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}},{"from":[13,1,13],"to":[14,2,14],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,14],"to":[2,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[3,1,14],"to":[5,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[6,1,14],"to":[8,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[9,1,14],"to":[11,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[12,1,14],"to":[15,2,15],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}}]} \ No newline at end of file