From 4ecd5420e0120850d0ccd9d0230f69d56f1f24f4 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 31 Aug 2022 22:22:53 +0600 Subject: [PATCH] Android station minor model update --- .../models/block/android_station.json | 142 ++++++++++++------ .../textures/block/android_station.png | Bin 421 -> 939 bytes 2 files changed, 94 insertions(+), 48 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_station.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_station.json index 4395715e2..fb047e55b 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_station.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_station.json @@ -1,8 +1,8 @@ -{ - "parent": "block/slab", - "texture_size": [32, 64], +{ + "parent": "block/cube_all", + "render_type": "translucent", "textures": { - "texture": "overdrive_that_matters:block/android_station", + "0": "overdrive_that_matters:block/android_station", "particle": "overdrive_that_matters:block/android_station" }, "elements": [ @@ -11,12 +11,12 @@ "from": [0, 7, 0], "to": [16, 9, 16], "faces": { - "north": {"uv": [8, 4, 16, 4.5], "texture": "#texture"}, - "east": {"uv": [0, 4, 8, 4.5], "texture": "#texture"}, - "south": {"uv": [8, 4, 16, 4.5], "texture": "#texture"}, - "west": {"uv": [0, 4, 8, 4.5], "texture": "#texture"}, - "up": {"uv": [8, 0, 16, 4], "texture": "#texture"}, - "down": {"uv": [8, 4.5, 16, 8.5], "texture": "#texture"} + "north": {"uv": [8, 4, 16, 4.5], "texture": "#0"}, + "east": {"uv": [0, 4, 8, 4.5], "texture": "#0"}, + "south": {"uv": [8, 4, 16, 4.5], "texture": "#0"}, + "west": {"uv": [0, 4, 8, 4.5], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 4], "texture": "#0"}, + "down": {"uv": [8, 4.5, 16, 8.5], "texture": "#0"} } }, { @@ -24,12 +24,12 @@ "from": [0, 0, 0], "to": [16, 4, 16], "faces": { - "north": {"uv": [0, 8.5, 8, 9.5], "texture": "#texture"}, - "east": {"uv": [0, 8.5, 8, 9.5], "texture": "#texture"}, - "south": {"uv": [8, 8.5, 16, 9.5], "texture": "#texture"}, - "west": {"uv": [8, 8.5, 16, 9.5], "texture": "#texture"}, - "up": {"uv": [8, 4.5, 16, 8.5], "texture": "#texture"}, - "down": {"uv": [8, 9.5, 16, 13.5], "texture": "#texture"} + "north": {"uv": [0, 8.5, 8, 9.5], "texture": "#0"}, + "east": {"uv": [0, 8.5, 8, 9.5], "texture": "#0"}, + "south": {"uv": [8, 8.5, 16, 9.5], "texture": "#0"}, + "west": {"uv": [8, 8.5, 16, 9.5], "texture": "#0"}, + "up": {"uv": [8, 4.5, 16, 8.5], "texture": "#0"}, + "down": {"uv": [8, 9.5, 16, 13.5], "texture": "#0"} } }, { @@ -37,12 +37,12 @@ "from": [2, 4, 2], "to": [14, 7, 14], "faces": { - "north": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, - "east": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, - "south": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, - "west": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, - "up": {"uv": [9, 5, 15, 8], "texture": "#texture"}, - "down": {"uv": [9, 5, 15, 8], "texture": "#texture"} + "north": {"uv": [1, 0, 7, 0.75], "texture": "#0"}, + "east": {"uv": [1, 0, 7, 0.75], "texture": "#0"}, + "south": {"uv": [1, 0, 7, 0.75], "texture": "#0"}, + "west": {"uv": [1, 0, 7, 0.75], "texture": "#0"}, + "up": {"uv": [9, 5, 15, 8], "texture": "#0"}, + "down": {"uv": [9, 5, 15, 8], "texture": "#0"} } }, { @@ -50,12 +50,12 @@ "from": [1, 4, 13], "to": [3, 7, 15], "faces": { - "north": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, - "east": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "south": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, - "down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} + "north": {"uv": [7, 0, 8, 0.75], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "south": {"uv": [7, 0, 8, 0.75], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"} } }, { @@ -63,12 +63,12 @@ "from": [13, 4, 13], "to": [15, 7, 15], "faces": { - "north": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "east": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, - "down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} + "north": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "east": {"uv": [7, 0, 8, 0.75], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"} } }, { @@ -76,12 +76,12 @@ "from": [13, 4, 1], "to": [15, 7, 3], "faces": { - "north": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, - "east": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "south": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, - "down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} + "north": {"uv": [7, 0, 8, 0.75], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "south": {"uv": [7, 0, 8, 0.75], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"} } }, { @@ -89,13 +89,59 @@ "from": [1, 4, 1], "to": [3, 7, 3], "faces": { - "north": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "east": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, - "west": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, - "down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} + "north": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 0.75], "texture": "#0"}, + "west": {"uv": [7, 0, 8, 0.75], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"} } - } - ] + }, + { + "from": [-1, 10, -1], + "to": [17, 10, 17], + "faces": { + "north": {"uv": [0, 0, 8, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 8, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 8, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 8, 0], "texture": "#missing"}, + "up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"}, + "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 13, 0] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png index 667a8a68090cf28b87da83f8d41072930b2b981a..e198859cf000e2fae6d9c6c6b2ed6b4b5a057248 100644 GIT binary patch delta 899 zcmV-}1AP3Y1FHv+83+ad004WAb*_;iAb$yPNLh0L01m(a01m(bYSxJf0009(NkleZhD<7T@3fpi&oZGhwgLKb=mk1Y-f_dZal}tyX7<8ZT}`u~;NQGy@TE z<@xrB(t?EbIY$6z2xlNo1VYciS%2ef0KaNs9Dlh<5(Va-{|M;G$Yf>XD@hcXd;TM! zr&o~VHN04fX!PONV&P?iu}o%(C=EzNnHYdF?5efCj-l-D?^DBIFc7U)D{#0lVRv^| zR4Ns!HyRBp8NF{Aya({MpS&OgbpHPQrZhiSu3cAJaz4NBh+Frz7A52S2!9?t+6g$2 zgiH+RcR#9HGS+H$vNIqqC5M3n3Ij4t#aPrvbTYpS5Q#W3$?Y_YNU5pt9>09! zw16w2Uqolg;w^Z)_e^Qa34a@#cD{!n7Eo}C!(Njx!p5eZ@6CpHcSsXrD5dYM9vsQG z8z|8T9i>rUld_8X#{EC^dFy0=T>L535`wv|2H*_9bMj0Vw1r{zV=+ilcpePs&zt69 zW>HN6%szO+Vv9bf5Vx5H6g?MmyA5rLOvUm!pZs%_KH$w`pak`Q( zx#V0!saWZhSh$`=l5o+%y88MI8?Y%m7aykPAd@KL^iAR%ko~yeYEoX&2Z?IHJAH_{ z&a%x|r$&2_eTQ;>$9Eg54#sCpoJTe&C*k#PDTlnC?~}~N2sT(X`B3u-%_-np^K_kq Zqkoe&VShde?C}5q002ovPDHLkV1nsFp-}(; delta 357 zcmZ3@zLa@_BnLAC1A|XM>zs*-3W2%-J|V6N2?_P}^RPqEnWKt#+$ zTS-QH!RF*6RxPH?cO`NXb2uj7nYW5*iRgn}2`)3z1<#Z|{3o|-edVISxnbh%OFvKi zwBz7!)s&W_zYUh1KIU{dT;WXi9mm>V7j@UlRHjdHs<`FndqK{i)KOem*KvAq2G^cH z?FURPwy^Hp((3#3yWm}4Enme;0(>E@EnO2B=kxtc4{ zqu=t*B_m+vgijoYN*}tcwr;;FS|sQAg5&isR*@vH#ea-Ti-F<6;OXk;vd$@?2>=n+ Bp3VRO