From 054a53923df8cd450fb1fdbd69414510ce87b353 Mon Sep 17 00:00:00 2001 From: Forstride Date: Fri, 5 Jan 2024 08:47:33 -0500 Subject: [PATCH] Water purifier texture tweaks --- README.md | 2 +- .../models/block/thermoregulator_active.json | 22 +++++++++--------- .../block/thermoregulator_cooling_active.json | 22 +++++++++--------- .../block/thermoregulator_heating_active.json | 22 +++++++++--------- .../block/thermoregulator_inactive.json | 22 +++++++++--------- .../models/block/water_purifier.json | 4 ++-- .../block/water_purifier_filtering.json | 4 ++-- .../textures/block/rain_collector_side.png | Bin 284 -> 281 bytes .../textures/block/water_purifier_front.png | Bin 344 -> 351 bytes .../textures/block/water_purifier_inner.png | Bin 279 -> 282 bytes .../textures/block/water_purifier_side.png | Bin 331 -> 338 bytes .../textures/block/water_purifier_top.png | Bin 277 -> 300 bytes 12 files changed, 49 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 8e1d67ef..caa17d98 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

-**Tough As Nails** is a **Minecraft mod** that adds various features to increase the game's difficulty, including a thirst and temperature system. +**Tough As Nails** is a **Minecraft mod** that adds various features to increase the game's difficulty, including body temperature and thirst. © 2024 Glitchfiend. All rights reserved. diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json index e62a9b0c..7131cfe1 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json @@ -11,35 +11,35 @@ "from": [8, 16, 0], "to": [16, 16, 16], "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top"} + "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } }, { "from": [0, 16, 0], "to": [8, 16, 16], "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top"} + "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } }, { "from": [0, 8, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side"} + "north": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west"} } }, { "from": [0, 0, 0], "to": [16, 8, 16], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom"} + "north": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} } } ] diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json index 8dde443d..98b74084 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json @@ -13,35 +13,35 @@ "from": [8, 16, 0], "to": [16, 16, 16], "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top"} + "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } }, { "from": [0, 16, 0], "to": [8, 16, 16], "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top_active"} + "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top_active", "cullface": "up"} } }, { "from": [0, 8, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side"} + "north": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west"} } }, { "from": [0, 0, 0], "to": [16, 8, 16], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#side_active"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side_active"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#side_active"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side_active"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom"} + "north": {"uv": [0, 8, 16, 16], "texture": "#side_active", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#side_active", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#side_active", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side_active", "cullface": "west"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} } } ] diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json index 66eec983..a8ecd474 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json @@ -13,35 +13,35 @@ "from": [8, 16, 0], "to": [16, 16, 16], "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top_active"} + "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top_active", "cullface": "up"} } }, { "from": [0, 16, 0], "to": [8, 16, 16], "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top"} + "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } }, { "from": [0, 8, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#side_active"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side_active"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#side_active"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side_active"} + "north": {"uv": [0, 0, 16, 8], "texture": "#side_active", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#side_active", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 8], "texture": "#side_active", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#side_active", "cullface": "west"} } }, { "from": [0, 0, 0], "to": [16, 8, 16], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom"} + "north": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} } } ] diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json index e0debe5a..fcce6d7b 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json @@ -11,35 +11,35 @@ "from": [8, 16, 0], "to": [16, 16, 16], "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top"} + "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } }, { "from": [0, 16, 0], "to": [8, 16, 16], "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top"} + "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } }, { "from": [0, 8, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#side"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side"} + "north": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west"} } }, { "from": [0, 0, 0], "to": [16, 8, 16], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom"} + "north": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} } } ] diff --git a/common/src/main/resources/assets/toughasnails/models/block/water_purifier.json b/common/src/main/resources/assets/toughasnails/models/block/water_purifier.json index f467dcf1..531c9df4 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/water_purifier.json +++ b/common/src/main/resources/assets/toughasnails/models/block/water_purifier.json @@ -18,7 +18,7 @@ "east": {"uv": [0, 6, 16, 16], "texture": "#side", "cullface": "east"}, "south": {"uv": [0, 6, 16, 16], "texture": "#side", "cullface": "south"}, "west": {"uv": [0, 6, 16, 16], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#inner"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#inner"}, "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} } }, @@ -30,7 +30,7 @@ "east": {"uv": [0, 0, 16, 6], "texture": "#side", "cullface": "east"}, "south": {"uv": [0, 0, 16, 6], "texture": "#side", "cullface": "south"}, "west": {"uv": [0, 0, 16, 6], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"} + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } } ] diff --git a/common/src/main/resources/assets/toughasnails/models/block/water_purifier_filtering.json b/common/src/main/resources/assets/toughasnails/models/block/water_purifier_filtering.json index f60de11c..daa82361 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/water_purifier_filtering.json +++ b/common/src/main/resources/assets/toughasnails/models/block/water_purifier_filtering.json @@ -19,7 +19,7 @@ "east": {"uv": [0, 6, 16, 16], "texture": "#side", "cullface": "east"}, "south": {"uv": [0, 6, 16, 16], "texture": "#side", "cullface": "south"}, "west": {"uv": [0, 6, 16, 16], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#inner"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#inner"}, "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} } }, @@ -31,7 +31,7 @@ "east": {"uv": [0, 0, 16, 6], "texture": "#side", "cullface": "east"}, "south": {"uv": [0, 0, 16, 6], "texture": "#side", "cullface": "south"}, "west": {"uv": [0, 0, 16, 6], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"} + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} } }, { diff --git a/common/src/main/resources/assets/toughasnails/textures/block/rain_collector_side.png b/common/src/main/resources/assets/toughasnails/textures/block/rain_collector_side.png index 95bd49b20e61fb0d8b7c9fe51e30642e7e49ea77..a103f3f056de5cfc7c2769da61b867382ab75de0 100644 GIT binary patch delta 76 zcmbQkG?Qt9Bcs+tCk=U-xF@1!$7C6Hs4_4xa29w(7BevL9RguSQ4Oz#i9H^yv$hsr eW14tVU*s>R*4&TPi(P;!89ZJ6T-G@yGywortrxKX delta 79 zcmbQqG>2(|Bctv_Ck-XtzOjJdv(Am)H>DGH&nov07f^3mb7$Xr85rlVJkV!E-J3FF~ zb*h(oi;Iewh-&}<0G}Bgxc~qF7Lkn@fBygh(!k^Z000SaNLh0L01m(a01m(bYSxJf z0001lNklDGH&r&>UZ!OeTFx58^oSWP>1WlU^dNg*L2 znou|q5fP9{F@$$ps+W2^J3FF~b&HFNn22it004M3S9kyb02Pst7=HjO*?sB&000Sa zNLh0L01m?d01m?e$8V@)0001iNkl;d}LLw!aP&mSCOpr-2)_Ys=O0d`f000SaNLh0L01m(a01m(b zYSxJfk%lx~>fW)m)Qo{yrD8{SyAx2vwY%r+ju4;-oDov7_jWsw0Z|+ZRHN())NTZ1 zIH>>)Q~@$Vm0W;U`LLwrGyVVo diff --git a/common/src/main/resources/assets/toughasnails/textures/block/water_purifier_side.png b/common/src/main/resources/assets/toughasnails/textures/block/water_purifier_side.png index 543c89608b2c78d2bbb011587448fb8e9e590c62..395bc97a5accb9b6dea4e7a66f3aae5cf2470bb3 100644 GIT binary patch delta 255 zcmX@jbctz#qljgIPl)S^3pX#kdU>rndRBnN4S0K=x*I~+i1&H|6fVxZ!KAk4U9V)k30V6&%-V~9p@Xb(5vVFM25%*{(4 zPB+{6KQaA;Nv^*U8@Gbh3!RdNk~7(RUwIvx_=nvkckO5O48fQLYtQT}(eE?tmzE|m zrr#Ax3}OzSI%VdhU8h$Zb$+()$oAP&)0h1@*15aa(zb<{rSPZgqvJd}ukYC3Iewt5 o;*W%~m7_#L^VCqu1zMk_!<)IDd@~611GrndU=#X_rbG=vVE%8ZIAG^E=~2xiSukJk6tvP zbVf(^tN@Gd?yd=*hO4GmF)%P3iFj!Wq=ZU>{DS|Z1BOTY_X`1KISV`@iy0XB4ude` z@%$AjK*0u27sn8d;LslKdcMO39L|}O+wylm`8R#8;^ifFCnatxa)mv{hi^CrsKl|>y&d+Ay z@@`ApR$i9MpYETI`>c6&$NrA;hPm_Xl{N{taGFI#PGwwWRL{6WnX^4a(B?W1&@~L6 Lu6{1-oD!M<=_r1B diff --git a/common/src/main/resources/assets/toughasnails/textures/block/water_purifier_top.png b/common/src/main/resources/assets/toughasnails/textures/block/water_purifier_top.png index e29ccf41ae3b23d5157afd279f962d69ef123736..e241b254ed5b39f3b48772d4c9fa14a65498222f 100644 GIT binary patch delta 243 zcmbQrw1#PdW4&U4Pl)S^3pX#kdO0h=;!w8F@+gOE)zRGt&pvL-sb05zf~O$^14F(l z7cY?FE(!7r{tpKXUjB@qfWn*w9+AZi41D`Rn9+hYSOq9p>*?Ycq7iJ{7bxVa$l;`U zrRHt@LH?X)p8~4_+!7Lny`7dwt*OpYu2lUMtua;UlA&JDY2~GB*B&*m|Fg=mP-kB| zZ_h~%Uah5Ub9(OkACy<%{Zw<{_BpwL;`6oV12v38ZcVw8u>1NhW}jyz$3OM{;=8~2 k(r32NxffMU%gg^WDh0Ed|4`{Y2XqO8r>mdKI;Vst0LaN_cmMzZ delta 220 zcmZ3(G?i(BW4%OxPl)S^3pX#kdbvEx;aYX{p=_V-gJ-MPZD(L$s9~Ku1xRs}1o;L3 zhX96q&3hw(Vw?pYk;M!QdN*ZujR0UEgW7mz}a^yXzdX*(6=gAf6>EA$F@I P(0T?>S3j3^P6