diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 9b2149026..0030dcfb4 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -20,7 +20,7 @@ a579c40c43dc2174afb66f42d00d0c4a0efaaeee assets\create\blockstates\andesite_bric 398922758a6219544e5b85c91c9cf8a543b437e5 assets\create\blockstates\andesite_pillar.json a9f73f228f2cde7f707fab3467e57a9080233433 assets\create\blockstates\andesite_tunnel.json f9fa6aa530eb0891a74eadfbebc663172a57147a assets\create\blockstates\basin.json -39dc813be2049a42475f93d12f9f2e356139cf1b assets\create\blockstates\belt.json +f25693a9429f6337149ff24f27900dc4eb82a7c2 assets\create\blockstates\belt.json 40d10934934ea142d71fc6ce598b1455c3ad47b4 assets\create\blockstates\belt_observer.json cf9045eb16e5299a1d917c4cb536289f49411276 assets\create\blockstates\birch_window.json 94a1a91403eb4b035fec48071e7fcae57a8a6abd assets\create\blockstates\birch_window_pane.json diff --git a/src/generated/resources/assets/create/blockstates/belt.json b/src/generated/resources/assets/create/blockstates/belt.json index 2c9de12cc..c09a0cb21 100644 --- a/src/generated/resources/assets/create/blockstates/belt.json +++ b/src/generated/resources/assets/create/blockstates/belt.json @@ -1,7 +1,7 @@ { "variants": { "casing=false,facing=north,part=start,slope=horizontal": { - "model": "create:block/belt/horizontal_start", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=start,slope=horizontal": { @@ -9,13 +9,13 @@ "y": 180 }, "casing=false,facing=south,part=start,slope=horizontal": { - "model": "create:block/belt/horizontal_start" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=start,slope=horizontal": { "model": "create:block/belt_casing/horizontal_start" }, "casing=false,facing=west,part=start,slope=horizontal": { - "model": "create:block/belt/horizontal_start", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=start,slope=horizontal": { @@ -23,7 +23,7 @@ "y": 90 }, "casing=false,facing=east,part=start,slope=horizontal": { - "model": "create:block/belt/horizontal_start", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=start,slope=horizontal": { @@ -31,7 +31,7 @@ "y": 270 }, "casing=false,facing=north,part=middle,slope=horizontal": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=middle,slope=horizontal": { @@ -39,13 +39,13 @@ "y": 180 }, "casing=false,facing=south,part=middle,slope=horizontal": { - "model": "create:block/belt/horizontal_middle" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=middle,slope=horizontal": { "model": "create:block/belt_casing/horizontal_middle" }, "casing=false,facing=west,part=middle,slope=horizontal": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=middle,slope=horizontal": { @@ -53,7 +53,7 @@ "y": 90 }, "casing=false,facing=east,part=middle,slope=horizontal": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=middle,slope=horizontal": { @@ -61,7 +61,7 @@ "y": 270 }, "casing=false,facing=north,part=end,slope=horizontal": { - "model": "create:block/belt/horizontal_end", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=end,slope=horizontal": { @@ -69,13 +69,13 @@ "y": 180 }, "casing=false,facing=south,part=end,slope=horizontal": { - "model": "create:block/belt/horizontal_end" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=end,slope=horizontal": { "model": "create:block/belt_casing/horizontal_end" }, "casing=false,facing=west,part=end,slope=horizontal": { - "model": "create:block/belt/horizontal_end", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=end,slope=horizontal": { @@ -83,7 +83,7 @@ "y": 90 }, "casing=false,facing=east,part=end,slope=horizontal": { - "model": "create:block/belt/horizontal_end", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=end,slope=horizontal": { @@ -91,7 +91,7 @@ "y": 270 }, "casing=false,facing=north,part=pulley,slope=horizontal": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=pulley,slope=horizontal": { @@ -99,13 +99,13 @@ "y": 180 }, "casing=false,facing=south,part=pulley,slope=horizontal": { - "model": "create:block/belt/horizontal_middle" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=pulley,slope=horizontal": { "model": "create:block/belt_casing/horizontal_pulley" }, "casing=false,facing=west,part=pulley,slope=horizontal": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=pulley,slope=horizontal": { @@ -113,7 +113,7 @@ "y": 90 }, "casing=false,facing=east,part=pulley,slope=horizontal": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=pulley,slope=horizontal": { @@ -121,127 +121,127 @@ "y": 270 }, "casing=false,facing=north,part=start,slope=upward": { - "model": "create:block/belt/upward_start", - "y": 180 + "model": "create:block/belt/particle" }, "casing=true,facing=north,part=start,slope=upward": { "model": "create:block/belt_casing/diagonal_start" }, "casing=false,facing=south,part=start,slope=upward": { - "model": "create:block/belt/upward_start" + "model": "create:block/belt/particle", + "y": 180 }, "casing=true,facing=south,part=start,slope=upward": { "model": "create:block/belt_casing/diagonal_start", "y": 180 }, "casing=false,facing=west,part=start,slope=upward": { - "model": "create:block/belt/upward_start", - "y": 90 + "model": "create:block/belt/particle", + "y": 270 }, "casing=true,facing=west,part=start,slope=upward": { "model": "create:block/belt_casing/diagonal_start", "y": 270 }, "casing=false,facing=east,part=start,slope=upward": { - "model": "create:block/belt/upward_start", - "y": 270 + "model": "create:block/belt/particle", + "y": 90 }, "casing=true,facing=east,part=start,slope=upward": { "model": "create:block/belt_casing/diagonal_start", "y": 90 }, "casing=false,facing=north,part=middle,slope=upward": { - "model": "create:block/belt/upward_middle", - "y": 180 + "model": "create:block/belt/particle" }, "casing=true,facing=north,part=middle,slope=upward": { "model": "create:block/belt_casing/diagonal_middle" }, "casing=false,facing=south,part=middle,slope=upward": { - "model": "create:block/belt/upward_middle" + "model": "create:block/belt/particle", + "y": 180 }, "casing=true,facing=south,part=middle,slope=upward": { "model": "create:block/belt_casing/diagonal_middle", "y": 180 }, "casing=false,facing=west,part=middle,slope=upward": { - "model": "create:block/belt/upward_middle", - "y": 90 + "model": "create:block/belt/particle", + "y": 270 }, "casing=true,facing=west,part=middle,slope=upward": { "model": "create:block/belt_casing/diagonal_middle", "y": 270 }, "casing=false,facing=east,part=middle,slope=upward": { - "model": "create:block/belt/upward_middle", - "y": 270 + "model": "create:block/belt/particle", + "y": 90 }, "casing=true,facing=east,part=middle,slope=upward": { "model": "create:block/belt_casing/diagonal_middle", "y": 90 }, "casing=false,facing=north,part=end,slope=upward": { - "model": "create:block/belt/upward_end", - "y": 180 + "model": "create:block/belt/particle" }, "casing=true,facing=north,part=end,slope=upward": { "model": "create:block/belt_casing/diagonal_end" }, "casing=false,facing=south,part=end,slope=upward": { - "model": "create:block/belt/upward_end" + "model": "create:block/belt/particle", + "y": 180 }, "casing=true,facing=south,part=end,slope=upward": { "model": "create:block/belt_casing/diagonal_end", "y": 180 }, "casing=false,facing=west,part=end,slope=upward": { - "model": "create:block/belt/upward_end", - "y": 90 + "model": "create:block/belt/particle", + "y": 270 }, "casing=true,facing=west,part=end,slope=upward": { "model": "create:block/belt_casing/diagonal_end", "y": 270 }, "casing=false,facing=east,part=end,slope=upward": { - "model": "create:block/belt/upward_end", - "y": 270 + "model": "create:block/belt/particle", + "y": 90 }, "casing=true,facing=east,part=end,slope=upward": { "model": "create:block/belt_casing/diagonal_end", "y": 90 }, "casing=false,facing=north,part=pulley,slope=upward": { - "model": "create:block/belt/upward_middle", - "y": 180 + "model": "create:block/belt/particle" }, "casing=true,facing=north,part=pulley,slope=upward": { "model": "create:block/belt_casing/diagonal_pulley" }, "casing=false,facing=south,part=pulley,slope=upward": { - "model": "create:block/belt/upward_middle" + "model": "create:block/belt/particle", + "y": 180 }, "casing=true,facing=south,part=pulley,slope=upward": { "model": "create:block/belt_casing/diagonal_pulley", "y": 180 }, "casing=false,facing=west,part=pulley,slope=upward": { - "model": "create:block/belt/upward_middle", - "y": 90 + "model": "create:block/belt/particle", + "y": 270 }, "casing=true,facing=west,part=pulley,slope=upward": { "model": "create:block/belt_casing/diagonal_pulley", "y": 270 }, "casing=false,facing=east,part=pulley,slope=upward": { - "model": "create:block/belt/upward_middle", - "y": 270 + "model": "create:block/belt/particle", + "y": 90 }, "casing=true,facing=east,part=pulley,slope=upward": { "model": "create:block/belt_casing/diagonal_pulley", "y": 90 }, "casing=false,facing=north,part=start,slope=downward": { - "model": "create:block/belt/downward_start", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=start,slope=downward": { @@ -249,13 +249,13 @@ "y": 180 }, "casing=false,facing=south,part=start,slope=downward": { - "model": "create:block/belt/downward_start" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=start,slope=downward": { "model": "create:block/belt_casing/diagonal_end" }, "casing=false,facing=west,part=start,slope=downward": { - "model": "create:block/belt/downward_start", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=start,slope=downward": { @@ -263,7 +263,7 @@ "y": 90 }, "casing=false,facing=east,part=start,slope=downward": { - "model": "create:block/belt/downward_start", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=start,slope=downward": { @@ -271,7 +271,7 @@ "y": 270 }, "casing=false,facing=north,part=middle,slope=downward": { - "model": "create:block/belt/downward_middle", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=middle,slope=downward": { @@ -279,13 +279,13 @@ "y": 180 }, "casing=false,facing=south,part=middle,slope=downward": { - "model": "create:block/belt/downward_middle" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=middle,slope=downward": { "model": "create:block/belt_casing/diagonal_middle" }, "casing=false,facing=west,part=middle,slope=downward": { - "model": "create:block/belt/downward_middle", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=middle,slope=downward": { @@ -293,7 +293,7 @@ "y": 90 }, "casing=false,facing=east,part=middle,slope=downward": { - "model": "create:block/belt/downward_middle", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=middle,slope=downward": { @@ -301,7 +301,7 @@ "y": 270 }, "casing=false,facing=north,part=end,slope=downward": { - "model": "create:block/belt/downward_end", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=end,slope=downward": { @@ -309,13 +309,13 @@ "y": 180 }, "casing=false,facing=south,part=end,slope=downward": { - "model": "create:block/belt/downward_end" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=end,slope=downward": { "model": "create:block/belt_casing/diagonal_start" }, "casing=false,facing=west,part=end,slope=downward": { - "model": "create:block/belt/downward_end", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=end,slope=downward": { @@ -323,7 +323,7 @@ "y": 90 }, "casing=false,facing=east,part=end,slope=downward": { - "model": "create:block/belt/downward_end", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=end,slope=downward": { @@ -331,7 +331,7 @@ "y": 270 }, "casing=false,facing=north,part=pulley,slope=downward": { - "model": "create:block/belt/downward_middle", + "model": "create:block/belt/particle", "y": 180 }, "casing=true,facing=north,part=pulley,slope=downward": { @@ -339,13 +339,13 @@ "y": 180 }, "casing=false,facing=south,part=pulley,slope=downward": { - "model": "create:block/belt/downward_middle" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=pulley,slope=downward": { "model": "create:block/belt_casing/diagonal_pulley" }, "casing=false,facing=west,part=pulley,slope=downward": { - "model": "create:block/belt/downward_middle", + "model": "create:block/belt/particle", "y": 90 }, "casing=true,facing=west,part=pulley,slope=downward": { @@ -353,7 +353,7 @@ "y": 90 }, "casing=false,facing=east,part=pulley,slope=downward": { - "model": "create:block/belt/downward_middle", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=pulley,slope=downward": { @@ -361,7 +361,7 @@ "y": 270 }, "casing=false,facing=north,part=start,slope=vertical": { - "model": "create:block/belt/horizontal_end", + "model": "create:block/belt/particle", "x": 90, "y": 180 }, @@ -371,7 +371,7 @@ "y": 270 }, "casing=false,facing=south,part=start,slope=vertical": { - "model": "create:block/belt/horizontal_start", + "model": "create:block/belt/particle", "x": 90 }, "casing=true,facing=south,part=start,slope=vertical": { @@ -380,7 +380,7 @@ "y": 90 }, "casing=false,facing=west,part=start,slope=vertical": { - "model": "create:block/belt/horizontal_end", + "model": "create:block/belt/particle", "x": 90, "y": 90 }, @@ -390,7 +390,7 @@ "y": 180 }, "casing=false,facing=east,part=start,slope=vertical": { - "model": "create:block/belt/horizontal_start", + "model": "create:block/belt/particle", "x": 90, "y": 270 }, @@ -399,7 +399,7 @@ "x": 90 }, "casing=false,facing=north,part=middle,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90, "y": 180 }, @@ -409,7 +409,7 @@ "y": 270 }, "casing=false,facing=south,part=middle,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90 }, "casing=true,facing=south,part=middle,slope=vertical": { @@ -418,7 +418,7 @@ "y": 90 }, "casing=false,facing=west,part=middle,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90, "y": 90 }, @@ -428,7 +428,7 @@ "y": 180 }, "casing=false,facing=east,part=middle,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90, "y": 270 }, @@ -437,7 +437,7 @@ "x": 90 }, "casing=false,facing=north,part=end,slope=vertical": { - "model": "create:block/belt/horizontal_start", + "model": "create:block/belt/particle", "x": 90, "y": 180 }, @@ -447,7 +447,7 @@ "y": 270 }, "casing=false,facing=south,part=end,slope=vertical": { - "model": "create:block/belt/horizontal_end", + "model": "create:block/belt/particle", "x": 90 }, "casing=true,facing=south,part=end,slope=vertical": { @@ -456,7 +456,7 @@ "y": 90 }, "casing=false,facing=west,part=end,slope=vertical": { - "model": "create:block/belt/horizontal_start", + "model": "create:block/belt/particle", "x": 90, "y": 90 }, @@ -466,7 +466,7 @@ "y": 180 }, "casing=false,facing=east,part=end,slope=vertical": { - "model": "create:block/belt/horizontal_end", + "model": "create:block/belt/particle", "x": 90, "y": 270 }, @@ -475,7 +475,7 @@ "x": 90 }, "casing=false,facing=north,part=pulley,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90, "y": 180 }, @@ -485,7 +485,7 @@ "y": 270 }, "casing=false,facing=south,part=pulley,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90 }, "casing=true,facing=south,part=pulley,slope=vertical": { @@ -494,7 +494,7 @@ "y": 90 }, "casing=false,facing=west,part=pulley,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90, "y": 90 }, @@ -504,7 +504,7 @@ "y": 180 }, "casing=false,facing=east,part=pulley,slope=vertical": { - "model": "create:block/belt/horizontal_middle", + "model": "create:block/belt/particle", "x": 90, "y": 270 }, @@ -513,7 +513,7 @@ "x": 90 }, "casing=false,facing=north,part=start,slope=sideways": { - "model": "create:block/belt/sideways_end", + "model": "create:block/belt/particle", "x": 180, "y": 180 }, @@ -523,13 +523,13 @@ "y": 180 }, "casing=false,facing=south,part=start,slope=sideways": { - "model": "create:block/belt/sideways_start" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=start,slope=sideways": { "model": "create:block/belt_casing/sideways_start" }, "casing=false,facing=west,part=start,slope=sideways": { - "model": "create:block/belt/sideways_end", + "model": "create:block/belt/particle", "x": 180, "y": 90 }, @@ -539,7 +539,7 @@ "y": 90 }, "casing=false,facing=east,part=start,slope=sideways": { - "model": "create:block/belt/sideways_start", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=start,slope=sideways": { @@ -547,7 +547,7 @@ "y": 270 }, "casing=false,facing=north,part=middle,slope=sideways": { - "model": "create:block/belt/sideways_middle", + "model": "create:block/belt/particle", "x": 180, "y": 180 }, @@ -557,13 +557,13 @@ "y": 180 }, "casing=false,facing=south,part=middle,slope=sideways": { - "model": "create:block/belt/sideways_middle" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=middle,slope=sideways": { "model": "create:block/belt_casing/sideways_middle" }, "casing=false,facing=west,part=middle,slope=sideways": { - "model": "create:block/belt/sideways_middle", + "model": "create:block/belt/particle", "x": 180, "y": 90 }, @@ -573,7 +573,7 @@ "y": 90 }, "casing=false,facing=east,part=middle,slope=sideways": { - "model": "create:block/belt/sideways_middle", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=middle,slope=sideways": { @@ -581,7 +581,7 @@ "y": 270 }, "casing=false,facing=north,part=end,slope=sideways": { - "model": "create:block/belt/sideways_start", + "model": "create:block/belt/particle", "x": 180, "y": 180 }, @@ -591,13 +591,13 @@ "y": 180 }, "casing=false,facing=south,part=end,slope=sideways": { - "model": "create:block/belt/sideways_end" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=end,slope=sideways": { "model": "create:block/belt_casing/sideways_end" }, "casing=false,facing=west,part=end,slope=sideways": { - "model": "create:block/belt/sideways_start", + "model": "create:block/belt/particle", "x": 180, "y": 90 }, @@ -607,7 +607,7 @@ "y": 90 }, "casing=false,facing=east,part=end,slope=sideways": { - "model": "create:block/belt/sideways_end", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=end,slope=sideways": { @@ -615,7 +615,7 @@ "y": 270 }, "casing=false,facing=north,part=pulley,slope=sideways": { - "model": "create:block/belt/sideways_middle", + "model": "create:block/belt/particle", "x": 180, "y": 180 }, @@ -625,13 +625,13 @@ "y": 180 }, "casing=false,facing=south,part=pulley,slope=sideways": { - "model": "create:block/belt/sideways_middle" + "model": "create:block/belt/particle" }, "casing=true,facing=south,part=pulley,slope=sideways": { "model": "create:block/belt_casing/sideways_pulley" }, "casing=false,facing=west,part=pulley,slope=sideways": { - "model": "create:block/belt/sideways_middle", + "model": "create:block/belt/particle", "x": 180, "y": 90 }, @@ -641,7 +641,7 @@ "y": 90 }, "casing=false,facing=east,part=pulley,slope=sideways": { - "model": "create:block/belt/sideways_middle", + "model": "create:block/belt/particle", "y": 270 }, "casing=true,facing=east,part=pulley,slope=sideways": { diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index b2ccfbad5..04818d7a5 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -33,8 +33,18 @@ public class AllBlockPartials { SCHEMATICANNON_PIPE = get("schematicannon/pipe"), SHAFTLESS_COGWHEEL = get("cogwheel_shaftless"), - BELT_PULLEY = get("belt_pulley"), SHAFT_HALF = get("shaft_half"), + + BELT_PULLEY = get("belt_pulley"), + BELT_START = get("belt/start"), + BELT_MIDDLE = get("belt/middle"), + BELT_END = get("belt/end"), + BELT_START_BOTTOM = get("belt/start_bottom"), + BELT_MIDDLE_BOTTOM = get("belt/middle_bottom"), + BELT_END_BOTTOM = get("belt/end_bottom"), + BELT_DIAGONAL_START = get("belt/diagonal_start"), + BELT_DIAGONAL_MIDDLE = get("belt/diagonal_middle"), + BELT_DIAGONAL_END = get("belt/diagonal_end"), ENCASED_FAN_INNER = get("encased_fan/propeller"), HAND_CRANK_HANDLE = get("hand_crank/handle"), diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index beeb4fa4e..c2ea18237 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -52,6 +52,8 @@ public class AllSpriteShifts { public static final SpriteShiftEntry BELT = SpriteShifter.get("block/belt", "block/belt_animated"), + BELT_OFFSET = SpriteShifter.get("block/belt_offset", "block/belt_animated"), + BELT_DIAGONAL = SpriteShifter.get("block/belt_diagonal", "block/belt_diagonal_animated"), ANDESIDE_BELT_CASING = SpriteShifter.get("block/brass_casing_belt", "block/andesite_casing_belt"), CRAFTER_THINGIES = SpriteShifter.get("block/crafter_thingies", "block/crafter_thingies"); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java index 7b5164156..7a9dd7708 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java @@ -26,7 +26,7 @@ public class BeltGenerator extends SpecialBlockStateGen { Boolean casing = state.get(BeltBlock.CASING); BeltSlope slope = state.get(BeltBlock.SLOPE); - boolean flip = casing && slope == BeltSlope.UPWARD; + boolean flip = slope == BeltSlope.UPWARD; boolean rotate = casing && slope == BeltSlope.VERTICAL; Direction direction = state.get(BeltBlock.HORIZONTAL_FACING); return horizontalAngle(direction) + (flip ? 180 : 0) + (rotate ? 90 : 0); @@ -36,6 +36,11 @@ public class BeltGenerator extends SpecialBlockStateGen { public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, BlockState state) { Boolean casing = state.get(BeltBlock.CASING); + + if (!casing) + return prov.models() + .getExistingFile(prov.modLoc("block/belt/particle")); + BeltPart part = state.get(BeltBlock.PART); Direction direction = state.get(BeltBlock.HORIZONTAL_FACING); BeltSlope slope = state.get(BeltBlock.SLOPE); @@ -49,7 +54,7 @@ public class BeltGenerator extends SpecialBlockStateGen { if (!casing && pulley) part = BeltPart.MIDDLE; - if ((vertical && negative || casing && downward || sideways && negative) && part != BeltPart.MIDDLE && !pulley) + if ((vertical && negative || downward || sideways && negative) && part != BeltPart.MIDDLE && !pulley) part = part == BeltPart.END ? BeltPart.START : BeltPart.END; if (!casing && vertical) @@ -61,7 +66,7 @@ public class BeltGenerator extends SpecialBlockStateGen { String slopeName = slope.getName(); String partName = part.getName(); - if (casing && diagonal) + if (diagonal) slopeName = "diagonal"; ResourceLocation location = prov.modLoc(path + slopeName + "_" + partName); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java index fc42ce225..c8ddacd8d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java @@ -1,7 +1,5 @@ package com.simibubi.create.content.contraptions.relays.belt; -import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; - import java.util.Random; import com.mojang.blaze3d.matrix.MatrixStack; @@ -10,11 +8,13 @@ import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.CreateClient; -import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; +import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; +import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.MatrixStacker; import com.simibubi.create.foundation.utility.ShadowRenderHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction; @@ -49,45 +48,86 @@ public class BeltRenderer extends SafeTileEntityRenderer { if (!AllBlocks.BELT.has(blockState)) return; - BlockState renderedState = getBeltState(te); - SuperByteBuffer beltBuffer = - CreateClient.bufferCache.renderBlockIn(KineticTileEntityRenderer.KINETIC_TILE, renderedState); + BeltSlope beltSlope = blockState.get(BeltBlock.SLOPE); + BeltPart part = blockState.get(BeltBlock.PART); + Direction facing = blockState.get(BeltBlock.HORIZONTAL_FACING); + AxisDirection axisDirection = facing.getAxisDirection(); + + boolean downward = beltSlope == BeltSlope.DOWNWARD; + boolean upward = beltSlope == BeltSlope.UPWARD; + boolean diagonal = downward || upward; + boolean start = part == BeltPart.START; + boolean end = part == BeltPart.END; + boolean sideways = beltSlope == BeltSlope.SIDEWAYS; + boolean alongX = facing.getAxis() == Axis.X; - beltBuffer.color(te.color == -1 ? 0x808080 : te.color); + MatrixStacker msr = MatrixStacker.of(ms); + IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid()); + float renderTick = AnimationTickHolder.getRenderTick(); - // UV shift - float speed = te.getSpeed(); - if (speed != 0) { - float time = AnimationTickHolder.getRenderTick() * blockState.get(HORIZONTAL_FACING) - .getAxisDirection() - .getOffset(); - Direction facing = renderedState.get(BeltBlock.HORIZONTAL_FACING); - if (facing.getAxis() == Axis.X && renderedState.get(BeltBlock.SLOPE) != BeltSlope.SIDEWAYS) - speed = -speed; - int textureIndex = (int) ((speed * time / 36) % 16); - if (textureIndex < 0) - textureIndex += 16; + ms.push(); + msr.centre(); + msr.rotateY(AngleHelper.horizontalAngle(facing) + (upward ? 180 : 0) + (sideways ? 270 : 0)); + msr.rotateZ(sideways ? 90 : 0); + msr.rotateX(!diagonal && beltSlope != BeltSlope.HORIZONTAL ? 90 : 0); + msr.unCentre(); - beltBuffer.shiftUVtoSheet(AllSpriteShifts.BELT, (textureIndex % 4) / 4f, (textureIndex / 4) / 4f, 4); - } else { - beltBuffer.dontShiftUV(); + if (downward || beltSlope == BeltSlope.VERTICAL && axisDirection == AxisDirection.POSITIVE) { + boolean b = start; + start = end; + end = b; } - IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid()); + for (boolean bottom : Iterate.trueAndFalse) { - int packedLightmapCoords = WorldRenderer.getLightmapCoordinates(te.getWorld(), blockState, te.getPos()); - beltBuffer.light(packedLightmapCoords) - .renderInto(ms, vb); + AllBlockPartials beltPartial = diagonal + ? start ? AllBlockPartials.BELT_DIAGONAL_START + : end ? AllBlockPartials.BELT_DIAGONAL_END : AllBlockPartials.BELT_DIAGONAL_MIDDLE + : bottom + ? start ? AllBlockPartials.BELT_START_BOTTOM + : end ? AllBlockPartials.BELT_END_BOTTOM : AllBlockPartials.BELT_MIDDLE_BOTTOM + : start ? AllBlockPartials.BELT_START + : end ? AllBlockPartials.BELT_END : AllBlockPartials.BELT_MIDDLE; + + SuperByteBuffer beltBuffer = beltPartial.renderOn(blockState) + .light(light); + SpriteShiftEntry spriteShift = + diagonal ? AllSpriteShifts.BELT_DIAGONAL : bottom ? AllSpriteShifts.BELT_OFFSET : AllSpriteShifts.BELT; + int cycleLength = diagonal ? 12 : 16; + int cycleOffset = bottom ? 8 : 0; + + // UV shift + float speed = te.getSpeed(); + if (speed != 0) { + float time = renderTick * axisDirection.getOffset(); + if (diagonal && (downward ^ alongX) || !sideways && !diagonal && alongX + || sideways && axisDirection == AxisDirection.NEGATIVE) + speed = -speed; + int textureIndex = (int) (((speed * time / 36) + cycleOffset) % cycleLength); + if (textureIndex < 0) + textureIndex += cycleLength; + + beltBuffer.shiftUVtoSheet(spriteShift, (textureIndex % 4) / 4f, (textureIndex / 4) / 4f, 4); + } else { + beltBuffer.dontShiftUV(); + } + + beltBuffer.renderInto(ms, vb); + + // Diagonal belt do not have a separate bottom model + if (diagonal) + break; + } + ms.pop(); if (te.hasPulley()) { // TODO 1.15 find a way to cache this model matrix computation MatrixStack modelTransform = new MatrixStack(); Direction dir = blockState.get(BeltBlock.HORIZONTAL_FACING) .rotateY(); - if (blockState.get(BeltBlock.SLOPE) == BeltSlope.SIDEWAYS) + if (sideways) dir = Direction.UP; - MatrixStacker msr = MatrixStacker.of(modelTransform); - + msr = MatrixStacker.of(modelTransform); msr.centre(); if (dir.getAxis() == Axis.X) msr.rotateY(90); @@ -144,7 +184,8 @@ public class BeltRenderer extends SafeTileEntityRenderer { verticalMovement = verticalMovement * (Math.min(offset, te.beltLength - .5f) - .5f); Vec3d offsetVec = new Vec3d(directionVec).scale(offset) .add(0, verticalMovement, 0); - boolean onSlope = slope != BeltSlope.HORIZONTAL && MathHelper.clamp(offset, .5f, te.beltLength - .5f) == offset; + boolean onSlope = + slope != BeltSlope.HORIZONTAL && MathHelper.clamp(offset, .5f, te.beltLength - .5f) == offset; boolean tiltForward = (slope == BeltSlope.DOWNWARD ^ te.getBeltFacing() .getAxisDirection() == AxisDirection.POSITIVE) == (te.getBeltFacing() .getAxis() == Axis.Z); @@ -204,9 +245,4 @@ public class BeltRenderer extends SafeTileEntityRenderer { ms.pop(); } - protected BlockState getBeltState(KineticTileEntity te) { - return te.getBlockState() - .with(BeltBlock.CASING, false); - } - } diff --git a/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java b/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java index ed4bf8f40..545d41a50 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java +++ b/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java @@ -74,6 +74,8 @@ public class MatrixStacker { } private MatrixStacker multiply(Vector3f axis, double angle) { + if (angle == 0) + return this; ms.multiply(axis.getDegreesQuaternion((float) angle)); return this; } diff --git a/src/main/resources/assets/create/models/block/belt/diagonal_end.json b/src/main/resources/assets/create/models/block/belt/diagonal_end.json new file mode 100644 index 000000000..5a73025f5 --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/diagonal_end.json @@ -0,0 +1,123 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/belt_diagonal", + "particle": "create:block/belt_diagonal" + }, + "elements": [ + { + "name": "Bottom", + "from": [0.9, 3, 1], + "to": [15.1, 5, 6.8], + "faces": { + "north": {"uv": [1, 6, 15, 7], "rotation": 180, "texture": "#0"}, + "east": {"uv": [14, 0, 16, 6], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 2, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 0, 15, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 0, 15, 6], "texture": "#0"} + } + }, + { + "name": "Bottom", + "from": [2.9, 5, 2], + "to": [13.1, 6, 6.8], + "faces": { + "east": {"uv": [3, 0, 4, 5], "rotation": 270, "texture": "#0"}, + "west": {"uv": [12, 0, 13, 5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [3, 0, 13, 5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top", + "from": [0.9, 11, 1], + "to": [15.1, 13, 10.1], + "faces": { + "north": {"uv": [1, 6, 15, 5], "rotation": 180, "texture": "#0"}, + "east": {"uv": [14, 6, 16, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 6, 2, 15], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 6, 15, 15], "texture": "#0"}, + "down": {"uv": [1, 6, 15, 15], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top", + "from": [2.9, 10, 2], + "to": [13.1, 11, 10.1], + "faces": { + "east": {"uv": [3, 7, 4, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [12, 7, 13, 15], "rotation": 270, "texture": "#0"}, + "down": {"uv": [3, 7, 13, 15], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Side", + "from": [1, 4, 0], + "to": [15, 12, 2], + "faces": { + "north": {"uv": [1, 8, 15, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [14, 8, 16, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [1, 8, 15, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 8, 2, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [1, 4, 15, 5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 7, 15, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Side", + "from": [2.9, 6, 2], + "to": [13.1, 10, 3], + "faces": { + "east": {"uv": [3, 10, 4, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [3, 10, 13, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [12, 10, 13, 14], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal", + "from": [1, 3, 9.25], + "to": [15, 5, 19.328], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [14, 5, 16, 15], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 4, 2, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 4, 15, 14], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 4, 15, 14], "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal", + "from": [3, 5, 9.25], + "to": [13, 6, 19.328], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [3, 4, 4, 14], "rotation": 270, "texture": "#0"}, + "west": {"uv": [12, 4, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [3, 4, 13, 14], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top Diagonal", + "from": [1, 11, 5.9], + "to": [15, 13, 19.328], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [14, 3, 16, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 3, 2, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 3, 15, 16], "texture": "#0"}, + "down": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top Diagonal", + "from": [3, 10, 6.9], + "to": [13, 11, 19.328], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [3, 4, 4, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [12, 4, 13, 16], "rotation": 270, "texture": "#0"}, + "down": {"uv": [3, 4, 13, 16], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/diagonal_middle.json b/src/main/resources/assets/create/models/block/belt/diagonal_middle.json new file mode 100644 index 000000000..2855a73c1 --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/diagonal_middle.json @@ -0,0 +1,118 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/belt_diagonal", + "particle": "create:block/belt_diagonal" + }, + "elements": [ + { + "name": "Top Diagonal First", + "from": [3, 10, -3.305], + "to": [13, 11, 8.02], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [3, 4, 4, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [12, 4, 13, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 0, 15, 10], "texture": "#0"}, + "down": {"uv": [3, 4, 13, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top Diagonal First", + "from": [1, 11, -3.3], + "to": [15, 13, 8.02], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [14, 4, 16, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 4, 2, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 4, 15, 16], "texture": "#0"}, + "down": {"uv": [1, 4, 15, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top Diagonal", + "from": [3, 10, 8], + "to": [13, 11, 19.325], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [3, 4, 4, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [12, 4, 13, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 3, 15, 16], "texture": "#0"}, + "down": {"uv": [3, 4, 13, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top Diagonal", + "from": [1, 11, 8], + "to": [15, 13, 19.325], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [14, 4, 16, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 4, 2, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 4, 15, 16], "texture": "#0"}, + "down": {"uv": [1, 4, 15, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal First", + "from": [3, -3.305, 5], + "to": [13, 8.02, 6], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 4, 4, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [3, 4, 13, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [12, 4, 13, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal First", + "from": [1, -3.3, 3], + "to": [15, 8.02, 5], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 4, 15, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [14, 4, 16, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [1, 4, 15, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 4, 2, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal", + "from": [3, 8, 5], + "to": [13, 19.325, 6], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 4, 4, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [3, 4, 13, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [12, 4, 13, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal", + "from": [1, 8, 3], + "to": [15, 19.325, 5], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 4, 15, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [14, 4, 16, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [1, 4, 15, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 4, 2, 16], "rotation": 180, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "Top", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3] + }, + { + "name": "Bottom", + "origin": [8, 8, 8], + "children": [4, 5, 6, 7] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/diagonal_start.json b/src/main/resources/assets/create/models/block/belt/diagonal_start.json new file mode 100644 index 000000000..0ae5d7615 --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/diagonal_start.json @@ -0,0 +1,123 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/belt_diagonal", + "particle": "create:block/belt_diagonal" + }, + "elements": [ + { + "name": "Top", + "from": [0.9, 11, 9.2], + "to": [15.1, 13, 15], + "faces": { + "east": {"uv": [14, 0, 16, 6], "rotation": 90, "texture": "#0"}, + "south": {"uv": [1, 6, 15, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 6], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 0, 15, 6], "texture": "#0"}, + "down": {"uv": [1, 0, 15, 6], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top", + "from": [2.9, 10, 9.2], + "to": [13.1, 11, 14], + "faces": { + "east": {"uv": [3, 0, 4, 5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [12, 0, 13, 5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [3, 0, 13, 4.8], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Bottom", + "from": [0.9, 3, 5.9], + "to": [15.1, 5, 15], + "faces": { + "east": {"uv": [14, 6, 16, 15], "rotation": 270, "texture": "#0"}, + "south": {"uv": [1, 5, 15, 6], "texture": "#0"}, + "west": {"uv": [0, 6, 2, 15], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 6, 15, 15], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 6, 15, 15], "texture": "#0"} + } + }, + { + "name": "Bottom", + "from": [2.9, 5, 5.9], + "to": [13.1, 6, 14], + "faces": { + "east": {"uv": [3, 7, 4, 15], "rotation": 270, "texture": "#0"}, + "west": {"uv": [12, 7, 13, 15], "rotation": 90, "texture": "#0"}, + "up": {"uv": [3, 7, 13, 15], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Side", + "from": [1, 4, 14], + "to": [15, 12, 16], + "faces": { + "north": {"uv": [1, 8, 15, 16], "texture": "#0"}, + "east": {"uv": [14, 8, 16, 16], "texture": "#0"}, + "south": {"uv": [1, 8, 15, 16], "texture": "#0"}, + "west": {"uv": [0, 8, 2, 16], "texture": "#0"}, + "up": {"uv": [1, 7, 15, 8], "texture": "#0"}, + "down": {"uv": [1, 4, 15, 5], "texture": "#0"} + } + }, + { + "name": "Side", + "from": [2.9, 6, 13], + "to": [13.1, 10, 14], + "faces": { + "north": {"uv": [3, 10, 13, 14], "texture": "#0"}, + "east": {"uv": [3, 10, 4, 14], "texture": "#0"}, + "west": {"uv": [12, 10, 13, 14], "texture": "#0"} + } + }, + { + "name": "Top Diagonal", + "from": [1, 11, -3.325], + "to": [15, 13, 6.8], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [14, 4, 16, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 4, 2, 14], "rotation": 270, "texture": "#0"}, + "up": {"uv": [1, 4, 15, 14], "texture": "#0"}, + "down": {"uv": [1, 4, 15, 14], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Top Diagonal", + "from": [3, 10, -3.325], + "to": [13, 11, 6.8], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [3, 4, 4, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [12, 4, 13, 14], "rotation": 270, "texture": "#0"}, + "down": {"uv": [3, 4, 13, 14], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal", + "from": [1, 3, -3.325], + "to": [15, 5, 10.1], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [14, 3, 16, 16], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 3, 2, 16], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 3, 15, 16], "texture": "#0"} + } + }, + { + "name": "Bottom Diagonal", + "from": [3, 5, -3.325], + "to": [13, 6, 10.1], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [2, 3, 3, 16], "rotation": 270, "texture": "#0"}, + "west": {"uv": [13, 3, 14, 16], "rotation": 90, "texture": "#0"}, + "up": {"uv": [3, 3, 13, 16], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/downward_end.json b/src/main/resources/assets/create/models/block/belt/downward_end.json deleted file mode 100644 index af1981e69..000000000 --- a/src/main/resources/assets/create/models/block/belt/downward_end.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Top", - "from": [0.9, 11, 9.2], - "to": [15.1, 13, 15], - "faces": { - "east": {"uv": [0, 1, 2, 7], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 1, 16, 7], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 6.8], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 1, 15, 6.8], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [2.9, 10, 9.2], - "to": [13.1, 11, 14], - "faces": { - "east": {"uv": [2, 2, 3, 7], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "west": {"uv": [13, 2, 14, 7], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 6.8], "rotation": 180, "texture": "#0"}, - "down": {"uv": [3, 2, 13, 7], "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [0.9, 3, 5.9], - "to": [15.1, 5, 15], - "faces": { - "east": {"uv": [0, 6, 2, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 5, 15, 3], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 6, 16, 15], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 6, 15, 15], "texture": "#0"}, - "down": {"uv": [1, 6, 15, 15], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [2.9, 5, 5.9], - "to": [13.1, 6, 14], - "faces": { - "east": {"uv": [2, 6, 3, 14], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 5, 15, 3], "rotation": 180, "texture": "#0"}, - "west": {"uv": [13, 6, 14, 14], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 7, 13, 15], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [1, 4, 14], - "to": [15, 12, 16], - "faces": { - "north": {"uv": [1, 4, 15, 12], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 4, 2, 12], "rotation": 180, "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 4, 16, 12], "rotation": 180, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "down": {"uv": [1, 11, 15, 13], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [2.9, 6, 13], - "to": [13.1, 10, 14], - "faces": { - "north": {"uv": [3, 6, 13, 10], "rotation": 180, "texture": "#0"}, - "east": {"uv": [2, 6, 3, 10], "rotation": 180, "texture": "#0"}, - "west": {"uv": [13, 6, 14, 10], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [1, 11, -3.325], - "to": [15, 13, 6.7], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 7, 15, 9], "texture": "#0"}, - "east": {"uv": [0, 6, 2, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 6, 15, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 5.8, 15, 16], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [3, 10, -3.325], - "to": [13, 11, 6.7], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [2, 6, 3, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [13, 6, 14, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 5.8, 13, 16], "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [1, 3, -3.325], - "to": [15, 5, 10.1], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 7, 15, 9], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 13], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 13], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 13], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 13], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [3, 5, -3.325], - "to": [13, 6, 9.1], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [2, 0, 3, 12], "rotation": 90, "texture": "#0"}, - "west": {"uv": [13, 0, 14, 12], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 0, 13, 12], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/downward_middle.json b/src/main/resources/assets/create/models/block/belt/downward_middle.json deleted file mode 100644 index 1b81b5db9..000000000 --- a/src/main/resources/assets/create/models/block/belt/downward_middle.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom Diagonal", - "from": [1, 3, -3.325], - "to": [15, 5, 6.6], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 10], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [3, 5, -3.325], - "to": [13, 6, 6.6], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 0, 14, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 0, 13, 10], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [1, 11, -3.325], - "to": [15, 13, 10], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 3, 2, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 3, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [3, 10, -3.325], - "to": [13, 11, 10], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 3, 14, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 3, 3, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 3, 13, 16], "texture": "#0"} - } - }, - { - "name": "Top Diagonal First", - "from": [1, 11, 10], - "to": [15, 13, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 11, 15, 13], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10.2], "texture": "#0"} - } - }, - { - "name": "Top Diagonal First", - "from": [3, 10, 10], - "to": [13, 11, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 0, 14, 10], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 10], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 0, 13, 10], "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal First", - "from": [1, 3, 6.6], - "to": [15, 5, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 3, 2, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 3, 16, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 16], "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal First", - "from": [3, 5, 6.6], - "to": [13, 6, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 3, 14, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 3, 3, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 3, 13, 16], "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/downward_start.json b/src/main/resources/assets/create/models/block/belt/downward_start.json deleted file mode 100644 index d2654a350..000000000 --- a/src/main/resources/assets/create/models/block/belt/downward_start.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [0.9, 3, 1], - "to": [15.1, 5, 6.8], - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 1, 2, 7], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 1, 16, 7], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 6.8], "texture": "#0"}, - "down": {"uv": [1, 1, 15, 6.8], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [2.9, 5, 2], - "to": [13.1, 6, 6.8], - "faces": { - "east": {"uv": [2, 2, 3, 7], "rotation": 90, "texture": "#0"}, - "west": {"uv": [13, 2, 14, 7], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 2, 13, 7], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [0.9, 11, 1], - "to": [15.1, 13, 10.1], - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 6, 2, 15], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 6, 16, 15], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 6, 15, 15], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 6, 15, 15], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [2.9, 10, 2], - "to": [13.1, 11, 10.1], - "faces": { - "east": {"uv": [13, 6, 14, 14], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 6, 3, 14], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 6, 13, 14], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [1, 4, 0], - "to": [15, 12, 2], - "faces": { - "north": {"uv": [1, 4, 15, 12], "texture": "#0"}, - "east": {"uv": [0, 4, 2, 12], "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "texture": "#0"}, - "west": {"uv": [14, 4, 16, 12], "texture": "#0"}, - "up": {"uv": [1, 3, 15, 5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Side", - "from": [2.9, 6, 2], - "to": [13.1, 10, 3], - "faces": { - "east": {"uv": [2, 6, 3, 10], "texture": "#0"}, - "south": {"uv": [3, 6, 13, 10], "texture": "#0"}, - "west": {"uv": [13, 6, 14, 10], "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [1, 3, 9.2], - "to": [15, 5, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 1, 2, 11], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 1, 16, 11], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 11.1], "texture": "#0"}, - "down": {"uv": [1, 1, 15, 11], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [3, 5, 9.2], - "to": [13, 6, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 1, 14, 11], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 1, 3, 11], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 1, 13, 11.1], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [1, 11, 5.9], - "to": [15, 13, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 13], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 13], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 13], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 0, 15, 13], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [3, 10, 6.9], - "to": [13, 11, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 0, 14, 12], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 12], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 0, 13, 12], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/end.json b/src/main/resources/assets/create/models/block/belt/end.json new file mode 100644 index 000000000..142f58c71 --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/end.json @@ -0,0 +1,54 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/belt" + }, + "elements": [ + { + "name": "Top", + "from": [1, 11, 0], + "to": [15, 13, 15], + "faces": { + "east": {"uv": [0, 1, 2, 16], "rotation": 270, "texture": "#0"}, + "south": {"uv": [1, 1, 15, 0], "texture": "#0"}, + "west": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 1, 15, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 1, 15, 16], "texture": "#0"} + } + }, + { + "name": "Top", + "from": [3, 10, 0], + "to": [13, 11, 14], + "faces": { + "east": {"uv": [3, 2, 4, 16], "rotation": 270, "texture": "#0"}, + "west": {"uv": [12, 2, 13, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 2, 13, 16], "texture": "#0"} + } + }, + { + "name": "Side", + "from": [1.1, 4, 14], + "to": [14.9, 12, 16], + "faces": { + "north": {"uv": [1, 8, 15, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 8, 2, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [1, 8, 15, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [14, 8, 16, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 8, 15, 9], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Side", + "from": [3, 6, 13], + "to": [13, 10, 14], + "faces": { + "north": {"uv": [3, 10, 13, 14], "rotation": 180, "texture": "#0"}, + "east": {"uv": [12, 10, 13, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 10, 4, 14], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/end_bottom.json b/src/main/resources/assets/create/models/block/belt/end_bottom.json new file mode 100644 index 000000000..1947f8302 --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/end_bottom.json @@ -0,0 +1,31 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "create:block/belt_offset" + }, + "elements": [ + { + "name": "Bottom", + "from": [1, 3, 0], + "to": [15, 5, 15], + "faces": { + "east": {"uv": [0, 0, 2, 15], "rotation": 90, "texture": "#1"}, + "south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#1"}, + "west": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#1"}, + "up": {"uv": [1, 0, 15, 15], "texture": "#1"}, + "down": {"uv": [1, 0, 15, 15], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "Bottom", + "from": [3, 5, 0], + "to": [13, 6, 14], + "faces": { + "east": {"uv": [3, 0, 4, 14], "rotation": 90, "texture": "#1"}, + "west": {"uv": [12, 0, 13, 14], "rotation": 270, "texture": "#1"}, + "up": {"uv": [3, 0, 13, 14], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/horizontal_end.json b/src/main/resources/assets/create/models/block/belt/horizontal_end.json deleted file mode 100644 index 180675f62..000000000 --- a/src/main/resources/assets/create/models/block/belt/horizontal_end.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [1, 3, 0], - "to": [15, 5, 15], - "faces": { - "east": {"uv": [0, 0, 2, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 3, 15, 5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 15], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 15], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [3, 5, 0], - "to": [13, 6, 14], - "faces": { - "east": {"uv": [2, 0, 3, 14], "rotation": 90, "texture": "#0"}, - "west": {"uv": [13, 0, 14, 14], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 0, 13, 14], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [1, 11, 0], - "to": [15, 13, 15], - "faces": { - "east": {"uv": [0, 1, 2, 16], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1, 5, 15, 3], "texture": "#0"}, - "west": {"uv": [14, 1, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 1, 15, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [3, 10, 0], - "to": [13, 11, 14], - "faces": { - "east": {"uv": [2, 2, 3, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [13, 2, 14, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 2, 13, 16], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [1.1, 4, 14], - "to": [14.9, 12, 16], - "faces": { - "north": {"uv": [1, 4, 15, 12], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 4, 2, 12], "rotation": 180, "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 4, 16, 12], "rotation": 180, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Side", - "from": [3, 6, 13], - "to": [13, 10, 14], - "faces": { - "north": {"uv": [3, 6, 13, 10], "rotation": 180, "texture": "#0"}, - "east": {"uv": [2, 6, 3, 10], "rotation": 180, "texture": "#0"}, - "west": {"uv": [13, 6, 14, 10], "rotation": 180, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/horizontal_middle.json b/src/main/resources/assets/create/models/block/belt/horizontal_middle.json deleted file mode 100644 index 2c2a87512..000000000 --- a/src/main/resources/assets/create/models/block/belt/horizontal_middle.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [1, 3, 0], - "to": [15, 5, 16], - "faces": { - "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 16], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [3, 5, 0], - "to": [13, 6, 16], - "faces": { - "east": {"uv": [13, 0, 14, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 0, 13, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [1, 11, 0], - "to": [15, 13, 16], - "faces": { - "east": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 0, 15, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [3, 10, 0], - "to": [13, 11, 16], - "faces": { - "east": {"uv": [13, 0, 14, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [13, 0, 14, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 0, 13, 16], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/horizontal_start.json b/src/main/resources/assets/create/models/block/belt/horizontal_start.json deleted file mode 100644 index e58a1b2f9..000000000 --- a/src/main/resources/assets/create/models/block/belt/horizontal_start.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [1, 3, 1], - "to": [15, 5, 16], - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 1, 2, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 1, 16, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 16], "texture": "#0"}, - "down": {"uv": [1, 1, 15, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [3, 5, 2], - "to": [13, 6, 16], - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [13, 2, 14, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 2, 3, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [3, 2, 13, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [3, 10, 2], - "to": [13, 11, 16], - "faces": { - "east": {"uv": [2, 2, 3, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [13, 2, 14, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 2, 13, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [1, 11, 1], - "to": [15, 13, 16], - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 15], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 15], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 15], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 1, 15, 16], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [1.1, 4, 0], - "to": [14.9, 12, 2], - "faces": { - "north": {"uv": [1, 4, 15, 12], "texture": "#0"}, - "east": {"uv": [0, 4, 2, 12], "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "texture": "#0"}, - "west": {"uv": [14, 4, 16, 12], "texture": "#0"}, - "up": {"uv": [1, 3, 15, 5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Side", - "from": [3, 6, 2], - "to": [13, 10, 3], - "faces": { - "east": {"uv": [2, 6, 3, 10], "texture": "#0"}, - "south": {"uv": [3, 6, 13, 10], "texture": "#0"}, - "west": {"uv": [13, 6, 14, 10], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/middle.json b/src/main/resources/assets/create/models/block/belt/middle.json new file mode 100644 index 000000000..3db35509a --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/middle.json @@ -0,0 +1,30 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/belt" + }, + "elements": [ + { + "name": "Top", + "from": [1, 11, 0], + "to": [15, 13, 16], + "faces": { + "east": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"}, + "west": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 0, 15, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 0, 15, 16], "texture": "#0"} + } + }, + { + "name": "Top", + "from": [3, 10, 0], + "to": [13, 11, 16], + "faces": { + "east": {"uv": [12, 0, 13, 16], "rotation": 270, "texture": "#0"}, + "west": {"uv": [3, 0, 4, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 0, 13, 16], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/middle_bottom.json b/src/main/resources/assets/create/models/block/belt/middle_bottom.json new file mode 100644 index 000000000..64454f09c --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/middle_bottom.json @@ -0,0 +1,30 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "create:block/belt_offset" + }, + "elements": [ + { + "name": "Bottom", + "from": [1, 3, 0], + "to": [15, 5, 16], + "faces": { + "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#1"}, + "up": {"uv": [1, 0, 15, 16], "texture": "#1"}, + "down": {"uv": [1, 0, 15, 16], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "Bottom", + "from": [3, 5, 0], + "to": [13, 6, 16], + "faces": { + "east": {"uv": [12, 0, 13, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "rotation": 270, "texture": "#1"}, + "up": {"uv": [3, 0, 13, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/particle.json b/src/main/resources/assets/create/models/block/belt/particle.json new file mode 100644 index 000000000..abb3be97e --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/particle.json @@ -0,0 +1,7 @@ +{ + "textures": { + "particle": "create:block/belt" + }, + "elements": [ + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/sideways_end.json b/src/main/resources/assets/create/models/block/belt/sideways_end.json deleted file mode 100644 index b4a5bd46d..000000000 --- a/src/main/resources/assets/create/models/block/belt/sideways_end.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [11, 1, 0], - "to": [13, 15, 15], - "faces": { - "east": {"uv": [1, 0, 15, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 3, 15, 5], "rotation": 90, "texture": "#0"}, - "west": {"uv": [1, 0, 15, 15], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 0, 2, 15], "texture": "#0"}, - "down": {"uv": [14, 0, 16, 15], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [10, 3, 0], - "to": [11, 13, 14], - "faces": { - "west": {"uv": [3, 0, 13, 14], "rotation": 270, "texture": "#0"}, - "up": {"uv": [2, 0, 3, 14], "texture": "#0"}, - "down": {"uv": [13, 0, 14, 14], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Top", - "from": [3, 1, 0], - "to": [5, 15, 15], - "faces": { - "east": {"uv": [1, 1, 15, 16], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1, 5, 15, 3], "rotation": 270, "texture": "#0"}, - "west": {"uv": [1, 1, 15, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 1, 2, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14, 1, 16, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [5, 3, 0], - "to": [6, 13, 14], - "faces": { - "east": {"uv": [3, 2, 13, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [2, 2, 3, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [13, 2, 14, 16], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [4, 1.1, 14], - "to": [12, 14.9, 16], - "faces": { - "north": {"uv": [1, 4, 15, 12], "rotation": 270, "texture": "#0"}, - "east": {"uv": [1, 11, 15, 13], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "rotation": 90, "texture": "#0"}, - "west": {"uv": [1, 3, 15, 5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 4, 2, 12], "rotation": 90, "texture": "#0"}, - "down": {"uv": [14, 4, 16, 12], "rotation": 90, "texture": "#0"} - } - }, - { - "name": "Side", - "from": [6, 3, 13], - "to": [10, 13, 14], - "faces": { - "north": {"uv": [3, 6, 13, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [2, 6, 3, 10], "rotation": 90, "texture": "#0"}, - "down": {"uv": [13, 6, 14, 10], "rotation": 90, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/sideways_middle.json b/src/main/resources/assets/create/models/block/belt/sideways_middle.json deleted file mode 100644 index ed352bba5..000000000 --- a/src/main/resources/assets/create/models/block/belt/sideways_middle.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [11, 1, 0], - "to": [13, 15, 16], - "faces": { - "east": {"uv": [1, 0, 15, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [1, 0, 15, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#0"}, - "down": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [10, 3, 0], - "to": [11, 13, 16], - "faces": { - "west": {"uv": [3, 0, 13, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [13, 0, 14, 16], "texture": "#0"}, - "down": {"uv": [2, 0, 3, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Top", - "from": [3, 1, 0], - "to": [5, 15, 16], - "faces": { - "east": {"uv": [1, 0, 15, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [1, 0, 15, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 0, 2, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14, 0, 16, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [5, 3, 0], - "to": [6, 13, 16], - "faces": { - "east": {"uv": [3, 0, 13, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [13, 0, 14, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [13, 0, 14, 16], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/sideways_start.json b/src/main/resources/assets/create/models/block/belt/sideways_start.json deleted file mode 100644 index 6ab8c2414..000000000 --- a/src/main/resources/assets/create/models/block/belt/sideways_start.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [11, 1, 1], - "to": [13, 15, 16], - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 270, "texture": "#0"}, - "east": {"uv": [1, 1, 15, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [1, 1, 15, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 1, 2, 16], "texture": "#0"}, - "down": {"uv": [14, 1, 16, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [10, 3, 2], - "to": [11, 13, 16], - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 270, "texture": "#0"}, - "west": {"uv": [3, 2, 13, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [13, 2, 14, 16], "texture": "#0"}, - "down": {"uv": [2, 2, 3, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [5, 3, 2], - "to": [6, 13, 16], - "faces": { - "east": {"uv": [3, 2, 13, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [2, 2, 3, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [13, 2, 14, 16], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [3, 1, 1], - "to": [5, 15, 16], - "faces": { - "north": {"uv": [1, 3, 15, 5], "rotation": 90, "texture": "#0"}, - "east": {"uv": [1, 1, 15, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [1, 0, 15, 15], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 0, 2, 15], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14, 0, 16, 15], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [4, 1.1, 0], - "to": [12, 14.9, 2], - "faces": { - "north": {"uv": [1, 4, 15, 12], "rotation": 90, "texture": "#0"}, - "east": {"uv": [1, 11, 15, 13], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "rotation": 270, "texture": "#0"}, - "west": {"uv": [1, 3, 15, 5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 4, 2, 12], "rotation": 270, "texture": "#0"}, - "down": {"uv": [14, 4, 16, 12], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "Side", - "from": [6, 3, 2], - "to": [10, 13, 3], - "faces": { - "south": {"uv": [3, 6, 13, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [2, 6, 3, 10], "rotation": 270, "texture": "#0"}, - "down": {"uv": [13, 6, 14, 10], "rotation": 270, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/start.json b/src/main/resources/assets/create/models/block/belt/start.json new file mode 100644 index 000000000..ff4a6eed9 --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/start.json @@ -0,0 +1,54 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/belt" + }, + "elements": [ + { + "name": "Top", + "from": [3, 10, 2], + "to": [13, 11, 16], + "faces": { + "east": {"uv": [3, 0, 4, 14], "rotation": 270, "texture": "#0"}, + "west": {"uv": [12, 0, 13, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 0, 13, 14], "texture": "#0"} + } + }, + { + "name": "Top", + "from": [1, 11, 1], + "to": [15, 13, 16], + "faces": { + "north": {"uv": [1, 15, 15, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 15], "rotation": 270, "texture": "#0"}, + "west": {"uv": [14, 0, 16, 15], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 0, 15, 15], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 0, 15, 15], "texture": "#0"} + } + }, + { + "name": "Side", + "from": [1.1, 4, 0], + "to": [14.9, 12, 2], + "faces": { + "north": {"uv": [1, 0, 15, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#0"}, + "south": {"uv": [1, 0, 15, 8], "texture": "#0"}, + "west": {"uv": [14, 0, 16, 8], "texture": "#0"}, + "up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 7, 15, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Side", + "from": [3, 6, 2], + "to": [13, 10, 3], + "faces": { + "east": {"uv": [3, 6, 4, 10], "rotation": 180, "texture": "#0"}, + "south": {"uv": [3, 2, 13, 6], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 10], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/start_bottom.json b/src/main/resources/assets/create/models/block/belt/start_bottom.json new file mode 100644 index 000000000..cecb17d1d --- /dev/null +++ b/src/main/resources/assets/create/models/block/belt/start_bottom.json @@ -0,0 +1,31 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "create:block/belt_offset" + }, + "elements": [ + { + "name": "Bottom", + "from": [1, 3, 1], + "to": [15, 5, 16], + "faces": { + "north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 1, 2, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [14, 1, 16, 16], "rotation": 270, "texture": "#1"}, + "up": {"uv": [1, 1, 15, 16], "texture": "#1"}, + "down": {"uv": [1, 1, 15, 16], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "Bottom", + "from": [3, 5, 2], + "to": [13, 6, 16], + "faces": { + "east": {"uv": [12, 2, 13, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [3, 2, 4, 16], "rotation": 270, "texture": "#1"}, + "up": {"uv": [3, 2, 13, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/upward_end.json b/src/main/resources/assets/create/models/block/belt/upward_end.json deleted file mode 100644 index 3e7cc8f0d..000000000 --- a/src/main/resources/assets/create/models/block/belt/upward_end.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom", - "from": [0.9, 3, 9.2], - "to": [15.1, 5, 15], - "faces": { - "east": {"uv": [0, 9, 2, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 3, 15, 5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 9, 16, 15], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 9, 15, 15], "texture": "#0"}, - "down": {"uv": [1, 9, 15, 14.8], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [2.9, 5, 9.2], - "to": [13.1, 6, 14], - "faces": { - "east": {"uv": [13, 9, 14, 14], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 9, 3, 14], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 9, 13, 14], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [0.9, 11, 5.9], - "to": [15.1, 13, 15], - "faces": { - "east": {"uv": [0, 1, 2, 10], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1, 13, 15, 11], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 1, 16, 10], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 10], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 1, 15, 10], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [2.9, 10, 5.9], - "to": [13.1, 11, 14], - "faces": { - "east": {"uv": [13, 2, 14, 10], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 2, 3, 10], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 2, 13, 10], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [1, 4, 14], - "to": [15, 12, 16], - "faces": { - "north": {"uv": [1, 4, 15, 12], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 4, 2, 12], "rotation": 180, "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 4, 16, 12], "rotation": 180, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "down": {"uv": [1, 11, 15, 13], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [2.9, 6, 13], - "to": [13.1, 10, 14], - "faces": { - "north": {"uv": [3, 6, 13, 10], "rotation": 180, "texture": "#0"}, - "east": {"uv": [13, 6, 14, 10], "rotation": 180, "texture": "#0"}, - "west": {"uv": [2, 6, 3, 10], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [1, 3, -3.328], - "to": [15, 5, 6.75], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 10], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10.2], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [3, 5, -3.328], - "to": [13, 6, 6.75], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 0, 14, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 0, 13, 10], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [1, 11, -3.328], - "to": [15, 13, 10.1], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 3, 2, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 3, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [3, 10, -3.328], - "to": [13, 11, 9.1], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 4, 14, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 4, 3, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 4, 13, 16], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/upward_middle.json b/src/main/resources/assets/create/models/block/belt/upward_middle.json deleted file mode 100644 index 19fbdcb55..000000000 --- a/src/main/resources/assets/create/models/block/belt/upward_middle.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Bottom Diagonal", - "from": [1, 3, -3.325], - "to": [15, 5, 6.6], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 10], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [3, 5, -3.325], - "to": [13, 6, 6.6], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 0, 14, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 0, 13, 10], "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [1, 11, -3.325], - "to": [15, 13, 10], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 3, 2, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 3, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [3, 10, -3.325], - "to": [13, 11, 10], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 3, 14, 16], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 3, 3, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [3, 3, 13, 16], "texture": "#0"} - } - }, - { - "name": "Top Diagonal First", - "from": [1, 11, 9.98], - "to": [15, 13, 19.3], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 11, 15, 13], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10], "texture": "#0"} - } - }, - { - "name": "Top Diagonal First", - "from": [3, 10, 9.98], - "to": [13, 11, 19.3], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 0, 14, 10], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 10], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"}, - "down": {"uv": [3, 0, 13, 10], "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal First", - "from": [1, 3, 6.58], - "to": [15, 5, 19.3], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 3, 2, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 3, 16, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 16], "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal First", - "from": [3, 5, 6.58], - "to": [13, 6, 19.3], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 3, 14, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 3, 3, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 3, 13, 16], "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/upward_start.json b/src/main/resources/assets/create/models/block/belt/upward_start.json deleted file mode 100644 index 84dddff12..000000000 --- a/src/main/resources/assets/create/models/block/belt/upward_start.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/belt", - "particle": "create:block/belt" - }, - "elements": [ - { - "name": "Top", - "from": [0.9, 11, 1], - "to": [15.1, 13, 6.8], - "faces": { - "north": {"uv": [1, 11, 15, 13], "texture": "#0"}, - "east": {"uv": [0, 1, 2, 7], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 1, 16, 7], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 7], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 1, 15, 6.8], "texture": "#0"} - } - }, - { - "name": "Top", - "from": [2.9, 10, 2], - "to": [13.1, 11, 6.8], - "faces": { - "east": {"uv": [13, 2, 14, 7], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 2, 3, 7], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 2, 13, 6.8], "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [0.9, 3, 1], - "to": [15.1, 5, 10.1], - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 1, 2, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 1, 16, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 1, 15, 10], "texture": "#0"}, - "down": {"uv": [1, 1, 15, 10], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [2.9, 5, 2], - "to": [13.1, 6, 10.1], - "faces": { - "east": {"uv": [13, 2, 14, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 2, 3, 10], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 2, 13, 10], "texture": "#0"} - } - }, - { - "name": "Side", - "from": [1, 4, 0], - "to": [15, 12, 2], - "faces": { - "north": {"uv": [1, 4, 15, 12], "texture": "#0"}, - "east": {"uv": [0, 4, 2, 12], "texture": "#0"}, - "south": {"uv": [1, 4, 15, 12], "texture": "#0"}, - "west": {"uv": [14, 4, 16, 12], "texture": "#0"}, - "up": {"uv": [1, 3, 15, 5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Side", - "from": [2.9, 6, 2], - "to": [13.1, 10, 3], - "faces": { - "east": {"uv": [13, 6, 14, 10], "texture": "#0"}, - "south": {"uv": [3, 6, 13, 10], "texture": "#0"}, - "west": {"uv": [2, 6, 3, 10], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [1, 11, 9.2], - "to": [15, 13, 19.325], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 11, 15, 13], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 2, 10], "rotation": 270, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1, 0, 15, 10], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 0, 15, 10], "texture": "#0"} - } - }, - { - "name": "Top Diagonal", - "from": [3, 10, 9.2], - "to": [13, 11, 19.325], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 0, 14, 10], "rotation": 270, "texture": "#0"}, - "west": {"uv": [2, 0, 3, 10], "rotation": 90, "texture": "#0"}, - "down": {"uv": [3, 0, 13, 10], "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [1, 3, 5.9], - "to": [15, 5, 19.325], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#0"}, - "east": {"uv": [0, 3, 2, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [14, 3, 16, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [1, 3, 15, 16], "texture": "#0"}, - "down": {"uv": [1, 3, 15, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "Bottom Diagonal", - "from": [3, 5, 5.9], - "to": [13, 6, 19.325], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [13, 3, 14, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 3, 3, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [3, 3, 13, 16], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/belt.png b/src/main/resources/assets/create/textures/block/belt.png index 68b626dd1..80df740f2 100644 Binary files a/src/main/resources/assets/create/textures/block/belt.png and b/src/main/resources/assets/create/textures/block/belt.png differ diff --git a/src/main/resources/assets/create/textures/block/belt_animated.png b/src/main/resources/assets/create/textures/block/belt_animated.png index 28b236d4b..527b162fa 100644 Binary files a/src/main/resources/assets/create/textures/block/belt_animated.png and b/src/main/resources/assets/create/textures/block/belt_animated.png differ diff --git a/src/main/resources/assets/create/textures/block/belt_diagonal.png b/src/main/resources/assets/create/textures/block/belt_diagonal.png new file mode 100644 index 000000000..e311d5553 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/belt_diagonal.png differ diff --git a/src/main/resources/assets/create/textures/block/belt_diagonal_animated.png b/src/main/resources/assets/create/textures/block/belt_diagonal_animated.png new file mode 100644 index 000000000..29a5552d5 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/belt_diagonal_animated.png differ diff --git a/src/main/resources/assets/create/textures/block/belt_offset.png b/src/main/resources/assets/create/textures/block/belt_offset.png new file mode 100644 index 000000000..84d1001dd Binary files /dev/null and b/src/main/resources/assets/create/textures/block/belt_offset.png differ