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 5cd4c5b1..92ad722b 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 00000000..77a4b209 --- /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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvioz zT^vI!{MSy7<~n2`;JSI@qyCkPZY(-_Tx?Unj@9l?%ZZ$|OA_3<*$;g=_tbBh>GLx2 z_H$zMt{-mN`m6B1%i)8T;?5ki7qBN6zrP(Mu;+W|F{vuKS|f!vSIYtYv$jKfOQiMNSQ~Q~HEc+Pzy}0Nu^t>FVdQ&MBb@0B(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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvf-{ zE{-7<{>cXBA^+N}(poK`X}`;{dkmEf?DF>Q(z z!zF7D9)_c;JJ}X2VfOd;Um#P)`$A%gSYE?SyCbYmBp5DrKVp(#vlNte3uC^-%!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvhnj zE{-7<{>cXBA^+aR33njL6KV*a9Oav&tW*NK@& n!{k8D0bYievY*&i{AXwAnR)c}%-{YXhcI}$`njxgN@xNAmI6N9 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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|KvnIY zE{-7<{%iXmayBRkxXCJHG%T=ps%GiE=#+a&NcWOZZ$Z(agUf51((L74%zfYJ=dx?T zVX+q*TAvv8Y*v_jU+JgJ+@u33Vvg->ArXJHj@P+;=@Bf6Ym7+~ESc0`7vQsNy?Rpl z?Zuz-7yRbll_EH0HItZQLA#&f0)t3Lbgmlep!DB=p+VDS3j3^ HP6!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvn6U zE{-7<{>eZ7|F@U%*53Vx{o%P8q6szG@2d^kJ|=!TQRT)fVam`F$n)UgbY|^<;IfwN zro;&n9(+sKBKg}GZ}2!?^O?eE;5@-_lguW$IcyCEW@i<8*03LCC^86h3!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvf2w zE{-7<{>eZ7|F@U%*53Vx{o%P8q6szG@2d^kJ|=!TQRT)fVam|r&MU#j_9vZzA+BuF U{e7BTwm`iMp00i_>zopr06`8l3IG5A 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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kviv? zE{-7<{%iX;@-`Uouv`w>#K3&PfThQQSNHVA4Z_6|mXntH|L`zeXrZ~WSY5TlL%8Hc zBcH9x^p(=AmcMK#oxiBb=94B^lHt&r8}Ve`^^SRlP3N>HoYrab6S~0O!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvn6U zE{-7<{>eZ7|F@S(=Q#GC{o(R+iV1(}FGm@)eN6mxqRNd|!jz#UkmthlD@@uQlZzX( zn-V8Tc(^b 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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvf2w zE{-7<{>eZ7|F@S(=Q#GC{o(R+iV1(}FGm@)eN6mxqRNd|!jz%KomYa5?N2%bLvQYU V`RAu(ZGn0jJYD@<);T3K0RUU?HPZk9 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 zcmV;B0dM|^P)1RCwBylCeqzF%X6)vq6@-13|73 z7C8~z!h3=ftgS4p?1V$XPS__|uoDy?!P;8zp1?+Ix3dw^>XP_p2XeD(p$;LNNxsSc znHe)JCwaa`t=Wu8+0yym&ilug9S!r1&7Hcg={KvYYUy6B_W?8<*)58q$2CnO3t*=w zN0!-$|M>LWe&f78E~9|AmlSreKgDdA8A5wk3auCVRV>d+N&pSXUCz!iut+fi0OsJm zz8lcl>_S{DbPNnILzWgG^zr-Qo0000C$A&` literal 0 HcmV?d00001