From 730f5c5d6d72476729358575d32dba50b3ace074 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sat, 27 Aug 2016 10:30:41 +0200 Subject: [PATCH] Added conversion monitor item model. --- .../items/parts/ItemMultipartRendering.java | 4 ++ .../models/item/part/conversion_monitor.json | 9 +++ .../models/item/part/display.json | 58 ++++++++++++++++++ .../items/part/conversion_monitor.png | Bin 0 -> 244 bytes .../parts/conversion_monitor_bright.png | Bin 0 -> 238 bytes .../parts/conversion_monitor_dark.png | Bin 0 -> 205 bytes .../parts/conversion_monitor_dark_locked.png | Bin 0 -> 216 bytes .../parts/conversion_monitor_medium.png | Bin 0 -> 218 bytes .../textures/parts/monitor_back.png | Bin 0 -> 268 bytes .../textures/parts/monitor_sides.png | Bin 0 -> 229 bytes 10 files changed, 71 insertions(+) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/conversion_monitor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/display.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/items/part/conversion_monitor.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark_locked.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png diff --git a/src/main/java/appeng/items/parts/ItemMultipartRendering.java b/src/main/java/appeng/items/parts/ItemMultipartRendering.java index 415422020..8fe9d3f55 100644 --- a/src/main/java/appeng/items/parts/ItemMultipartRendering.java +++ b/src/main/java/appeng/items/parts/ItemMultipartRendering.java @@ -7,8 +7,10 @@ import java.util.stream.Collectors; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; +import appeng.api.util.AEColor; import appeng.bootstrap.IItemRendering; import appeng.bootstrap.ItemRenderingCustomizer; +import appeng.client.render.StaticItemColor; public class ItemMultipartRendering extends ItemRenderingCustomizer @@ -27,6 +29,8 @@ public class ItemMultipartRendering extends ItemRenderingCustomizer rendering.meshDefinition( this::getItemMeshDefinition ); + rendering.color( new StaticItemColor( AEColor.Transparent ) ); + // Register all item models as variants so they get loaded rendering.variants( Arrays.stream( PartType.values() ) .flatMap( part -> part.getItemModels().stream() ) diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/conversion_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/part/conversion_monitor.json new file mode 100644 index 000000000..3c1daab58 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/conversion_monitor.json @@ -0,0 +1,9 @@ +{ + "parent": "appliedenergistics2:item/part/display", + "textures": { + "front": "appliedenergistics2:items/part/conversion_monitor", + "front_bright": "appliedenergistics2:parts/conversion_monitor_bright", + "front_medium": "appliedenergistics2:parts/conversion_monitor_medium", + "front_dark": "appliedenergistics2:parts/conversion_monitor_dark" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/display.json b/src/main/resources/assets/appliedenergistics2/models/item/part/display.json new file mode 100644 index 000000000..e7377051b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/display.json @@ -0,0 +1,58 @@ +{ + "parent": "appliedenergistics2:item/part/part", + "textures": { + "sides": "appliedenergistics2:parts/monitor_sides", + "back": "appliedenergistics2:parts/monitor_back" + }, + "elements": [ + { + "name": "Front", + "from": [ 2, 2, 8 ], + "to": [ 14, 14, 9 ], + "faces": { + "north": { "texture": "#front" }, + "south": { "texture": "#back" }, + "east": { "texture": "#sides" }, + "west": { "texture": "#sides" }, + "up": { "texture": "#sides" }, + "down": { "texture": "#sides" } + } + }, + { + "name": "Front Bright", + "from": [ 2, 2, 8 ], + "to": [ 14, 14, 9 ], + "faces": { + "north": { "texture": "#front_bright", "tintindex": 0 } + } + }, + { + "name": "Front Medium", + "from": [ 2, 2, 8 ], + "to": [ 14, 14, 9 ], + "faces": { + "north": { "texture": "#front_medium", "tintindex": 1 } + } + }, + { + "name": "Front Dark", + "from": [ 2, 2, 8 ], + "to": [ 14, 14, 9 ], + "faces": { + "north": { "texture": "#front_dark", "tintindex": 2 } + } + }, + { + "name": "Back", + "from": [ 4, 4, 9 ], + "to": [ 12, 12, 10 ], + "faces": { + "east": { "texture": "#sides" }, + "south": { "texture": "#back" }, + "west": { "texture": "#sides" }, + "up": { "texture": "#sides" }, + "down": { "texture": "#sides" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/conversion_monitor.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/conversion_monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..c5c2a4c1edaa8f868bb93b8996ca72dde1ea2609 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#LhU zT^vI!{F5bY9K1un?cX?0OJcV4s^rwe8``?w)UPmOVeoXA$-)@6_3#0PfCR^xEC*MJ qXQVQ$ThhbZe8p)iuSG%v1B1S`(|pxhdlm);1_n=8KbLh*2~7aX^F)mR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png new file mode 100644 index 0000000000000000000000000000000000000000..69144831ac84f9ed6c53ff60c74e5e42163707e5 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#Qq4 zT^vI!{O_LH$auhj=di*5|0TNX#y!ub2QV-&XnDFg zhFJI~OQb!p7f`r-f?>YQR|dmnm#?uNX5gt&IOKCYjoWUgBCmu5gND8S#ox8oybKHs N44$rjF6*2UngFrJI!FKj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png new file mode 100644 index 0000000000000000000000000000000000000000..0d9a49ead9006b32321b82898b0fe1d70ffa56af GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#OrX zT^vI!{F5cx9@q;w%#>i5FC!rk!oYH5g(NF8*9xKDA0h%*Y(yBDnHi2&o*?e4W)B(~85x4FYS~FHYbs@6 PU|{fc^>bP0l+XkKnC47R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..8b1f6f9f359d80e876a2f8d33e9d2fca3d980139 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#K`F zT^vI!{O_JIWMnYlVcOt%m_e`NW59DC7XR(a`RC3oxyZila)f|~*W>nv6e(^dhD;lI Z1@TWwLi?L%?gv@J;OXk;vd$@?2>_~zKdt}( literal 0 HcmV?d00001