From ddde5c92b6c8c306d64b5afea6764092b8739dd9 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Fri, 9 Apr 2021 01:09:50 -0400 Subject: [PATCH] Fix some models of seared blocks Notably, ladder has a real texture and IO has UV lock --- .../tconstruct/blockstates/seared_chute.json | 16 +++++++-------- .../tconstruct/blockstates/seared_drain.json | 16 +++++++-------- .../tconstruct/blockstates/seared_duct.json | 16 +++++++-------- .../models/block/smeltery/seared/ladder.json | 19 +++++++++--------- .../block/smeltery/seared/ladder_base.json | 17 ++++++++-------- .../textures/block/smeltery/seared/ladder.png | Bin 0 -> 259 bytes 6 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 src/main/resources/assets/tconstruct/textures/block/smeltery/seared/ladder.png diff --git a/src/main/resources/assets/tconstruct/blockstates/seared_chute.json b/src/main/resources/assets/tconstruct/blockstates/seared_chute.json index eb810ce27a3..998a1893b02 100644 --- a/src/main/resources/assets/tconstruct/blockstates/seared_chute.json +++ b/src/main/resources/assets/tconstruct/blockstates/seared_chute.json @@ -1,12 +1,12 @@ { "variants": { - "active=false,facing=west": { "model": "tconstruct:block/smeltery/io/chute_inactive", "y": 90 }, - "active=false,facing=south": { "model": "tconstruct:block/smeltery/io/chute_inactive" }, - "active=false,facing=north": { "model": "tconstruct:block/smeltery/io/chute_inactive", "y": 180 }, - "active=false,facing=east": { "model": "tconstruct:block/smeltery/io/chute_inactive", "y": 270 }, - "active=true,facing=west": { "model": "tconstruct:block/smeltery/io/chute_active", "y": 90 }, - "active=true,facing=south": { "model": "tconstruct:block/smeltery/io/chute_active" }, - "active=true,facing=north": { "model": "tconstruct:block/smeltery/io/chute_active", "y": 180 }, - "active=true,facing=east": { "model": "tconstruct:block/smeltery/io/chute_active", "y": 270 } + "active=false,facing=west": { "model": "tconstruct:block/smeltery/io/chute_inactive", "uvlock": true, "y": 90 }, + "active=false,facing=south": { "model": "tconstruct:block/smeltery/io/chute_inactive", "uvlock": true }, + "active=false,facing=north": { "model": "tconstruct:block/smeltery/io/chute_inactive", "uvlock": true, "y": 180 }, + "active=false,facing=east": { "model": "tconstruct:block/smeltery/io/chute_inactive", "uvlock": true, "y": 270 }, + "active=true,facing=west": { "model": "tconstruct:block/smeltery/io/chute_active", "uvlock": true, "y": 90 }, + "active=true,facing=south": { "model": "tconstruct:block/smeltery/io/chute_active", "uvlock": true }, + "active=true,facing=north": { "model": "tconstruct:block/smeltery/io/chute_active", "uvlock": true, "y": 180 }, + "active=true,facing=east": { "model": "tconstruct:block/smeltery/io/chute_active", "uvlock": true, "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/tconstruct/blockstates/seared_drain.json b/src/main/resources/assets/tconstruct/blockstates/seared_drain.json index bf37aadbcd2..7c495df0de4 100644 --- a/src/main/resources/assets/tconstruct/blockstates/seared_drain.json +++ b/src/main/resources/assets/tconstruct/blockstates/seared_drain.json @@ -1,12 +1,12 @@ { "variants": { - "active=false,facing=west": { "model": "tconstruct:block/smeltery/io/drain_inactive", "y": 90 }, - "active=false,facing=south": { "model": "tconstruct:block/smeltery/io/drain_inactive" }, - "active=false,facing=north": { "model": "tconstruct:block/smeltery/io/drain_inactive", "y": 180 }, - "active=false,facing=east": { "model": "tconstruct:block/smeltery/io/drain_inactive", "y": 270 }, - "active=true,facing=west": { "model": "tconstruct:block/smeltery/io/drain_active", "y": 90 }, - "active=true,facing=south": { "model": "tconstruct:block/smeltery/io/drain_active" }, - "active=true,facing=north": { "model": "tconstruct:block/smeltery/io/drain_active", "y": 180 }, - "active=true,facing=east": { "model": "tconstruct:block/smeltery/io/drain_active", "y": 270 } + "active=false,facing=west": { "model": "tconstruct:block/smeltery/io/drain_inactive", "uvlock": true, "y": 90 }, + "active=false,facing=south": { "model": "tconstruct:block/smeltery/io/drain_inactive", "uvlock": true }, + "active=false,facing=north": { "model": "tconstruct:block/smeltery/io/drain_inactive", "uvlock": true, "y": 180 }, + "active=false,facing=east": { "model": "tconstruct:block/smeltery/io/drain_inactive", "uvlock": true, "y": 270 }, + "active=true,facing=west": { "model": "tconstruct:block/smeltery/io/drain_active", "uvlock": true, "y": 90 }, + "active=true,facing=south": { "model": "tconstruct:block/smeltery/io/drain_active", "uvlock": true }, + "active=true,facing=north": { "model": "tconstruct:block/smeltery/io/drain_active", "uvlock": true, "y": 180 }, + "active=true,facing=east": { "model": "tconstruct:block/smeltery/io/drain_active", "uvlock": true, "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/tconstruct/blockstates/seared_duct.json b/src/main/resources/assets/tconstruct/blockstates/seared_duct.json index d8af5a8138c..1f1d3c2549a 100644 --- a/src/main/resources/assets/tconstruct/blockstates/seared_duct.json +++ b/src/main/resources/assets/tconstruct/blockstates/seared_duct.json @@ -1,12 +1,12 @@ { "variants": { - "active=false,facing=west": { "model": "tconstruct:block/smeltery/io/duct_inactive", "y": 90 }, - "active=false,facing=south": { "model": "tconstruct:block/smeltery/io/duct_inactive" }, - "active=false,facing=north": { "model": "tconstruct:block/smeltery/io/duct_inactive", "y": 180 }, - "active=false,facing=east": { "model": "tconstruct:block/smeltery/io/duct_inactive", "y": 270 }, - "active=true,facing=west": { "model": "tconstruct:block/smeltery/io/duct_active", "y": 90 }, - "active=true,facing=south": { "model": "tconstruct:block/smeltery/io/duct_active" }, - "active=true,facing=north": { "model": "tconstruct:block/smeltery/io/duct_active", "y": 180 }, - "active=true,facing=east": { "model": "tconstruct:block/smeltery/io/duct_active", "y": 270 } + "active=false,facing=west": { "model": "tconstruct:block/smeltery/io/duct_inactive", "uvlock": true, "y": 90 }, + "active=false,facing=south": { "model": "tconstruct:block/smeltery/io/duct_inactive", "uvlock": true }, + "active=false,facing=north": { "model": "tconstruct:block/smeltery/io/duct_inactive", "uvlock": true, "y": 180 }, + "active=false,facing=east": { "model": "tconstruct:block/smeltery/io/duct_inactive", "uvlock": true, "y": 270 }, + "active=true,facing=west": { "model": "tconstruct:block/smeltery/io/duct_active", "uvlock": true, "y": 90 }, + "active=true,facing=south": { "model": "tconstruct:block/smeltery/io/duct_active", "uvlock": true }, + "active=true,facing=north": { "model": "tconstruct:block/smeltery/io/duct_active", "uvlock": true, "y": 180 }, + "active=true,facing=east": { "model": "tconstruct:block/smeltery/io/duct_active", "uvlock": true, "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder.json b/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder.json index b2cf9eaebcf..3aba2c40aca 100644 --- a/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder.json +++ b/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder.json @@ -1,9 +1,10 @@ { "parent": "block/block", "textures": { - "particle": "tconstruct:block/smeltery/seared/paver", + "particle": "tconstruct:block/smeltery/seared/ladder", "top": "tconstruct:block/smeltery/seared/fancy_bricks", - "side": "tconstruct:block/smeltery/seared/paver" + "side": "tconstruct:block/smeltery/seared/ladder", + "bottom": "tconstruct:block/smeltery/seared/ladder" }, "elements": [ { @@ -68,8 +69,8 @@ "to": [14, 4, 3], "faces": { "north": {"texture": "#side"}, - "up": {"texture": "#side"}, - "down": {"texture": "#side"} + "up": {"texture": "#bottom"}, + "down": {"texture": "#bottom"} } }, { @@ -78,8 +79,8 @@ "to": [14, 8, 3], "faces": { "north": {"texture": "#side"}, - "up": {"texture": "#side"}, - "down": {"texture": "#side"} + "up": {"texture": "#bottom"}, + "down": {"texture": "#bottom"} } }, { @@ -88,8 +89,8 @@ "to": [14, 12, 3], "faces": { "north": {"texture": "#side"}, - "up": {"texture": "#side"}, - "down": {"texture": "#side"} + "up": {"texture": "#bottom"}, + "down": {"texture": "#bottom"} } }, { @@ -104,7 +105,7 @@ "to": [2, 0, 2], "faces": { "north": {"texture": "#side"}, - "down": {"texture": "#top"} + "down": {"texture": "#bottom"} } } ] diff --git a/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder_base.json b/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder_base.json index 2c8406020da..227e9ca9e10 100644 --- a/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder_base.json +++ b/src/main/resources/assets/tconstruct/models/block/smeltery/seared/ladder_base.json @@ -1,8 +1,9 @@ { "textures": { - "particle": "tconstruct:block/smeltery/seared/paver", + "particle": "tconstruct:block/smeltery/seared/ladder", "top": "tconstruct:block/smeltery/seared/fancy_bricks", - "side": "tconstruct:block/smeltery/seared/paver" + "side": "tconstruct:block/smeltery/seared/ladder", + "bottom": "tconstruct:block/smeltery/seared/ladder" }, "elements": [ { @@ -73,7 +74,7 @@ "to": [14, 4, 3], "faces": { "north": {"texture": "#side"}, - "up": {"texture": "#side"} + "up": {"texture": "#bottom"} } }, { @@ -82,8 +83,8 @@ "to": [14, 8, 3], "faces": { "north": {"texture": "#side"}, - "up": {"texture": "#side"}, - "down": {"texture": "#side"} + "up": {"texture": "#bottom"}, + "down": {"texture": "#bottom"} } }, { @@ -92,8 +93,8 @@ "to": [14, 12, 3], "faces": { "north": {"texture": "#side"}, - "up": {"texture": "#side"}, - "down": {"texture": "#side"} + "up": {"texture": "#bottom"}, + "down": {"texture": "#bottom"} } }, { @@ -108,7 +109,7 @@ "to": [2, 4, 2], "faces": { "north": {"texture": "#side"}, - "down": {"texture": "#top"} + "down": {"texture": "#bottom"} } } ] diff --git a/src/main/resources/assets/tconstruct/textures/block/smeltery/seared/ladder.png b/src/main/resources/assets/tconstruct/textures/block/smeltery/seared/ladder.png new file mode 100644 index 0000000000000000000000000000000000000000..d9f8d06e7871a90e86de913fc000a25ecc0a52b3 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFF?!kVPdSNqH3tG8_6T+1XRFT;1OBOz`%DHgc*Kz)T&1Zma<7Uyn&Q|wKkd(fU)+z{|1+x37jaw~bH^X(1O`u6KbLh*2~7Zntyzu$ literal 0 HcmV?d00001