From 154f9d9ebb85403400ea8279ef31b7992939ddfd Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sat, 27 Aug 2016 13:23:45 +0200 Subject: [PATCH] Added spatial pylon item model (and textures for connected texture blocks). --- .../appeng/core/api/definitions/ApiBlocks.java | 5 ++++- .../models/item/spatial_pylon.json | 6 ++++++ .../textures/blocks/spatial_pylon/base.png | Bin 0 -> 304 bytes .../textures/blocks/spatial_pylon/base_end.png | Bin 0 -> 268 bytes .../blocks/spatial_pylon/base_spanned.png | Bin 0 -> 198 bytes .../textures/blocks/spatial_pylon/dim.png | Bin 0 -> 267 bytes .../textures/blocks/spatial_pylon/dim_end.png | Bin 0 -> 235 bytes .../textures/blocks/spatial_pylon/dim_spanned.png | Bin 0 -> 180 bytes .../textures/blocks/spatial_pylon/red.png | Bin 0 -> 266 bytes .../textures/blocks/spatial_pylon/red_end.png | Bin 0 -> 235 bytes .../textures/blocks/spatial_pylon/red_spanned.png | Bin 0 -> 180 bytes .../textures/items/spatial_pylon.png | Bin 0 -> 400 bytes 12 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base_end.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base_spanned.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim_end.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim_spanned.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red_end.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red_spanned.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/spatial_pylon.png diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 5cd4c5b1a..92ad722ba 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -273,7 +273,10 @@ public final class ApiBlocks implements IBlocks .build(); this.quantumRing = registry.block( "quantum_ring", BlockQuantumRing::new ).features( AEFeature.QuantumNetworkBridge ).build(); this.quantumLink = registry.block( "quantum_link", BlockQuantumLinkChamber::new ).features( AEFeature.QuantumNetworkBridge ).build(); - this.spatialPylon = registry.block( "spatial_pylon", BlockSpatialPylon::new ).features( AEFeature.SpatialIO ).build(); + this.spatialPylon = registry.block( "spatial_pylon", BlockSpatialPylon::new ) + .features( AEFeature.SpatialIO ) + .useCustomItemModel() + .build(); this.spatialIOPort = registry.block( "spatial_ioport", BlockSpatialIOPort::new ).features( AEFeature.SpatialIO ).build(); this.controller = registry.block( "controller", BlockController::new ) .features( AEFeature.Channels ) diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json new file mode 100644 index 000000000..77a4b209f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:items/spatial_pylon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base.png new file mode 100644 index 0000000000000000000000000000000000000000..e6314ea8159151e20fc77f1167263a1bba259743 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz_7;C#WBRff9>RGu0sX_uA3)5>R-9&#-gLg#WwZpSnck#oXAi%=$3oK+${tKg=UTHD=yJ|*&NkS|+=JnflGBA#_PUnHoTDJH3)BE#YmdKI;Vst E0B(44O8@`> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base_end.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base_end.png new file mode 100644 index 0000000000000000000000000000000000000000..9149d271e72f3faab7802d7c9c97a6f55a26b1db GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz|i68;uvD#pKM?r^1uG^vEKihnwtL`8yY2eg19dwuUY=9zC${}X(i*bUs)nj z2@VSx)22u3l{4O&XG$od>=QK=PrE^15%z?*imI6;w^N|gS6ZTBhbD6tw-m7|suZLGhiLQLr Rz`(%3;OXk;vd$@?2>@V)S1AAh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/base_spanned.png new file mode 100644 index 0000000000000000000000000000000000000000..7fdd568809cbdcf107706ced682d92c7ee5723a7 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz~JQR;uvD#pKM?r^1uG^vEKihnwtL`8yY2eg19dwuUY=9{z^lm*@2cM<}aEi u2SVa|otSwvOb+B6;AMCz`-yGEe|CnRnMYsG{Ou2N2!p4qpUXO@geCx%0zTXT literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim.png new file mode 100644 index 0000000000000000000000000000000000000000..bc821d2cde5941fcb34fa61e1fab185f8754f00c GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz|ijL;uvD#zqbD&XM=)(o2)`c!vcG!YL?!MPPvzabT0|@78D&ixV*M0&0g-s z-1m)sF1r>S7JIRw^@&l>W`)W3m43?1O*)Vw=Ge{_67fgtc%9pq9>J2h#+Wq0l1UAA z0Y1Cdt0$G;Ui>+K!Ef$eDS}g0Gl@ACwEGz@Fo<+i=d5Yui(YWJ>Ikc;YgIApm-Uwz Q7#J8lUHx3vIVCg!06ZLB9{>OV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim_end.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim_end.png new file mode 100644 index 0000000000000000000000000000000000000000..a96c993ee1985e6f7c41ecb94ed9d772d7b7ac2b GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz>x0g;uvD#pZw$he|s5k?cIOaAD){bnoyJdzS^MeW8$Y1Rc^czrVK5CJP#gD zXVwk~E^EndN}M3!!MB7hlE01d29M)4pDBz6&Jzqb$!wCF!`5J6c2=Qh4f|1sB7-o; iAcHW+M<46i82)9qt$c7eb~OV71B0ilpUXO@geCyBiA-z& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/dim_spanned.png new file mode 100644 index 0000000000000000000000000000000000000000..1e0ce032c23d0089849326fcbcac4309f984bdb4 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz+m9%;uvD#pZw$he|s5k?cIOaAD){bnoyJdzS^MeW8$Y1Rc^czrVK6ayb^3| df6^Hk;>sr7->1oC%fP_E;OXk;vd$@?2>?M3H3|R# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red.png new file mode 100644 index 0000000000000000000000000000000000000000..9b6729e8b84b851b390eddbdd71e25e272f52335 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz|iLD;uvD#zqWrPZ-W63%jKX=49ph{Sb7|Ibx&X1AY3eAIccf?4-dnI7MdH2 z)m1w@giBsD^4Y3PUn$LM`O9|F`HPxtK52p_84j(v5l`k_@0e%UbWVH1X`LoNp$qI? zo<(y7ci)zqThDwp{(@@vf*8>a98K0GU5u?KxvV@NaDxncJ@Es>+knphcFa{v7#J8B NJYD@<);T3K0RZUvSrY&N literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red_end.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red_end.png new file mode 100644 index 0000000000000000000000000000000000000000..6c99af8b31e2b16de90dd612300949b2b0df5480 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz>x0g;uvD#pZw$he|wp9j${AXA1*(qnDD3ma+E>a$HY%3s@!-bOc`1Nc`iJ^ z!ld0XxwtXADRF{?2j3F5Nd7j)8$6EJe5NoOI8QL#B(q6w4qJnP*;$32HS9+jiVVUW igABqPAAPK6W4L-`O250NWfcPh1B0ilpUXO@geCw3f=nd< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_pylon/red_spanned.png new file mode 100644 index 0000000000000000000000000000000000000000..954b544ec240008abd9eb587252cd3a1d76d08b8 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz+m9%;uvD#pZw$he|wp9j${AXA1*(qnDD3ma+E>a$HY%3s@!-bOc`3-c_rA` d{-iT7^ybc&e|}2VmVtqR!PC{xWt~$(698N9HPZk9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/spatial_pylon.png b/src/main/resources/assets/appliedenergistics2/textures/items/spatial_pylon.png new file mode 100644 index 0000000000000000000000000000000000000000..a59190403023a353896736efa1938f9ee9978467 GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFdBKfIEGZ*nlfpl7mJ}loBC$QX}g&n*9nMO3f?(X z-6Xtbte;9V$5@ko^}BkmUbMw>XKYOJzWvn)Jl6Sz zt9x7gSmL9w@L`tKwYW`FRtfhXe|q)Nvaew!OjePXZdG|5F>*Fb^~}1N+nZavJ>-^G z_}`5`lg`|GcP(SWWBtCQ;8cxs{3a6|vpz(~AKK2q%y9i)Q^1^}?HmjY3=E#GelF{r G5}E)eC$A&` literal 0 HcmV?d00001