From 80c5cc9306725fe24872e4b5aed957afabbbd5a6 Mon Sep 17 00:00:00 2001 From: Yandols ZeonX Date: Mon, 13 May 2019 00:04:53 +0800 Subject: [PATCH] Changes and finalization to current build of ZCM/CA. * Re-implement Synthetic Dirt and Synthetic Sand, changed their textures and and unmarked them for renewal. * Added new Composite Block which serves as a crafting ingredient for the Labyrinth block and other decorative blocks. * Changed Composite Food to use it's own texture and buffed it's saturation values. * Made Composite Glass Pane top texture transparent so it looks better in-game now. * Fix Observation Glass Pane item texture. (Block texture still broken, no idea how to fix right now) * Preparation for new blocks to be added in the future. --- .../blockstates/compositeblock.json | 6 ++ .../assets/zcm_comalterlite/lang/en_US.lang | 8 +- .../zcm_comalterlite/models/block/artery.json | 6 ++ .../models/block/compositeblock.json | 6 ++ .../models/item/compositefood.json | 2 +- .../observationglass_pane_construction.json | 2 +- .../item/observationglass_pane_damaged.json | 2 +- .../item/observationglass_pane_enclosed.json | 2 +- .../observationglass_pane_light_blue.json | 2 +- .../item/observationglass_pane_lime.json | 2 +- .../item/observationglass_pane_magenta.json | 2 +- .../item/observationglass_pane_silver.json | 2 +- .../textures/blocks/compositeblock.png | Bin 0 -> 578 bytes .../blocks/compositeglass_pane_top.png | Bin 279 -> 184 bytes .../blocks/compositeglass_pane_top_.png | Bin 0 -> 279 bytes .../textures/blocks/syntheticdirt.png | Bin 3509 -> 750 bytes .../textures/items/rations.png | Bin 0 -> 1028 bytes mods/zcm-ca/blocks.json | 77 ++++++++++++++++++ mods/zcm-ca/items.json | 6 +- 19 files changed, 111 insertions(+), 14 deletions(-) create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeblock.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/artery.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeblock.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeblock.png create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top_.png create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/textures/items/rations.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeblock.json b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeblock.json new file mode 100644 index 0000000..cd28eab --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeblock.json @@ -0,0 +1,6 @@ +{ + "variants": { + "normal": {"model": "zcm_comalterlite:compositeblock"}, + "inventory": {"model": "zcm_comalterlite:compositeblock"} + } +} \ No newline at end of file diff --git a/mods/zcm-ca/assets/zcm_comalterlite/lang/en_US.lang b/mods/zcm-ca/assets/zcm_comalterlite/lang/en_US.lang index 3df325e..4a66651 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/lang/en_US.lang +++ b/mods/zcm-ca/assets/zcm_comalterlite/lang/en_US.lang @@ -11,9 +11,10 @@ tile.zcm_comalterlite.labyrinthmaker.name=Labyrinth Empresser (Deprecated) item.zcm_comalterlite.labyrinthmaker.name=Labyrinth Empresser (Deprecated) tile.zcm_comalterlite.herrmaker.name=Herr Compacting Device item.zcm_comalterlite.herrmaker.name=Herr Compacting Device -tile.zcm_comalterlite.syntheticdirt.name=Synthetic Dirt (Deprecated) -tile.zcm_comalterlite.syntheticsand.name=Synthetic Sand (Deprecated) +tile.zcm_comalterlite.syntheticdirt.name=Synthetic Dirt +tile.zcm_comalterlite.syntheticsand.name=Synthetic Sand tile.zcm_comalterlite.herrblock.name=Compacted Herr +tile.zcm_comalterlite.compositeblock.name=Composite Block tile.zcm_comalterlite.compositeglass.name=Composite Glass tile.zcm_comalterlite.compositeglass_pane.0.name=Composite Glass Pane tile.zcm_comalterlite.compositeglass_pane.1.name=Secondary Composite Glass Pane @@ -33,7 +34,7 @@ tile.zcm_comalterlite.observationglass_pane.5.name=Observation Glass Pane (Damag tile.zcm_comalterlite.observationglass_pane.6.name=Observation Glass Pane (Construction) tile.zcm_comalterlite.frontierriumore.name=Frontierrium Chunk -# ZCM/CA Labyrinth Blocks +# ZCM/CA Labyrinth and other Decorative Blocks tile.zcm_comalterlite.labyrinth.0.name=Labyrinth Block tile.zcm_comalterlite.labyrinth.1.name=Cade Labyrinth Block tile.zcm_comalterlite.labyrinth.2.name=White Labyrinth Block @@ -64,6 +65,7 @@ tile.zcm_comalterlite.labyrinth2.4.name=Thonned Labyrinth Block tile.zcm_comalterlite.labyrinth2.5.name=Harned Labyrinth Block tile.zcm_comalterlite.labyrinth2.6.name=Orion Labyrinth Block tile.zcm_comalterlite.labyrinth2.7.name=Inner Labyrinth Block +tile.zcm_comalterlite.artery.name=Artery Block # ZCM/CA Items item.zcm_comalterlite.belt.name=Staging Belt diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/artery.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/artery.json new file mode 100644 index 0000000..e5c247e --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/artery.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcm_comalterlite:blocks/artery" + } +} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeblock.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeblock.json new file mode 100644 index 0000000..70cff04 --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeblock.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcm_comalterlite:blocks/compositeblock" + } +} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositefood.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositefood.json index bc1d1df..60272ea 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositefood.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositefood.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:items/compositefood" + "layer0": "zcm_comalterlite:items/rations" } } \ No newline at end of file diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_construction.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_construction.json index 21cb4f1..a85091a 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_construction.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_construction.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/observationglass_construction" + "layer0": "zcm_comalterlite:blocks/glass_construction" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_damaged.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_damaged.json index 9e4c47a..4162186 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_damaged.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_damaged.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/observationglass_damaged" + "layer0": "zcm_comalterlite:blocks/glass_damaged" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_enclosed.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_enclosed.json index 2e98e2a..b9d6f84 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_enclosed.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_enclosed.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/observationglass_enclosed" + "layer0": "zcm_comalterlite:blocks/glass_enclosed" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_light_blue.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_light_blue.json index 3d735fc..f5f94f7 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_light_blue.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_light_blue.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/observationglass_light_blue" + "layer0": "zcm_comalterlite:blocks/glass_light_blue" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_lime.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_lime.json index fb8c451..81a7729 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_lime.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_lime.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/observationglass_lime" + "layer0": "zcm_comalterlite:blocks/glass_lime" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_magenta.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_magenta.json index 6577f42..07152d2 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_magenta.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_magenta.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/observationglass_magenta" + "layer0": "zcm_comalterlite:blocks/glass_magenta" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_silver.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_silver.json index daee0fe..42b83cc 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_silver.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/observationglass_pane_silver.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/observationglass_silver" + "layer0": "zcm_comalterlite:blocks/glass_silver" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeblock.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeblock.png new file mode 100644 index 0000000000000000000000000000000000000000..1439fd7ffdcbd5368478868f00afbed412ef544e GIT binary patch literal 578 zcmV-I0=@l-P)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%hhNHvLWs=l}o#z)3_wR5(v1k_nH3Fc5|NTX)x0Iix_jQ5PWufj$%yUi zyqPzLn3m6V{j}3sw%7A;Yp3Nr+(Cxhi!X*lH$U6!W4yon+e`HGLzRDFTKiFs9pVDZ z>I+|)RN!HD`iR?fh$rO9JGFZ>gA)4$S|v+$47H0lu>}-?Z<`bwH`dq;@Ho| zRkxqw%s>(hR}x}&M7kxa)J3yP{9$#+dfze52E zsKi7s>0rwo<2pYe$IR2kF~q`u>4}Yk3^Th`7Bdd`Ou3$Fa5u0nYNz-oUt)E2T(Rroks39i0~tJB{an^LB{Ts5%ZFZT diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top_.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top_.png new file mode 100644 index 0000000000000000000000000000000000000000..dd96f1acdca70154e45a464a04bfef3c35d72cfb GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)8Aj~**Pmw23P_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(L5k7uNxxqA8v( zjv*25Z>JmbH7M}7S~f0jW{E!a_k72~vV^OR<}dv3U0SNYWWuC-X{WcIcd3kZyKH-a zCFJZumUEY7d=`Wi8#F2(U?~b?7uj);#pTRFmNP*7A-Z8cgB|k^-5H&qcJ(YhhET^(2K Ux_G2U4d^}wPgg&ebxsLQ0IvFJDgXcg literal 0 HcmV?d00001 diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/syntheticdirt.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/syntheticdirt.png index a2fed63d4c58e1698a63155be46c2cff61a3d7ec..6ed52d12671efb7c2991f28e23023b5ccd7d33b7 100644 GIT binary patch delta 696 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