From c0300dcf686eb5118abee039844836ed85c86215 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 8 May 2020 18:28:32 +0200 Subject: [PATCH] Updated textures for tiers identification by Gabe Tie --- .../force_field_relay.advanced-off.json | 2 +- .../force_field_relay.advanced-on.json | 2 +- .../forcefield/force_field_relay.basic-off.json | 2 +- .../forcefield/force_field_relay.basic-on.json | 2 +- .../block/forcefield/force_field_relay.json | 5 +++-- .../force_field_relay.superior-off.json | 2 +- .../force_field_relay.superior-on.json | 2 +- .../models/item/force_field_relay.advanced.json | 2 +- .../models/item/force_field_relay.basic.json | 2 +- .../models/item/force_field_relay.superior.json | 2 +- .../blocks/forcefield/relay-item_port.png | Bin 2403 -> 0 bytes .../{relay-side_basic.png => relay-side.png} | Bin .../forcefield/relay-side_advanced-alternate.png | Bin 270 -> 0 bytes .../blocks/forcefield/relay-side_advanced.png | Bin 272 -> 0 bytes .../blocks/forcefield/relay-side_superior.png | Bin 265 -> 0 bytes .../blocks/forcefield/relay.advanced-front.png | Bin 0 -> 493 bytes .../blocks/forcefield/relay.basic-front.png | Bin 0 -> 450 bytes .../blocks/forcefield/relay.superior-front.png | Bin 0 -> 499 bytes 18 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-item_port.png rename src/main/resources/assets/warpdrive/textures/blocks/forcefield/{relay-side_basic.png => relay-side.png} (100%) delete mode 100644 src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_advanced-alternate.png delete mode 100644 src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_advanced.png delete mode 100644 src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_superior.png create mode 100644 src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay.advanced-front.png create mode 100644 src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay.basic-front.png create mode 100644 src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay.superior-front.png diff --git a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-off.json b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-off.json index 48656b1c..82e96960 100644 --- a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-off.json +++ b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-off.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_advanced", + "front": "warpdrive:blocks/forcefield/relay.advanced-front", "top": "warpdrive:blocks/forcefield/relay-top_off" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-on.json b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-on.json index d1fba06d..da62e9bb 100644 --- a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-on.json +++ b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.advanced-on.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_advanced", + "front": "warpdrive:blocks/forcefield/relay.advanced-front", "top": "warpdrive:blocks/forcefield/relay-top_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-off.json b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-off.json index b6704008..c645f9b6 100644 --- a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-off.json +++ b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-off.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_basic", + "front": "warpdrive:blocks/forcefield/relay.basic-front", "top": "warpdrive:blocks/forcefield/relay-top_off" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-on.json b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-on.json index 02edf88b..c2dcef7d 100644 --- a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-on.json +++ b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.basic-on.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_basic", + "front": "warpdrive:blocks/forcefield/relay.basic-front", "top": "warpdrive:blocks/forcefield/relay-top_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.json b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.json index 9d7234b4..365c7eb9 100644 --- a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.json +++ b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.json @@ -4,8 +4,9 @@ "textures": { "coils": "warpdrive:blocks/forcefield/relay-coils", "bottom": "warpdrive:blocks/forcefield/relay-bottom", - "front": "warpdrive:blocks/forcefield/relay-front", - "particle": "warpdrive:blocks/forcefield/relay-side_basic" + "front": "warpdrive:blocks/forcefield/relay.basic-front", + "side": "warpdrive:blocks/forcefield/relay-side", + "particle": "warpdrive:blocks/forcefield/relay-side" }, "elements": [ { diff --git a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-off.json b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-off.json index f77ef6d9..5a165c47 100644 --- a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-off.json +++ b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-off.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_superior", + "front": "warpdrive:blocks/forcefield/relay.superior-front", "top": "warpdrive:blocks/forcefield/relay-top_off" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-on.json b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-on.json index 9cfee63a..4d33b36a 100644 --- a/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-on.json +++ b/src/main/resources/assets/warpdrive/models/block/forcefield/force_field_relay.superior-on.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_superior", + "front": "warpdrive:blocks/forcefield/relay.superior-front", "top": "warpdrive:blocks/forcefield/relay-top_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/item/force_field_relay.advanced.json b/src/main/resources/assets/warpdrive/models/item/force_field_relay.advanced.json index d1fba06d..da62e9bb 100644 --- a/src/main/resources/assets/warpdrive/models/item/force_field_relay.advanced.json +++ b/src/main/resources/assets/warpdrive/models/item/force_field_relay.advanced.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_advanced", + "front": "warpdrive:blocks/forcefield/relay.advanced-front", "top": "warpdrive:blocks/forcefield/relay-top_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/item/force_field_relay.basic.json b/src/main/resources/assets/warpdrive/models/item/force_field_relay.basic.json index 02edf88b..c2dcef7d 100644 --- a/src/main/resources/assets/warpdrive/models/item/force_field_relay.basic.json +++ b/src/main/resources/assets/warpdrive/models/item/force_field_relay.basic.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_basic", + "front": "warpdrive:blocks/forcefield/relay.basic-front", "top": "warpdrive:blocks/forcefield/relay-top_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/models/item/force_field_relay.superior.json b/src/main/resources/assets/warpdrive/models/item/force_field_relay.superior.json index 9cfee63a..4d33b36a 100644 --- a/src/main/resources/assets/warpdrive/models/item/force_field_relay.superior.json +++ b/src/main/resources/assets/warpdrive/models/item/force_field_relay.superior.json @@ -1,7 +1,7 @@ { "parent": "warpdrive:block/forcefield/force_field_relay", "textures": { - "side": "warpdrive:blocks/forcefield/relay-side_superior", + "front": "warpdrive:blocks/forcefield/relay.superior-front", "top": "warpdrive:blocks/forcefield/relay-top_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-item_port.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-item_port.png deleted file mode 100644 index b95b2c1d09abfe72dbfcfd815b4f33cb3a962586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2403 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 V44=SDK2`t#002ovPDHLkV1mQ)lA-_r diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_basic.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side.png similarity index 100% rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_basic.png rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side.png diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_advanced-alternate.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_advanced-alternate.png deleted file mode 100644 index 5df8c3310d0ac61b3221fc5e21c336a11c3c490a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFM1MG8Su=dyMBl<8;Z z2%a&hRr0R9Px# diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_advanced.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_advanced.png deleted file mode 100644 index 44d43dbbba88233609def7c481911ba41a82c376..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmV+r0q_2aP)9U5Zp=+rh@fRP&`QS0sa49(2Jh*R`5abAd0PR1siYCiEJqr(GTcCnC$FiCkbm@ zqC^o9IUO7DGs0_{Yy53MCbBS2^}=4thZYD?&xOn}anGdQCh3h#IHQ3#9&){eMOQAu zJ(Kc%119IoHKA+EZqo5|ra`|~%E4PgXbsNQ_%N_x3EkD{wzUWd7tXzjt9fu7hEhuT zy90$$tldy33Rw7w(~(P?eLyC^4=z~6`1W~4jWJuS6yA;a#~C{O0f$k|K{W@jVR!;j WkjzQA+OKy20000HS diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_superior.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/relay-side_superior.png deleted file mode 100644 index 6c75f1635e27eb4e81ad3978f1b927cd9f137ba9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFRvpsa^ud;yAB;bdEwmUo7e9=eEs&r|NsAi zYT+P6X0bhx!&%@FSQUu6g)eZ{F_k+!AIZu@zI7>KZT`ow}4(GG*y@Ceh|AVOxx*ENx?QjF2)b wE@M6$*_+iDS@o02bcSW7LGh`?XDv$^873WYW1rvPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0fI?HK~y+TWBmXB zKLaIz2}+XVTD?kRw za@tPKVD%@?UV<3F#v{Y<>C0z^d2?qm2#RnroH%wAtO*$)%l-QD1gstmUcdbS^2L7` zO$>mkJ$&-Qe{dMwxci9V($yObyEd(5kdl^WID7guLzL7dhA+mo3{PJ?V=#Ht#W3@w zBZIN2DZ|J2?-?de>Ss8AL@o!|i(y5H1iA76c1| zLKdV6jJdBdF#J5u@cX(q!>dhVU@?#y5QYIJWK%%^Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ar;xK~y+TWBmXB zKLaIz2}+XVTD?kRw za@tPKVD%@?UV<3F#v{Y<>C0z^d2?qm2#RnroH%wAtO*$)%l-QD1gstmUcdbS^2L7` zO$>mkJ$&-Qe{dMwxci9V&b@~W8&)o1kdl^WID7guLzL7dhA+mo3{PJ?V=#Ht#W3@w zBZIN2DZ|J2?-?de>Ss8AL@o!|i(y5C(w2_wPS| zHhgE`=Hg`FPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0fVTD?kRw za@tPKVD%@?UV<3F#v{Y<>C0z^d2?qm2#RnroH%wAtO*$)%l-QD1gstmUcdbS^2L7` zO$>mkJ$&-Qe{dMwxci9V($yObyEd(5kdl^WID7guLzL7dhA+mo3{PJ?V=#Ht#W3@w zBZIN2DZ|J2?-?de>Ss8AL@o!|i(y5C(w2_wPTz z&QfwU0rSuN`2?m{e)`C8?ZzF3`&M3Hr^5iq048KpK>*||kj98hrx<#!-C(Fcb(SHV zkDuY!Q;1K002ovPDHLkV1h9+)^q>> literal 0 HcmV?d00001