From 391981e4ff52c659df009a2cb9b1b1381bcfb551 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 1 Nov 2019 17:54:09 -0500 Subject: [PATCH] 'Fix' ccc item render --- .../botania/common/block/ModBlocks.java | 3 +- .../models/item/corporea_crystal_cube.json | 255 ++++++++++++++++-- 2 files changed, 228 insertions(+), 30 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index f1aa853d3..be95ca00a 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -799,6 +799,7 @@ public final class ModBlocks { register(r, new ItemBlockMod(infusedGrass, props), infusedGrass.getRegistryName()); register(r, new ItemBlockMod(mutatedGrass, props), mutatedGrass.getRegistryName()); register(r, new ItemBlockMod(animatedTorch, props), animatedTorch.getRegistryName()); + register(r, new ItemBlockMod(corporeaCrystalCube, props), corporeaCrystalCube.getRegistryName()); DistExecutor.runForDist(() -> () -> registerWithTEISRS(r), () -> () -> registerWithoutTEISRS(r)); } @@ -816,7 +817,6 @@ public final class ModBlocks { register(r, new ItemBlockMod(avatar, props), avatar.getRegistryName()); register(r, new ItemBlockMod(bellows, props), bellows.getRegistryName()); register(r, new ItemBlockMod(brewery, props), brewery.getRegistryName()); - register(r, new ItemBlockMod(corporeaCrystalCube, props), corporeaCrystalCube.getRegistryName()); register(r, new ItemBlockMod(corporeaIndex, props), corporeaIndex.getRegistryName()); register(r, new ItemBlockMod(hourglass, props), hourglass.getRegistryName()); return null; @@ -833,7 +833,6 @@ public final class ModBlocks { register(r, new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))), avatar.getRegistryName()); register(r, new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))), bellows.getRegistryName()); register(r, new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))), brewery.getRegistryName()); - register(r, new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaCrystalCube, TileCorporeaCrystalCube.class))), corporeaCrystalCube.getRegistryName()); register(r, new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))), corporeaIndex.getRegistryName()); register(r, new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))), hourglass.getRegistryName()); return null; diff --git a/src/main/resources/assets/botania/models/item/corporea_crystal_cube.json b/src/main/resources/assets/botania/models/item/corporea_crystal_cube.json index 3326413b3..1ab11c1d9 100644 --- a/src/main/resources/assets/botania/models/item/corporea_crystal_cube.json +++ b/src/main/resources/assets/botania/models/item/corporea_crystal_cube.json @@ -1,35 +1,234 @@ { - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] + "comment0": "Combination of block/corporea_crystal_cube_glass/corporea_crystal_cube_base", + "comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", + "parent": "minecraft:block/block", + "textures": { + "cloth": "botania:blocks/corporea_crystal_cube_cloth", + "base": "botania:blocks/corporea_crystal_cube_base", + "glass": "botania:blocks/corporea_crystal_cube_glass", + "particle": "botania:blocks/corporea_crystal_cube_base" + }, + "elements": [ + { + "name": "glass", + "from": [ 4, 8, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "up": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "north": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "south": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "west": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "east": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] } + } }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] + { + "__comment": "base", + "from": [ 5, 0, 5 ], + "to": [ 11, 2, 11 ], + "faces": { + "down": { "uv": [ 10, 0, 16, 6 ], "texture": "#base" }, + "north": { "uv": [ 10, 6, 16, 8 ], "texture": "#base" }, + "south": { "uv": [ 10, 6, 16, 8 ], "texture": "#base" }, + "west": { "uv": [ 10, 8, 16, 10 ], "texture": "#base" }, + "east": { "uv": [ 10, 8, 16, 10 ], "texture": "#base" } + } }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] + { + "__comment": "bottom", + "from": [ 3, 2, 3 ], + "to": [ 13, 2.001, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 10, 10 ], "texture": "#base" } + } }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] + { + "__comment": "top", + "from": [ 3, 6, 3 ], + "to": [ 13, 6.001, 13 ], + "faces": { + "up": { "uv": [ 0, 0, 10, 10 ], "texture": "#cloth" } + } }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] + { + "__comment": "l1", + "from": [ 3, 1, 3 ], + "to": [ 3.001, 6, 5 ], + "faces": { + "west": { "uv": [ 0, 10, 2, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 9, 10, 11, 15 ], "texture": "#cloth" } + } }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] + { + "__comment": "l2", + "from": [ 3, 2, 5 ], + "to": [ 3.001, 6, 7 ], + "faces": { + "west": { "uv": [ 2, 11, 4, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 7, 11, 9, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "l3", + "from": [ 3, 1, 7 ], + "to": [ 3.001, 6, 9 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 7, 10, 9, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "l4", + "from": [ 3, 2, 9 ], + "to": [ 3.001, 6, 11 ], + "faces": { + "west": { "uv": [ 6, 11, 8, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 5, 11, 7, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "l5", + "from": [ 3, 1, 11 ], + "to": [ 3.001, 6, 13 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 7, 10, 9, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r1", + "from": [ 13, 1, 11 ], + "to": [ 13.001, 6, 13 ], + "faces": { + "west": { "uv": [ 1, 10, 3, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 10, 10, 12, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r2", + "from": [ 13, 2, 9 ], + "to": [ 13.001, 6, 11 ], + "faces": { + "west": { "uv": [ 2, 11, 4, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 8, 11, 10, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r3", + "from": [ 13, 1, 7 ], + "to": [ 13.001, 6, 9 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 6, 10, 8, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r4", + "from": [ 13, 2, 5 ], + "to": [ 13.001, 6, 7 ], + "faces": { + "west": { "uv": [ 6, 11, 8, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 4, 11, 6, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "r5", + "from": [ 13, 1, 3 ], + "to": [ 13.001, 6, 5 ], + "faces": { + "west": { "uv": [ 4, 10, 6, 15 ], "texture": "#cloth" }, + "east": { "uv": [ 2, 10, 4, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f1", + "from": [ 3, 1, 13 ], + "to": [ 5, 6, 13.001 ], + "faces": { + "north": { "uv": [ 1, 10, 3, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 10, 10, 12, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f2", + "from": [ 5, 2, 13 ], + "to": [ 7, 6, 13.001 ], + "faces": { + "north": { "uv": [ 3, 11, 5, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 8, 11, 10, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f3", + "from": [ 7, 1, 13 ], + "to": [ 9, 6, 13.001 ], + "faces": { + "north": { "uv": [ 5, 10, 7, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 6, 10, 8, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f4", + "from": [ 9, 2, 13 ], + "to": [ 11, 6, 13.001 ], + "faces": { + "north": { "uv": [ 7, 11, 9, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 4, 11, 6, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "f5", + "from": [ 11, 1, 13 ], + "to": [ 13, 6, 13.001 ], + "faces": { + "north": { "uv": [ 9, 10, 11, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 2, 10, 4, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b1", + "from": [ 11, 1, 3 ], + "to": [ 13, 6, 3.001 ], + "faces": { + "north": { "uv": [ 1, 10, 3, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 10, 10, 12, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b2", + "from": [ 9, 2, 3 ], + "to": [ 11, 6, 3.001 ], + "faces": { + "north": { "uv": [ 3, 11, 5, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 8, 11, 10, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b3", + "from": [ 7, 1, 3 ], + "to": [ 9, 6, 3.001 ], + "faces": { + "north": { "uv": [ 5, 10, 7, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 6, 10, 8, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b4", + "from": [ 5, 2, 3 ], + "to": [ 7, 6, 3.001 ], + "faces": { + "north": { "uv": [ 7, 11, 9, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 4, 11, 6, 15 ], "texture": "#cloth" } + } + }, + { + "__comment": "b5", + "from": [ 3, 1, 3 ], + "to": [ 5, 6, 3.001 ], + "faces": { + "north": { "uv": [ 9, 10, 11, 15 ], "texture": "#cloth" }, + "south": { "uv": [ 2, 10, 4, 15 ], "texture": "#cloth" } + } } - } -} \ No newline at end of file + ] +}