diff --git a/src/main/java/net/montoyo/wd/WebDisplays.java b/src/main/java/net/montoyo/wd/WebDisplays.java index eaa11db..d4bb46c 100644 --- a/src/main/java/net/montoyo/wd/WebDisplays.java +++ b/src/main/java/net/montoyo/wd/WebDisplays.java @@ -44,6 +44,7 @@ import net.montoyo.wd.controls.ScreenControlRegistry; import net.montoyo.wd.core.*; import net.montoyo.wd.init.BlockInit; import net.montoyo.wd.init.ItemInit; +import net.montoyo.wd.init.TabInit; import net.montoyo.wd.init.TileInit; import net.montoyo.wd.miniserv.server.Server; import net.montoyo.wd.net.WDNetworkRegistry; @@ -51,7 +52,6 @@ import net.montoyo.wd.net.client_bound.S2CMessageServerInfo; import net.montoyo.wd.utilities.DistSafety; import net.montoyo.wd.utilities.Log; import net.montoyo.wd.utilities.Util; -import org.apache.maven.artifact.versioning.ArtifactVersion; import java.io.*; import java.net.MalformedURLException; @@ -66,7 +66,6 @@ public class WebDisplays { public static SharedProxy PROXY = null; -// public static ceativeTab CREATIVE_TAB; public static final ResourceLocation ADV_PAD_BREAK = new ResourceLocation("webdisplays", "webdisplays/pad_break"); public static final String BLACKLIST_URL = "mod://webdisplays/blacklisted.html"; public static final Gson GSON = new Gson(); @@ -119,9 +118,7 @@ public class WebDisplays { } CommonConfig.init(); - -// CREATIVE_TAB = new WDCreativeTab(); - + //Criterions criterionPadBreak = new Criterion("pad_break"); criterionUpgradeScreen = new Criterion("upgrade_screen"); @@ -133,6 +130,7 @@ public class WebDisplays { WDNetworkRegistry.init(); SOUNDS.register(bus); onRegisterSounds(); + TabInit.init(bus); BlockInit.init(bus); ItemInit.init(bus); TileInit.init(bus); diff --git a/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java b/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java index 9a05cb9..158c9c3 100644 --- a/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java +++ b/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java @@ -27,7 +27,7 @@ import static com.mojang.math.Axis.*; public final class MinePadRenderer implements IItemRenderer { private static final float PI = (float) Math.PI; private final Minecraft mc = Minecraft.getInstance(); - private final ResourceLocation tex = new ResourceLocation("webdisplays", "textures/models/minepad.png"); + private final ResourceLocation tex = new ResourceLocation("webdisplays", "textures/item/model/minepad.png"); private final ModelMinePad model = new ModelMinePad(); private final ClientProxy clientProxy = (ClientProxy) WebDisplays.PROXY; diff --git a/src/main/java/net/montoyo/wd/client/renderers/ModelMinePad.java b/src/main/java/net/montoyo/wd/client/renderers/ModelMinePad.java index 55a170d..9e0fd83 100644 --- a/src/main/java/net/montoyo/wd/client/renderers/ModelMinePad.java +++ b/src/main/java/net/montoyo/wd/client/renderers/ModelMinePad.java @@ -48,7 +48,7 @@ public final class ModelMinePad { float z = 0; - VertexConsumer consumer = buffers.getBuffer(RenderType.entityCutout(new ResourceLocation("webdisplays:textures/models/minepad_item.png"))); + VertexConsumer consumer = buffers.getBuffer(RenderType.entityCutout(new ResourceLocation("webdisplays:textures/item/model/minepad_item.png"))); consumer.vertex(positionMatrix, (float) x1, (float) y1 - padding, z).color(255, 255, 255, 255).uv(1f / width, 12f / height).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(0.25f, 0.5f, 1).endVertex(); consumer.vertex(positionMatrix, (float) x2, (float) y1 - padding, z).color(255, 255, 255, 255).uv(19f / width, 12f / height).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(0.25f, 0.5f, 1).endVertex(); diff --git a/src/main/java/net/montoyo/wd/core/WDCreativeTab.java b/src/main/java/net/montoyo/wd/core/WDCreativeTab.java deleted file mode 100644 index bb149ce..0000000 --- a/src/main/java/net/montoyo/wd/core/WDCreativeTab.java +++ /dev/null @@ -1,21 +0,0 @@ -///* -// * Copyright (C) 2018 BARBOTIN Nicolas -// */ -// -//package net.montoyo.wd.core; -// -//import net.minecraft.world.item.CreativeModeTab; -//import net.minecraft.world.item.ItemStack; -//import net.montoyo.wd.init.BlockInit; -// -//public class WDCreativeTab extends CreativeModeTab { -// -// public WDCreativeTab() { -// super("webdisplays"); -// } -// -// @Override -// public ItemStack makeIcon() { -// return new ItemStack(BlockInit.blockScreen.get()); -// } -//} diff --git a/src/main/java/net/montoyo/wd/init/ItemInit.java b/src/main/java/net/montoyo/wd/init/ItemInit.java index 03a6837..f4b9a7f 100644 --- a/src/main/java/net/montoyo/wd/init/ItemInit.java +++ b/src/main/java/net/montoyo/wd/init/ItemInit.java @@ -19,7 +19,7 @@ public class ItemInit{ public static void init(IEventBus bus) { ITEMS.register(bus); } - + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "webdisplays"); protected static final RegistryObject[] COMP_CRAFT_ITEMS = new RegistryObject[CraftComponent.values().length]; @@ -60,6 +60,14 @@ public class ItemInit{ return UPGRADE_ITEMS[index]; } + public static int countCompCraftItems() { + return COMP_CRAFT_ITEMS.length; + } + + public static int countUpgrades() { + return UPGRADE_ITEMS.length; + } + public static boolean isCompCraftItem(Item item) { for (RegistryObject itemRegistryObject : COMP_CRAFT_ITEMS) if (item == itemRegistryObject.get()) diff --git a/src/main/java/net/montoyo/wd/init/TabInit.java b/src/main/java/net/montoyo/wd/init/TabInit.java new file mode 100644 index 0000000..e8286e7 --- /dev/null +++ b/src/main/java/net/montoyo/wd/init/TabInit.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2018 BARBOTIN Nicolas + */ + +package net.montoyo.wd.init; + +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; +import net.montoyo.wd.init.ItemInit; + +public class TabInit { + public static final DeferredRegister TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, "webdisplays"); + + public static final RegistryObject EXAMPLE_TAB = TABS.register("main", () -> CreativeModeTab.builder() + // Set name of tab to display + .title(Component.translatable("itemGroup.webdisplays")) + // Set icon of creative tab + .icon(() -> new ItemStack(ItemInit.SCREEN.get())) + // Add default items to tab + .displayItems((params, output) -> { + // core items + output.accept(ItemInit.SCREEN.get()); + output.accept(ItemInit.KEYBOARD.get()); + output.accept(ItemInit.LINKER.get()); + // remote control + output.accept(ItemInit.REMOTE_CONTROLLER.get()); + // redstone stuff + output.accept(ItemInit.REDSTONE_CONTROLLER.get()); + // admin tools + output.accept(ItemInit.OWNERSHIP_THEIF.get()); + // tool items + output.accept(ItemInit.SERVER.get()); + output.accept(ItemInit.CONFIGURATOR.get()); + output.accept(ItemInit.MINEPAD.get()); + output.accept(ItemInit.LASER_POINTER.get()); + + // upgrades + for (int i = 0; i < ItemInit.countUpgrades(); i++) output.accept(ItemInit.getUpgradeItem(i).get()); + // cc + for (int i = 0; i < ItemInit.countCompCraftItems(); i++) output.accept(ItemInit.getComputerCraftItem(i).get()); + }) + .build() + ); + + public static void init(IEventBus bus) { + TABS.register(bus); + } +} diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json new file mode 100644 index 0000000..19f2c74 --- /dev/null +++ b/src/main/resources/assets/minecraft/atlases/blocks.json @@ -0,0 +1,8 @@ +{ + "sources": [ + { + "type": "single", + "resource": "block/screen0" + } + ] +} diff --git a/src/main/resources/assets/webdisplays/models/block/kb_left.json b/src/main/resources/assets/webdisplays/models/block/kb_left.json index 0ac99d3..d0a3c75 100644 --- a/src/main/resources/assets/webdisplays/models/block/kb_left.json +++ b/src/main/resources/assets/webdisplays/models/block/kb_left.json @@ -1,7 +1,7 @@ { "__comment": "Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "particle": "webdisplays:blocks/kb_key", + "particle": "webdisplays:block/kb_key", "0": "webdisplays:block/kb_base", "1": "webdisplays:block/kb_key" }, diff --git a/src/main/resources/assets/webdisplays/models/item/kb_left.json b/src/main/resources/assets/webdisplays/models/item/kb_left.json deleted file mode 100644 index d0a3c75..0000000 --- a/src/main/resources/assets/webdisplays/models/item/kb_left.json +++ /dev/null @@ -1,503 +0,0 @@ -{ - "__comment": "Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "webdisplays:block/kb_key", - "0": "webdisplays:block/kb_base", - "1": "webdisplays:block/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": [ 4.0, 1.0, 4.0 ], - "to": [ 5.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": [ 13.0, 1.0, 4.0 ], - "to": [ 14.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": [ 15.0, 1.0, 4.0 ], - "to": [ 16.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": "Key8", - "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": "Key9", - "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": "Key10", - "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": "Key11", - "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": "Key12", - "from": [ 9.0, 1.0, 6.0 ], - "to": [ 10.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": [ 11.0, 1.0, 6.0 ], - "to": [ 12.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": [ 13.0, 1.0, 6.0 ], - "to": [ 14.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": "Key15", - "from": [ 15.0, 1.0, 6.0 ], - "to": [ 16.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": "Key16", - "from": [ 1.0, 1.0, 8.0 ], - "to": [ 3.0, 2.0, 9.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": "Key17", - "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": "Key18", - "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": "Key19", - "from": [ 8.0, 1.0, 8.0 ], - "to": [ 9.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": [ 10.0, 1.0, 8.0 ], - "to": [ 11.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": [ 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": "Key22", - "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": "Key23", - "from": [ 1.0, 1.0, 10.0 ], - "to": [ 4.0, 2.0, 11.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": "Key24", - "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": "Key25", - "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": "Key26", - "from": [ 9.0, 1.0, 10.0 ], - "to": [ 10.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": [ 11.0, 1.0, 10.0 ], - "to": [ 12.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": "Key28", - "from": [ 13.0, 1.0, 10.0 ], - "to": [ 14.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": [ 15.0, 1.0, 10.0 ], - "to": [ 16.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": "Key30", - "from": [ 1.0, 1.0, 12.0 ], - "to": [ 3.0, 2.0, 13.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": "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": [ 9.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": "Key34", - "from": [ 10.0, 1.0, 12.0 ], - "to": [ 11.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": "Key35", - "from": [ 12.0, 1.0, 12.0 ], - "to": [ 13.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": "Key36", - "from": [ 14.0, 1.0, 12.0 ], - "to": [ 15.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": "Key37", - "from": [ 1.0, 1.0, 14.0 ], - "to": [ 3.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": [ 4.0, 1.0, 14.0 ], - "to": [ 6.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": [ 7.0, 1.0, 14.0 ], - "to": [ 9.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": "Key40", - "from": [ 10.0, 1.0, 14.0 ], - "to": [ 16.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/webdisplays/models/item/kb_right.json b/src/main/resources/assets/webdisplays/models/item/kb_right.json deleted file mode 100644 index 3784bdf..0000000 --- a/src/main/resources/assets/webdisplays/models/item/kb_right.json +++ /dev/null @@ -1,477 +0,0 @@ -{ - "__comment": "Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "webdisplays:block/kb_key", - "0": "webdisplays:block/kb_base", - "1": "webdisplays:block/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 diff --git a/src/main/resources/assets/webdisplays/models/item/minepad.json b/src/main/resources/assets/webdisplays/models/item/minepad.json index 1add614..b6a307f 100644 --- a/src/main/resources/assets/webdisplays/models/item/minepad.json +++ b/src/main/resources/assets/webdisplays/models/item/minepad.json @@ -1 +1 @@ -{"credit":"Made with Blockbench","texture_size":[32,16],"textures":{"1":"webdisplays:models/minepad","particle":"webdisplays:models/minepad"},"elements":[{"from":[1,0,0],"to":[15,1,9],"rotation":{"angle":0,"axis":"y","origin":[1,0,3.5]},"faces":{"north":{"uv":[0,9,7,10],"texture":"#1"},"east":{"uv":[14.5,0,15,9],"rotation":270,"texture":"#1"},"south":{"uv":[7,9,14,10],"texture":"#1"},"west":{"uv":[14,0,14.5,9],"rotation":90,"texture":"#1"},"up":{"uv":[7,9,0,0],"texture":"#1"},"down":{"uv":[14,0,7,9],"texture":"#1"}}},{"from":[15,0,1],"to":[16,1,8],"rotation":{"angle":0,"axis":"y","origin":[15,0,4.5]},"faces":{"north":{"uv":[8.5,13,8,14],"texture":"#1"},"east":{"uv":[9,12,5.5,11],"texture":"#1"},"south":{"uv":[9,13,8.5,14],"texture":"#1"},"up":{"uv":[9,11,5.5,10],"texture":"#1"},"down":{"uv":[9,13,5.5,12],"texture":"#1"}}},{"from":[0,0,1],"to":[1,1,8],"rotation":{"angle":0,"axis":"y","origin":[15,0,4.5]},"faces":{"north":{"uv":[5,13,4.5,14],"texture":"#1"},"south":{"uv":[5.5,13,5,14],"texture":"#1"},"west":{"uv":[5.5,12,2,11],"texture":"#1"},"up":{"uv":[5.5,11,2,10],"texture":"#1"},"down":{"uv":[5.5,13,2,12],"texture":"#1"}}}],"display":{"thirdperson_righthand":{"rotation":[95.5,-180,0],"translation":[0,6.75,9]},"thirdperson_lefthand":{"rotation":[95.5,-180,0],"translation":[0,6.75,9]},"ground":{"rotation":[-90,0,0],"translation":[0,11.5,-7.6]},"gui":{"rotation":[90,0,0],"translation":[0,-3.5,0]},"head":{"rotation":[-90,0,0],"translation":[0,14.25,-0.75]},"fixed":{"rotation":[-90,0,0],"translation":[0,0,-7.5]}},"groups":[{"name":"bone","origin":[0,0,0],"color":0,"children":[0,1,2]}]} \ No newline at end of file +{"credit":"Made with Blockbench","texture_size":[32,16],"textures":{"1":"webdisplays:item/model/minepad","particle":"webdisplays:item/model/minepad"},"elements":[{"from":[1,0,0],"to":[15,1,9],"rotation":{"angle":0,"axis":"y","origin":[1,0,3.5]},"faces":{"north":{"uv":[0,9,7,10],"texture":"#1"},"east":{"uv":[14.5,0,15,9],"rotation":270,"texture":"#1"},"south":{"uv":[7,9,14,10],"texture":"#1"},"west":{"uv":[14,0,14.5,9],"rotation":90,"texture":"#1"},"up":{"uv":[7,9,0,0],"texture":"#1"},"down":{"uv":[14,0,7,9],"texture":"#1"}}},{"from":[15,0,1],"to":[16,1,8],"rotation":{"angle":0,"axis":"y","origin":[15,0,4.5]},"faces":{"north":{"uv":[8.5,13,8,14],"texture":"#1"},"east":{"uv":[9,12,5.5,11],"texture":"#1"},"south":{"uv":[9,13,8.5,14],"texture":"#1"},"up":{"uv":[9,11,5.5,10],"texture":"#1"},"down":{"uv":[9,13,5.5,12],"texture":"#1"}}},{"from":[0,0,1],"to":[1,1,8],"rotation":{"angle":0,"axis":"y","origin":[15,0,4.5]},"faces":{"north":{"uv":[5,13,4.5,14],"texture":"#1"},"south":{"uv":[5.5,13,5,14],"texture":"#1"},"west":{"uv":[5.5,12,2,11],"texture":"#1"},"up":{"uv":[5.5,11,2,10],"texture":"#1"},"down":{"uv":[5.5,13,2,12],"texture":"#1"}}}],"display":{"thirdperson_righthand":{"rotation":[95.5,-180,0],"translation":[0,6.75,9]},"thirdperson_lefthand":{"rotation":[95.5,-180,0],"translation":[0,6.75,9]},"ground":{"rotation":[-90,0,0],"translation":[0,11.5,-7.6]},"gui":{"rotation":[90,0,0],"translation":[0,-3.5,0]},"head":{"rotation":[-90,0,0],"translation":[0,14.25,-0.75]},"fixed":{"rotation":[-90,0,0],"translation":[0,0,-7.5]}},"groups":[{"name":"bone","origin":[0,0,0],"color":0,"children":[0,1,2]}]} \ No newline at end of file diff --git a/src/main/resources/assets/webdisplays/textures/models/minepad.png b/src/main/resources/assets/webdisplays/textures/item/model/minepad.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/models/minepad.png rename to src/main/resources/assets/webdisplays/textures/item/model/minepad.png diff --git a/src/main/resources/assets/webdisplays/textures/models/minepad_item.png b/src/main/resources/assets/webdisplays/textures/item/model/minepad_item.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/models/minepad_item.png rename to src/main/resources/assets/webdisplays/textures/item/model/minepad_item.png