From ff8537be568a4dff0f4a552dc372d289b2184282 Mon Sep 17 00:00:00 2001 From: crazy-piggy <57442208+crazy-piggy@users.noreply.github.com> Date: Thu, 15 Jul 2021 22:26:21 +0800 Subject: [PATCH] Support 1.17.* A new bug in Main.java: Line 83 to 110 --- src/main/java/io/github/chemiscraft/Main.java | 39 +- .../chemiscraft/blockstates/iron_stand.json | 7 +- .../chemiscraft/blockstates/iron_trivet.json | 7 + .../assets/chemiscraft/lang/zh_cn.json | 1 + .../chemiscraft/models/block/iron_trivet.json | 381 ++++++++++++++++++ .../chemiscraft/models/item/iron_trivet.json | 381 ++++++++++++++++++ .../textures/block/iron_trivet.png | Bin 0 -> 162 bytes .../chemiscraft/textures/item/iron_ring.png | Bin 0 -> 205 bytes 8 files changed, 812 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/chemiscraft/blockstates/iron_trivet.json create mode 100644 src/main/resources/assets/chemiscraft/models/block/iron_trivet.json create mode 100644 src/main/resources/assets/chemiscraft/models/item/iron_trivet.json create mode 100644 src/main/resources/assets/chemiscraft/textures/block/iron_trivet.png create mode 100644 src/main/resources/assets/chemiscraft/textures/item/iron_ring.png diff --git a/src/main/java/io/github/chemiscraft/Main.java b/src/main/java/io/github/chemiscraft/Main.java index 4cc91df..a91a3ea 100644 --- a/src/main/java/io/github/chemiscraft/Main.java +++ b/src/main/java/io/github/chemiscraft/Main.java @@ -5,8 +5,17 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.item.*; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.registry.Registry; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; + +import static net.minecraft.block.FacingBlock.FACING; public class Main implements ModInitializer { public static final String MODID = "chemiscraft"; @@ -38,8 +47,8 @@ public class Main implements ModInitializer { public static final Item HELIUM_9 = new Item (new Item.Settings().group(ELEMENT)); public static final Item HELIUM_10 = new Item (new Item.Settings().group(ELEMENT)); /*Block*/ - public static final Block IRON_STAND = new Block(FabricBlockSettings.of(Material.METAL).hardness(0.0f)); public static final Block IRON_TRIVET = new Block(FabricBlockSettings.of(Material.METAL).hardness(0.0f)); + private static final IronStand IRON_STAND = new IronStand(FabricBlockSettings.of(Material.METAL).hardness(0.0f)); @Override public void onInitialize() { /*Block*/ @@ -71,4 +80,32 @@ public void onInitialize() { Registry.register(Registry.ITEM, new Identifier(MODID, "helium_9"), HELIUM_9); Registry.register(Registry.ITEM, new Identifier(MODID, "helium_10"), HELIUM_10); } + //这里会崩 + //我也不知道为啥 + public static class IronStand extends Block { + public IronStand(Settings settings){ + super(settings); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(Properties.HORIZONTAL_FACING); + } + + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos) { + Direction dir = state.get(FACING); + return switch (dir) { + case NORTH -> VoxelShapes.cuboid(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f); + case SOUTH -> VoxelShapes.cuboid(0.0f, 0.0f, 0.5f, 1.0f, 1.0f, 1.0f); + case EAST -> VoxelShapes.cuboid(0.5f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); + case WEST -> VoxelShapes.cuboid(0.0f, 0.0f, 0.0f, 0.5f, 1.0f, 1.0f); + default -> VoxelShapes.fullCube(); + }; + } + + public BlockState getPlacementState(ItemPlacementContext ctx) { + return (BlockState)this.getDefaultState().with(FACING, ctx.getPlayerFacing()); + } + } + // } diff --git a/src/main/resources/assets/chemiscraft/blockstates/iron_stand.json b/src/main/resources/assets/chemiscraft/blockstates/iron_stand.json index 2d0cc78..f735e69 100644 --- a/src/main/resources/assets/chemiscraft/blockstates/iron_stand.json +++ b/src/main/resources/assets/chemiscraft/blockstates/iron_stand.json @@ -1,7 +1,8 @@ { "variants": { - "": { - "model": "chemiscraft:block/iron_stand" - } + "facing=north": { "model": "chemiscraft:block/iron_stand" }, + "facing=east": { "model": "chemiscraft:block/iron_stand", "y": 90}, + "facing=south": { "model": "chemiscraft:block/iron_stand", "y": 180 }, + "facing=west": { "model": "chemiscraft:block/iron_stand", "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/chemiscraft/blockstates/iron_trivet.json b/src/main/resources/assets/chemiscraft/blockstates/iron_trivet.json new file mode 100644 index 0000000..fa939ee --- /dev/null +++ b/src/main/resources/assets/chemiscraft/blockstates/iron_trivet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "chemiscraft:block/iron_trivet" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chemiscraft/lang/zh_cn.json b/src/main/resources/assets/chemiscraft/lang/zh_cn.json index 54d0c3d..3042728 100644 --- a/src/main/resources/assets/chemiscraft/lang/zh_cn.json +++ b/src/main/resources/assets/chemiscraft/lang/zh_cn.json @@ -1,5 +1,6 @@ { "block.chemiscraft.iron_stand": "铁架台", + "block.chemiscraft.iron_trivet": "铁三脚架", "item.chemiscraft.iron_stand_ring": "铁架台-铁圈", "item.chemiscraft.iron_stand_base": "铁架台-底座", diff --git a/src/main/resources/assets/chemiscraft/models/block/iron_trivet.json b/src/main/resources/assets/chemiscraft/models/block/iron_trivet.json new file mode 100644 index 0000000..1fed782 --- /dev/null +++ b/src/main/resources/assets/chemiscraft/models/block/iron_trivet.json @@ -0,0 +1,381 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "chemiscraft:block/iron_trivet", + "particle": "chemiscraft:block/iron_trivet" + }, + "elements": [ + { + "name": "ring1", + "from": [6, 11, 1], + "to": [10, 12, 2], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring2", + "from": [4, 11, 2], + "to": [6, 12, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring3", + "from": [3, 11, 3], + "to": [4, 12, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring4", + "from": [2, 11, 4], + "to": [3, 12, 6], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring5", + "from": [1, 11, 6], + "to": [2, 12, 10], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring6", + "from": [2, 11, 10], + "to": [3, 12, 12], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring7", + "from": [3, 11, 12], + "to": [4, 12, 13], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring8", + "from": [4, 11, 13], + "to": [6, 12, 14], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring9", + "from": [6, 11, 14], + "to": [10, 12, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring10", + "from": [10, 11, 13], + "to": [12, 12, 14], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring11", + "from": [12, 11, 12], + "to": [13, 12, 13], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring12", + "from": [13, 11, 10], + "to": [14, 12, 12], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring13", + "from": [14, 11, 6], + "to": [15, 12, 10], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring14", + "from": [13, 11, 4], + "to": [14, 12, 6], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring15", + "from": [12, 11, 3], + "to": [13, 12, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring16", + "from": [10, 11, 2], + "to": [12, 12, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 2, 1], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 6, 2], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [2, 6, 2], + "to": [3, 10, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [3, 10, 3], + "to": [4, 11, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 2, 1], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 6, 2], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [13, 6, 2], + "to": [14, 10, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 10, 3], + "to": [13, 11, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [7, 0, 15], + "to": [8, 6, 16], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [7, 6, 14], + "to": [8, 11, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0.25, 0, -2], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0.25, 0, -2], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [-45, 45, 1], + "translation": [1, 2.25, 0], + "scale": [0.75, 0.75, 0.75] + }, + "head": { + "translation": [0.25, 8.5, 0] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, 0, -8] + } + }, + "groups": [ + { + "name": "ring", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + }, + { + "name": "leg1", + "origin": [8, 8, 8], + "children": [16, 17, 18, 19] + }, + { + "name": "leg2", + "origin": [8, 8, 8], + "children": [20, 21, 22, 23] + }, + { + "name": "leg3", + "origin": [8, 8, 8], + "children": [24, 25] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/chemiscraft/models/item/iron_trivet.json b/src/main/resources/assets/chemiscraft/models/item/iron_trivet.json new file mode 100644 index 0000000..1fed782 --- /dev/null +++ b/src/main/resources/assets/chemiscraft/models/item/iron_trivet.json @@ -0,0 +1,381 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "chemiscraft:block/iron_trivet", + "particle": "chemiscraft:block/iron_trivet" + }, + "elements": [ + { + "name": "ring1", + "from": [6, 11, 1], + "to": [10, 12, 2], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring2", + "from": [4, 11, 2], + "to": [6, 12, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring3", + "from": [3, 11, 3], + "to": [4, 12, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring4", + "from": [2, 11, 4], + "to": [3, 12, 6], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring5", + "from": [1, 11, 6], + "to": [2, 12, 10], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring6", + "from": [2, 11, 10], + "to": [3, 12, 12], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring7", + "from": [3, 11, 12], + "to": [4, 12, 13], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring8", + "from": [4, 11, 13], + "to": [6, 12, 14], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring9", + "from": [6, 11, 14], + "to": [10, 12, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring10", + "from": [10, 11, 13], + "to": [12, 12, 14], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring11", + "from": [12, 11, 12], + "to": [13, 12, 13], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring12", + "from": [13, 11, 10], + "to": [14, 12, 12], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring13", + "from": [14, 11, 6], + "to": [15, 12, 10], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring14", + "from": [13, 11, 4], + "to": [14, 12, 6], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring15", + "from": [12, 11, 3], + "to": [13, 12, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "name": "ring16", + "from": [10, 11, 2], + "to": [12, 12, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [1, 2, 1], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [1, 2, 1], + "to": [2, 6, 2], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [2, 6, 2], + "to": [3, 10, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [3, 10, 3], + "to": [4, 11, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 2, 1], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [14, 2, 1], + "to": [15, 6, 2], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [13, 6, 2], + "to": [14, 10, 3], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 10, 3], + "to": [13, 11, 4], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [7, 0, 15], + "to": [8, 6, 16], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [7, 6, 14], + "to": [8, 11, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0.25, 0, -2], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0.25, 0, -2], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [-45, 45, 1], + "translation": [1, 2.25, 0], + "scale": [0.75, 0.75, 0.75] + }, + "head": { + "translation": [0.25, 8.5, 0] + }, + "fixed": { + "rotation": [0, -180, 0], + "translation": [0, 0, -8] + } + }, + "groups": [ + { + "name": "ring", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + }, + { + "name": "leg1", + "origin": [8, 8, 8], + "children": [16, 17, 18, 19] + }, + { + "name": "leg2", + "origin": [8, 8, 8], + "children": [20, 21, 22, 23] + }, + { + "name": "leg3", + "origin": [8, 8, 8], + "children": [24, 25] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/chemiscraft/textures/block/iron_trivet.png b/src/main/resources/assets/chemiscraft/textures/block/iron_trivet.png new file mode 100644 index 0000000000000000000000000000000000000000..d3d6a2bd244850608c18e3aaeeaddf2abbbaba33 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBpt+}uV~B-+@`=-@fAh2OJV{a$6cl9hVo<&? z<-dZ|AyrueM#G!492rs=TobM|1Ts4$oRB_nfPrB*qj8Bp^QS#PBN#kg{an^LB{Ts5 D*pVvT literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chemiscraft/textures/item/iron_ring.png b/src/main/resources/assets/chemiscraft/textures/item/iron_ring.png new file mode 100644 index 0000000000000000000000000000000000000000..d724ff14de466cc02f068dd8eb78da50f1024771 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!6Z)?#}Etuy^{jD7!)~Na{b?(jdc#Zye*>X zp8qowzQEp&2mHd!N?E4Y4kfJEB=Ea`-Tmb=H8P!Y)@J()JmOT#otd{GZ|ck?&sucL wdECoA=2;zzud=#la8+2WO=E8DK3fKT