diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java index ccb6356..d297978 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java @@ -13,27 +13,18 @@ import net.minecraft.util.math.RotationAxis; import net.minecraft.util.math.Vec3d; import org.joml.Vector3f; -import java.util.HashSet; -import java.util.Set; - -import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.polymerId; +import static eu.midnightdust.motschen.rocks.RocksMain.id; public class ItemDisplayStarfishModel extends ConditionalBlockModel { - private final Set arms = HashSet.newHashSet(5); + private final ItemDisplayElement arm; public static ItemStack RED; public static ItemStack ORANGE; public static ItemStack PINK; - public static ItemStack RED_FIRST; - public static ItemStack ORANGE_FIRST; - public static ItemStack PINK_FIRST; public static void initModels() { - RED = ItemDisplayElementUtil.getModel(polymerId("block/starfish_red_arm")); - ORANGE = ItemDisplayElementUtil.getModel(polymerId("block/starfish_orange_arm")); - PINK = ItemDisplayElementUtil.getModel(polymerId("block/starfish_pink_arm")); - RED_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_red_first_arm")); - ORANGE_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_orange_first_arm")); - PINK_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_pink_first_arm")); + RED = ItemDisplayElementUtil.getModel(id("block/starfish_red")); + ORANGE = ItemDisplayElementUtil.getModel(id("block/starfish_orange")); + PINK = ItemDisplayElementUtil.getModel(id("block/starfish_pink")); } public ItemDisplayStarfishModel(BlockState state, BlockPos pos) { @@ -41,16 +32,13 @@ public class ItemDisplayStarfishModel extends ConditionalBlockModel { int baseRotation = pos.hashCode() % 360; double xOffset = ((pos.hashCode() + pos.getX()) % 250 - 125) / 1000f; double zOffset = ((pos.hashCode() + pos.getZ()) % 250 - 125) / 1000f; - for (int i = 0; i < 5; i++) { - var arm = ItemDisplayElementUtil.createSimple(i != 0 ? modelStack : getFirstModel(state)); - arm.setDisplaySize(1, 1); - arm.setScale(new Vector3f(1)); - arm.setRightRotation(RotationAxis.POSITIVE_Y.rotationDegrees(baseRotation + 72.5f * i)); - arm.setOffset(new Vec3d(xOffset, 0, zOffset)); - arm.setViewRange(0.4f * (RocksConfig.polymerViewDistance / 100f)); - arms.add(arm); - this.addElement(arm); - } + arm = ItemDisplayElementUtil.createSimple(modelStack); + arm.setDisplaySize(1, 1); + arm.setScale(new Vector3f(1)); + arm.setRightRotation(RotationAxis.POSITIVE_Y.rotationDegrees(baseRotation)); + arm.setOffset(new Vec3d(xOffset, 0, zOffset)); + arm.setViewRange(0.4f * (RocksConfig.polymerViewDistance / 100f)); + this.addElement(arm); } @Override @@ -58,8 +46,7 @@ public class ItemDisplayStarfishModel extends ConditionalBlockModel { if (updateType == BlockAwareAttachment.BLOCK_STATE_UPDATE) { var state = this.blockState(); ItemStack modelStack = getModel(state); - this.arms.forEach(arm -> arm.setItem(modelStack)); - this.arms.stream().findFirst().orElseThrow().setItem(getFirstModel(state)); + arm.setItem(modelStack); this.tick(); } @@ -71,11 +58,4 @@ public class ItemDisplayStarfishModel extends ConditionalBlockModel { case PINK -> PINK; }; } - private ItemStack getFirstModel(BlockState state) { - return switch (state.get(RocksMain.STARFISH_VARIATION)) { - case RED -> RED_FIRST; - case ORANGE -> ORANGE_FIRST; - case PINK -> PINK_FIRST; - }; - } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java index 945d8cc..b1cd6e7 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java @@ -14,8 +14,8 @@ import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; import xyz.nucleoid.packettweaker.PacketContext; +import static eu.midnightdust.motschen.rocks.RocksMain.id; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; -import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.polymerId; public class StarfishItemPolymer extends BlockItem implements PolymerItem { private final Item polymerItem; @@ -30,7 +30,7 @@ public class StarfishItemPolymer extends BlockItem implements PolymerItem { var state = itemStack.getComponents().get(DataComponentTypes.BLOCK_STATE); if (state != null && !state.isEmpty()) { StarfishVariation variation = state.getValue(RocksMain.STARFISH_VARIATION); - if (variation != null) return ResourcePackExtras.bridgeModel(polymerId("item/"+variation + "_starfish")); + if (variation != null) return ResourcePackExtras.bridgeModel(id("item/starfish_"+variation)); } return itemStack.get(DataComponentTypes.ITEM_MODEL); } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/mixin/MixinModelElementDeserializer.java b/src/main/java/eu/midnightdust/motschen/rocks/mixin/MixinModelElementDeserializer.java deleted file mode 100755 index a6e6a8b..0000000 --- a/src/main/java/eu/midnightdust/motschen/rocks/mixin/MixinModelElementDeserializer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.rocks.mixin; - -import com.google.gson.JsonObject; -import net.minecraft.client.render.model.json.ModelElement; -import net.minecraft.util.JsonHelper; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -@Mixin(value = ModelElement.Deserializer.class, priority = 2000) -public class MixinModelElementDeserializer { - - /** - * @author Motschen - * @reason Not cancellable - * Unlimited rotation angles for starfish - * Inspired by ModelsUnlocked - */ - @Overwrite - private float deserializeRotationAngle(JsonObject json) { - return (JsonHelper.getFloat(json, "angle")); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java b/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java index 0fe0937..7b48997 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java @@ -52,9 +52,7 @@ public class PolyUtil { if (PASSABLE_WATERLOGGED_BLOCK == null) SMALL_BLOCK = Blocks.BARRIER.getDefaultState().with(WATERLOGGED, true); PolymerResourcePackUtils.addModAssets(MOD_ID); - ResourcePackExtras.forDefault().addBridgedModelsFolder(id("block"), id("rocks")); - ResourcePackExtras.forDefault().addBridgedModelsFolder(polymerId("block"), polymerId("polymer-rocks")); - ResourcePackExtras.forDefault().addBridgedModelsFolder(polymerId("item"), polymerId("polymer-rocks")); + ResourcePackExtras.forDefault().addBridgedModelsFolder(id("block"), id("item")); ItemDisplayNetherGeyserModel.initModels(); ItemDisplayOverworldGeyserModel.initModels(); @@ -64,9 +62,6 @@ public class PolyUtil { ItemDisplayStarfishModel.initModels(); ItemDisplayStickModel.initModels(); } - public static Identifier polymerId(String path) { - return Identifier.of("polymer-rocks", path); - } public static boolean hasModOnClient(ServerPlayerEntity player) { return playersWithMod.contains(player); diff --git a/src/main/resources/assets/rocks/models/block/starfish_orange.json b/src/main/resources/assets/rocks/models/block/starfish_orange.json index 78860ac..88d76bf 100755 --- a/src/main/resources/assets/rocks/models/block/starfish_orange.json +++ b/src/main/resources/assets/rocks/models/block/starfish_orange.json @@ -1,10 +1,10 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "textures": { "0": "rocks:block/starfish_orange", "particle": "rocks:block/starfish_orange" }, - "gui_light": "front", "elements": [ { "from": [4.5, 0, 10.5], @@ -59,211 +59,211 @@ } }, { - "from": [5.75, 0, 10], - "to": [6.75, 1, 14], - "rotation": {"angle": 72.5, "axis": "y", "origin": [6, 0, 10]}, + "from": [6, 0, 9.25], + "to": [10, 1, 10.25], + "rotation": {"angle": -17.5, "axis": "y", "origin": [6, 0, 10]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [4.5, 0.02, 9], - "to": [5.5, 1.02, 12], - "rotation": {"angle": 72.5, "axis": "y", "origin": [6, 0, 9]}, + "from": [6, 0.02, 9.5], + "to": [9, 1.02, 10.5], + "rotation": {"angle": -17.5, "axis": "y", "origin": [6, 0, 9]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [5, 0.01, 9], - "to": [6, 1.01, 12], - "rotation": {"angle": 72.5, "axis": "y", "origin": [6, 0, 9]}, + "from": [6, 0.01, 9], + "to": [9, 1.01, 10], + "rotation": {"angle": -17.5, "axis": "y", "origin": [6, 0, 9]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [1.4, -0.01, 9], - "to": [3.4, 0.99, 11], - "rotation": {"angle": 72.5, "axis": "y", "origin": [4.6, 0, 7]}, + "from": [6.6, -0.01, 8.2], + "to": [8.6, 0.99, 10.2], + "rotation": {"angle": -17.5, "axis": "y", "origin": [4.6, 0, 7]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "east": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "west": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 270, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [3.5, 0, 10], - "to": [4.5, 1, 14], - "rotation": {"angle": -72.5, "axis": "y", "origin": [4, 0, 10]}, + "from": [0, 0, 9.5], + "to": [4, 1, 10.5], + "rotation": {"angle": 17.5, "axis": "y", "origin": [4, 0, 10]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [2.75, 0.02, 10.5], - "to": [3.75, 1.02, 13.5], - "rotation": {"angle": -72.5, "axis": "y", "origin": [4, 0, 10.5]}, + "from": [1, 0.02, 9.25], + "to": [4, 1.02, 10.25], + "rotation": {"angle": 17.5, "axis": "y", "origin": [4, 0, 10.5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [3.25, 0.01, 10.5], - "to": [4.25, 1.01, 13.5], - "rotation": {"angle": -72.5, "axis": "y", "origin": [4, 0, 10.5]}, + "from": [1, 0.01, 9.75], + "to": [4, 1.01, 10.75], + "rotation": {"angle": 17.5, "axis": "y", "origin": [4, 0, 10.5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [4, -0.01, 13], - "to": [6, 0.99, 15], - "rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 11]}, + "from": [3, -0.01, 8], + "to": [5, 0.99, 10], + "rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 11]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "east": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "west": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [3.5, 0, 7.4], - "to": [4.5, 1, 11.4], - "rotation": {"angle": -145, "axis": "y", "origin": [4, 0, 8]}, + "from": [3.5, 0, 4.6], + "to": [4.5, 1, 8.6], + "rotation": {"angle": 35, "axis": "y", "origin": [4, 0, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [1.25, 0.02, 8.7], - "to": [2.25, 1.02, 11.7], - "rotation": {"angle": -145, "axis": "y", "origin": [3, 0, 9]}, + "from": [3.75, 0.02, 6.3], + "to": [4.75, 1.02, 9.3], + "rotation": {"angle": 35, "axis": "y", "origin": [3, 0, 9]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [3.25, 0.01, 7.4], - "to": [4.25, 1.01, 10.4], - "rotation": {"angle": -145, "axis": "y", "origin": [4, 0, 8]}, + "from": [3.75, 0.01, 5.6], + "to": [4.75, 1.01, 8.6], + "rotation": {"angle": 35, "axis": "y", "origin": [4, 0, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [0, -0.01, 10.5], - "to": [2, 0.99, 12.5], - "rotation": {"angle": -145, "axis": "y", "origin": [3, 0, 10]}, + "from": [4, -0.01, 7.5], + "to": [6, 0.99, 9.5], + "rotation": {"angle": 35, "axis": "y", "origin": [3, 0, 10]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "south": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [7.35, 0, 7.3], - "to": [8.35, 1, 11.3], - "rotation": {"angle": 145, "axis": "y", "origin": [7, 0, 8]}, + "from": [5.65, 0, 4.7], + "to": [6.65, 1, 8.7], + "rotation": {"angle": -35, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [3.5, 0.02, 8], - "to": [4.5, 1.02, 11], - "rotation": {"angle": 145, "axis": "y", "origin": [5, 0, 8]}, + "from": [5.5, 0.02, 5], + "to": [6.5, 1.02, 8], + "rotation": {"angle": -35, "axis": "y", "origin": [5, 0, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [4, 0.01, 8], - "to": [5, 1.01, 11], - "rotation": {"angle": 145, "axis": "y", "origin": [5, 0, 8]}, + "from": [5, 0.01, 5], + "to": [6, 1.01, 8], + "rotation": {"angle": -35, "axis": "y", "origin": [5, 0, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [2, -0.01, 10.5], - "to": [4, 0.99, 12.5], - "rotation": {"angle": 145, "axis": "y", "origin": [4, 0, 9]}, + "from": [4, -0.01, 5.5], + "to": [6, 0.99, 7.5], + "rotation": {"angle": -35, "axis": "y", "origin": [4, 0, 9]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "south": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"} } }, { @@ -306,67 +306,39 @@ } } ], - "display": { - "thirdperson_righthand": { - "rotation": [65, 35, 0], - "translation": [0.75, 4.75, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [65, 35, 0], - "translation": [-1.75, 2.75, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [29, 0, 23], - "translation": [3.25, 8.25, 0] - }, - "firstperson_lefthand": { - "rotation": [29, 0, 23], - "translation": [-3, 7.25, 0] - }, - "ground": { - "translation": [2.5, 3.75, -1], - "scale": [0.75, 0.75, 0.75] - }, - "gui": { - "rotation": [90, 35, 0], - "translation": [2.25, 3.5, 0], - "scale": [1.5, 1.5, 1.5] - }, - "head": { - "translation": [3, 14.25, -0.75] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [4.25, -2, -12], - "scale": [1.5, 1.5, 1.5] - } - }, "groups": [ { "name": "side1", "origin": [0, 0, 0], + "color": 0, "children": [0, 1, 2, 3] }, { "name": "side2", "origin": [0, 0, 0], + "color": 0, "children": [4, 5, 6, 7] }, { "name": "side3", "origin": [0, 0, 0], + "color": 0, "children": [8, 9, 10, 11] }, { "name": "side4", "origin": [0, 0, 0], + "color": 0, "children": [12, 13, 14, 15] }, { "name": "side5", "origin": [0, 0, 0], + "color": 0, "children": [16, 17, 18, 19] - }, 20, 21, 22] + }, + 20, + 21, + 22 + ] } diff --git a/src/main/resources/assets/rocks/models/block/starfish_pink.json b/src/main/resources/assets/rocks/models/block/starfish_pink.json index c681edb..bc7e68b 100755 --- a/src/main/resources/assets/rocks/models/block/starfish_pink.json +++ b/src/main/resources/assets/rocks/models/block/starfish_pink.json @@ -1,10 +1,10 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "textures": { "0": "rocks:block/starfish_pink", "particle": "rocks:block/starfish_pink" }, - "gui_light": "front", "elements": [ { "from": [7.5, 0, 8.5], @@ -59,211 +59,211 @@ } }, { - "from": [8.75, 0, 8], - "to": [9.75, 1, 12], - "rotation": {"angle": 72.5, "axis": "y", "origin": [9, 0, 8]}, + "from": [9, 0, 7.25], + "to": [13, 1, 8.25], + "rotation": {"angle": -17.5, "axis": "y", "origin": [9, 0, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [7.5, 0.02, 7], - "to": [8.5, 1.02, 10], - "rotation": {"angle": 72.5, "axis": "y", "origin": [9, 0, 7]}, + "from": [9, 0.02, 7.5], + "to": [12, 1.02, 8.5], + "rotation": {"angle": -17.5, "axis": "y", "origin": [9, 0, 7]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [8, 0.01, 7], - "to": [9, 1.01, 10], - "rotation": {"angle": 72.5, "axis": "y", "origin": [9, 0, 7]}, + "from": [9, 0.01, 7], + "to": [12, 1.01, 8], + "rotation": {"angle": -17.5, "axis": "y", "origin": [9, 0, 7]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [4.4, -0.01, 7], - "to": [6.4, 0.99, 9], - "rotation": {"angle": 72.5, "axis": "y", "origin": [7.6, 0, 5]}, + "from": [9.6, -0.01, 6.2], + "to": [11.6, 0.99, 8.2], + "rotation": {"angle": -17.5, "axis": "y", "origin": [7.6, 0, 5]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "east": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "west": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 270, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [6.5, 0, 8], - "to": [7.5, 1, 12], - "rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 8]}, + "from": [3, 0, 7.5], + "to": [7, 1, 8.5], + "rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [5.75, 0.02, 8.5], - "to": [6.75, 1.02, 11.5], - "rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 8.5]}, + "from": [4, 0.02, 7.25], + "to": [7, 1.02, 8.25], + "rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 8.5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [6.25, 0.01, 8.5], - "to": [7.25, 1.01, 11.5], - "rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 8.5]}, + "from": [4, 0.01, 7.75], + "to": [7, 1.01, 8.75], + "rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 8.5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [7, -0.01, 11], - "to": [9, 0.99, 13], - "rotation": {"angle": -72.5, "axis": "y", "origin": [10, 0, 9]}, + "from": [6, -0.01, 6], + "to": [8, 0.99, 8], + "rotation": {"angle": 17.5, "axis": "y", "origin": [10, 0, 9]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "east": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "west": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [6.5, 0, 5.4], - "to": [7.5, 1, 9.4], - "rotation": {"angle": -145, "axis": "y", "origin": [7, 0, 6]}, + "from": [6.5, 0, 2.6], + "to": [7.5, 1, 6.6], + "rotation": {"angle": 35, "axis": "y", "origin": [7, 0, 6]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [4.25, 0.02, 6.7], - "to": [5.25, 1.02, 9.7], - "rotation": {"angle": -145, "axis": "y", "origin": [6, 0, 7]}, + "from": [6.75, 0.02, 4.3], + "to": [7.75, 1.02, 7.3], + "rotation": {"angle": 35, "axis": "y", "origin": [6, 0, 7]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [6.25, 0.01, 5.4], - "to": [7.25, 1.01, 8.4], - "rotation": {"angle": -145, "axis": "y", "origin": [7, 0, 6]}, + "from": [6.75, 0.01, 3.6], + "to": [7.75, 1.01, 6.6], + "rotation": {"angle": 35, "axis": "y", "origin": [7, 0, 6]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [3, -0.01, 8.5], - "to": [5, 0.99, 10.5], - "rotation": {"angle": -145, "axis": "y", "origin": [6, 0, 8]}, + "from": [7, -0.01, 5.5], + "to": [9, 0.99, 7.5], + "rotation": {"angle": 35, "axis": "y", "origin": [6, 0, 8]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "south": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [10.35, 0, 5.3], - "to": [11.35, 1, 9.3], - "rotation": {"angle": 145, "axis": "y", "origin": [10, 0, 6]}, + "from": [8.65, 0, 2.7], + "to": [9.65, 1, 6.7], + "rotation": {"angle": -35, "axis": "y", "origin": [10, 0, 6]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [6.5, 0.02, 6], - "to": [7.5, 1.02, 9], - "rotation": {"angle": 145, "axis": "y", "origin": [8, 0, 6]}, + "from": [8.5, 0.02, 3], + "to": [9.5, 1.02, 6], + "rotation": {"angle": -35, "axis": "y", "origin": [8, 0, 6]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [7, 0.01, 6], - "to": [8, 1.01, 9], - "rotation": {"angle": 145, "axis": "y", "origin": [8, 0, 6]}, + "from": [8, 0.01, 3], + "to": [9, 1.01, 6], + "rotation": {"angle": -35, "axis": "y", "origin": [8, 0, 6]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [5, -0.01, 8.5], - "to": [7, 0.99, 10.5], - "rotation": {"angle": 145, "axis": "y", "origin": [7, 0, 7]}, + "from": [7, -0.01, 3.5], + "to": [9, 0.99, 5.5], + "rotation": {"angle": -35, "axis": "y", "origin": [7, 0, 7]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "south": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"} } }, { @@ -306,67 +306,39 @@ } } ], - "display": { - "thirdperson_righthand": { - "rotation": [65, 35, 0], - "translation": [0, 2.25, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [65, 35, 0], - "translation": [0, 2.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [29, 0, 23], - "translation": [3.25, 3.75, 0] - }, - "firstperson_lefthand": { - "rotation": [29, 0, 23], - "translation": [6.25, 3.75, 0] - }, - "ground": { - "translation": [0.25, 3.75, 0], - "scale": [0.75, 0.75, 0.75] - }, - "gui": { - "rotation": [90, 35, 0], - "translation": [0.25, -1.5, 0], - "scale": [1.5, 1.5, 1.5] - }, - "head": { - "translation": [-0.25, 14.25, 0.75] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [-0.25, 1.25, -12], - "scale": [1.5, 1.5, 1.5] - } - }, "groups": [ { "name": "side1", "origin": [0, 0, 0], + "color": 0, "children": [0, 1, 2, 3] }, { "name": "side2", "origin": [0, 0, 0], + "color": 0, "children": [4, 5, 6, 7] }, { "name": "side3", "origin": [0, 0, 0], + "color": 0, "children": [8, 9, 10, 11] }, { "name": "side4", "origin": [0, 0, 0], + "color": 0, "children": [12, 13, 14, 15] }, { "name": "side5", "origin": [0, 0, 0], + "color": 0, "children": [16, 17, 18, 19] - }, 20, 21, 22] + }, + 20, + 21, + 22 + ] } diff --git a/src/main/resources/assets/rocks/models/block/starfish_red.json b/src/main/resources/assets/rocks/models/block/starfish_red.json index fc028bc..18caa34 100755 --- a/src/main/resources/assets/rocks/models/block/starfish_red.json +++ b/src/main/resources/assets/rocks/models/block/starfish_red.json @@ -1,10 +1,10 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "textures": { "0": "rocks:block/starfish_red", "particle": "rocks:block/starfish_red" }, - "gui_light": "front", "elements": [ { "from": [9.5, 0, 6.5], @@ -59,211 +59,211 @@ } }, { - "from": [10.75, 0, 6], - "to": [11.75, 1, 10], - "rotation": {"angle": 72.5, "axis": "y", "origin": [11, 0, 6]}, + "from": [11, 0, 5.25], + "to": [15, 1, 6.25], + "rotation": {"angle": -17.5, "axis": "y", "origin": [11, 0, 6]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [9.5, 0.02, 5], - "to": [10.5, 1.02, 8], - "rotation": {"angle": 72.5, "axis": "y", "origin": [11, 0, 5]}, + "from": [11, 0.02, 5.5], + "to": [14, 1.02, 6.5], + "rotation": {"angle": -17.5, "axis": "y", "origin": [11, 0, 5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [10, 0.01, 5], - "to": [11, 1.01, 8], - "rotation": {"angle": 72.5, "axis": "y", "origin": [11, 0, 5]}, + "from": [11, 0.01, 5], + "to": [14, 1.01, 6], + "rotation": {"angle": -17.5, "axis": "y", "origin": [11, 0, 5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [6.4, -0.01, 5], - "to": [8.4, 0.99, 7], - "rotation": {"angle": 72.5, "axis": "y", "origin": [9.6, 0, 3]}, + "from": [11.6, -0.01, 4.2], + "to": [13.6, 0.99, 6.2], + "rotation": {"angle": -17.5, "axis": "y", "origin": [9.6, 0, 3]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "east": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "west": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 270, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 90, "texture": "#0"} } }, { - "from": [8.5, 0, 6], - "to": [9.5, 1, 10], - "rotation": {"angle": -72.5, "axis": "y", "origin": [9, 0, 6]}, + "from": [5, 0, 5.5], + "to": [9, 1, 6.5], + "rotation": {"angle": 17.5, "axis": "y", "origin": [9, 0, 6]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [7.75, 0.02, 6.5], - "to": [8.75, 1.02, 9.5], - "rotation": {"angle": -72.5, "axis": "y", "origin": [9, 0, 6.5]}, + "from": [6, 0.02, 5.25], + "to": [9, 1.02, 6.25], + "rotation": {"angle": 17.5, "axis": "y", "origin": [9, 0, 6.5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [8.25, 0.01, 6.5], - "to": [9.25, 1.01, 9.5], - "rotation": {"angle": -72.5, "axis": "y", "origin": [9, 0, 6.5]}, + "from": [6, 0.01, 5.75], + "to": [9, 1.01, 6.75], + "rotation": {"angle": 17.5, "axis": "y", "origin": [9, 0, 6.5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "east": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [9, -0.01, 9], - "to": [11, 0.99, 11], - "rotation": {"angle": -72.5, "axis": "y", "origin": [12, 0, 7]}, + "from": [8, -0.01, 4], + "to": [10, 0.99, 6], + "rotation": {"angle": 17.5, "axis": "y", "origin": [12, 0, 7]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "east": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "west": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 270, "texture": "#0"} } }, { - "from": [8.5, 0, 3.4], - "to": [9.5, 1, 7.4], - "rotation": {"angle": -145, "axis": "y", "origin": [9, 0, 4]}, + "from": [8.5, 0, 0.6], + "to": [9.5, 1, 4.6], + "rotation": {"angle": 35, "axis": "y", "origin": [9, 0, 4]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [6.25, 0.02, 4.7], - "to": [7.25, 1.02, 7.7], - "rotation": {"angle": -145, "axis": "y", "origin": [8, 0, 5]}, + "from": [8.75, 0.02, 2.3], + "to": [9.75, 1.02, 5.3], + "rotation": {"angle": 35, "axis": "y", "origin": [8, 0, 5]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [8.25, 0.01, 3.4], - "to": [9.25, 1.01, 6.4], - "rotation": {"angle": -145, "axis": "y", "origin": [9, 0, 4]}, + "from": [8.75, 0.01, 1.6], + "to": [9.75, 1.01, 4.6], + "rotation": {"angle": 35, "axis": "y", "origin": [9, 0, 4]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [5, -0.01, 6.5], - "to": [7, 0.99, 8.5], - "rotation": {"angle": -145, "axis": "y", "origin": [8, 0, 6]}, + "from": [9, -0.01, 3.5], + "to": [11, 0.99, 5.5], + "rotation": {"angle": 35, "axis": "y", "origin": [8, 0, 6]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "south": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [12.35, 0, 3.3], - "to": [13.35, 1, 7.3], - "rotation": {"angle": 145, "axis": "y", "origin": [12, 0, 4]}, + "from": [10.65, 0, 0.7], + "to": [11.65, 1, 4.7], + "rotation": {"angle": -35, "axis": "y", "origin": [12, 0, 4]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [9, 4, 10, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 9, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [6, 0, 5, 4], "texture": "#0"} + "north": {"uv": [9, 4, 10, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 9, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [8.5, 0.02, 4], - "to": [9.5, 1.02, 7], - "rotation": {"angle": 145, "axis": "y", "origin": [10, 0, 4]}, + "from": [10.5, 0.02, 1], + "to": [11.5, 1.02, 4], + "rotation": {"angle": -35, "axis": "y", "origin": [10, 0, 4]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [9, 0.01, 4], - "to": [10, 1.01, 7], - "rotation": {"angle": 145, "axis": "y", "origin": [10, 0, 4]}, + "from": [10, 0.01, 1], + "to": [11, 1.01, 4], + "rotation": {"angle": -35, "axis": "y", "origin": [10, 0, 4]}, "faces": { - "north": {"uv": [4, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [8, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 8, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 1, 5, 4], "texture": "#0"} + "north": {"uv": [8, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [4, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"} } }, { - "from": [7, -0.01, 6.5], - "to": [9, 0.99, 8.5], - "rotation": {"angle": 145, "axis": "y", "origin": [9, 0, 5]}, + "from": [9, -0.01, 1.5], + "to": [11, 0.99, 3.5], + "rotation": {"angle": -35, "axis": "y", "origin": [9, 0, 5]}, "faces": { - "north": {"uv": [3, 4, 5, 5], "texture": "#0"}, - "east": {"uv": [1, 4, 3, 5], "texture": "#0"}, - "south": {"uv": [7, 4, 9, 5], "texture": "#0"}, - "west": {"uv": [5, 4, 7, 5], "texture": "#0"}, - "up": {"uv": [5, 4, 3, 2], "texture": "#0"}, - "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + "north": {"uv": [7, 4, 9, 5], "texture": "#0"}, + "east": {"uv": [5, 4, 7, 5], "texture": "#0"}, + "south": {"uv": [3, 4, 5, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 3, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"} } }, { @@ -306,67 +306,39 @@ } } ], - "display": { - "thirdperson_righthand": { - "rotation": [65, 35, 0], - "translation": [0, 2.25, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [65, 35, 0], - "translation": [1.5, 2.5, 3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [29, 0, 23], - "translation": [3.25, 3.75, 0] - }, - "firstperson_lefthand": { - "rotation": [29, 0, 23], - "translation": [6.25, 3.75, 0] - }, - "ground": { - "translation": [-1.75, 3.75, 1.5], - "scale": [0.75, 0.75, 0.75] - }, - "gui": { - "rotation": [90, 35, 0], - "translation": [0, -5.75, 0], - "scale": [1.5, 1.5, 1.5] - }, - "head": { - "translation": [-2, 14.25, 3] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [-2.75, 3.5, -12], - "scale": [1.5, 1.5, 1.5] - } - }, "groups": [ { "name": "side1", "origin": [0, 0, 0], + "color": 0, "children": [0, 1, 2, 3] }, { "name": "side2", "origin": [0, 0, 0], + "color": 0, "children": [4, 5, 6, 7] }, { "name": "side3", "origin": [0, 0, 0], + "color": 0, "children": [8, 9, 10, 11] }, { "name": "side4", "origin": [0, 0, 0], + "color": 0, "children": [12, 13, 14, 15] }, { "name": "side5", "origin": [0, 0, 0], + "color": 0, "children": [16, 17, 18, 19] - }, 20, 21, 22] + }, + 20, + 21, + 22 + ] } diff --git a/src/main/resources/assets/rocks/models/item/starfish_orange.json b/src/main/resources/assets/rocks/models/item/starfish_orange.json new file mode 100755 index 0000000..c5c8783 --- /dev/null +++ b/src/main/resources/assets/rocks/models/item/starfish_orange.json @@ -0,0 +1,41 @@ +{ + "parent": "rocks:block/starfish_orange", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [65, 35, 0], + "translation": [0.75, 4.75, 3.5], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [65, 35, 0], + "translation": [-1.75, 2.75, 3.5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [29, 0, 23], + "translation": [3.25, 8.25, 0] + }, + "firstperson_lefthand": { + "rotation": [29, 0, 23], + "translation": [-3, 7.25, 0] + }, + "ground": { + "translation": [2.5, 3.75, -1], + "scale": [0.75, 0.75, 0.75] + }, + "gui": { + "rotation": [90, 35, 0], + "translation": [2.25, 3.5, 0], + "scale": [1.5, 1.5, 1.5] + }, + "head": { + "translation": [3, 14.25, -0.75] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [4.25, -2, -12], + "scale": [1.5, 1.5, 1.5] + } + } +} diff --git a/src/main/resources/assets/rocks/models/item/starfish_pink.json b/src/main/resources/assets/rocks/models/item/starfish_pink.json new file mode 100755 index 0000000..85dd634 --- /dev/null +++ b/src/main/resources/assets/rocks/models/item/starfish_pink.json @@ -0,0 +1,41 @@ +{ + "parent": "rocks:block/starfish_pink", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [65, 35, 0], + "translation": [0, 2.25, 3.5], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [65, 35, 0], + "translation": [0, 2.5, 3.5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [29, 0, 23], + "translation": [3.25, 3.75, 0] + }, + "firstperson_lefthand": { + "rotation": [29, 0, 23], + "translation": [6.25, 3.75, 0] + }, + "ground": { + "translation": [0.25, 3.75, 0], + "scale": [0.75, 0.75, 0.75] + }, + "gui": { + "rotation": [90, 35, 0], + "translation": [0.25, -1.5, 0], + "scale": [1.5, 1.5, 1.5] + }, + "head": { + "translation": [-0.25, 14.25, 0.75] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [-0.25, 1.25, -12], + "scale": [1.5, 1.5, 1.5] + } + } +} diff --git a/src/main/resources/assets/rocks/models/item/starfish_red.json b/src/main/resources/assets/rocks/models/item/starfish_red.json new file mode 100755 index 0000000..0f8913f --- /dev/null +++ b/src/main/resources/assets/rocks/models/item/starfish_red.json @@ -0,0 +1,41 @@ +{ + "parent": "rocks:block/starfish_red", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [65, 35, 0], + "translation": [0, 2.25, 3.5], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [65, 35, 0], + "translation": [1.5, 2.5, 3.5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [29, 0, 23], + "translation": [3.25, 3.75, 0] + }, + "firstperson_lefthand": { + "rotation": [29, 0, 23], + "translation": [6.25, 3.75, 0] + }, + "ground": { + "translation": [-1.75, 3.75, 1.5], + "scale": [0.75, 0.75, 0.75] + }, + "gui": { + "rotation": [90, 35, 0], + "translation": [0, -5.75, 0], + "scale": [1.5, 1.5, 1.5] + }, + "head": { + "translation": [-2, 14.25, 3] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [-2.75, 3.5, -12], + "scale": [1.5, 1.5, 1.5] + } + } +} diff --git a/src/main/resources/assets/rocks/textures/item/starfish.png b/src/main/resources/assets/rocks/textures/item/starfish.png index 78ef8ab..0a90c8d 100755 Binary files a/src/main/resources/assets/rocks/textures/item/starfish.png and b/src/main/resources/assets/rocks/textures/item/starfish.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a63ecff..769dbde 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,9 +31,6 @@ }, "accessWidener" : "thisrocks.accesswidener", - "mixins": [ - "rocks.mixins.json" - ], "depends": { "fabricloader": ">=0.7.2",