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 0000000..1439fd7 Binary files /dev/null and b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeblock.png differ 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 index dd96f1a..6b4628e 100644 Binary files a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top.png and b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top.png differ 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 0000000..dd96f1a Binary files /dev/null and b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top_.png differ 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 a2fed63..6ed52d1 100644 Binary files a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/syntheticdirt.png and b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/syntheticdirt.png differ diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/items/rations.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/items/rations.png new file mode 100644 index 0000000..3d5ffd4 Binary files /dev/null and b/mods/zcm-ca/assets/zcm_comalterlite/textures/items/rations.png differ diff --git a/mods/zcm-ca/blocks.json b/mods/zcm-ca/blocks.json index 689d8de..9100f7a 100644 --- a/mods/zcm-ca/blocks.json +++ b/mods/zcm-ca/blocks.json @@ -44,6 +44,7 @@ "material": "ground", "soundType": "grass", "itemModel": "zcm_comalterlite:syntheticdirt", + "harvestTool": "shovel", "isFullCube": true }, { @@ -52,6 +53,43 @@ "material": "sand", "soundType": "sand", "itemModel": "zcm_comalterlite:syntheticsand", + "harvestTool": "shovel", + "isFullCube": true + }, + { + "id" : "compositeblock", + "creativeTab": "zcm_comalterlite", + "itemModel": "zcm_comalterlite:compositeblock", + "information": [ "Used as the basis for decorative blocks", "such as Labyrinth Blocks and alike."], + "material": "rock", + "hardness": 3, + "resistance": 5, + "soundType": "stone", + "isFullCube": true, + "renderLayer": "solid", + "harvestTool": "pickaxe", + "pathNodeType": "blocked" + }, + { + "id": "futuristsand", + "creativeTab": "zcm_comalterlite", + "material": "sand", + "hardness": 3, + "resistance": 5, + "soundType": "sand", + "itemModel": "zcm_comalterlite:futuristsand", + "harvestTool": "shovel", + "isFullCube": true + }, + { + "id": "prismablock", + "creativeTab": "zcm_comalterlite", + "material": "iron", + "itemModel": "zcm_comalterlite:prismablock", + "harvestTool": "pickaxe", + "harvestLevel": 3, + "hardness": 3, + "resistance": 5, "isFullCube": true }, { @@ -171,6 +209,15 @@ "harvestLevel": 3, "hardness": 8 }, + { + "id": "artery", + "creativeTab": "zcm_comalterlite", + "material": "iron", + "itemModel": "zcm_comalterlite:artery", + "harvestTool": "pickaxe", + "harvestLevel": 3, + "hardness": 8 + }, { "id": "special", "creativeTab": "zcm_comalterlite", @@ -190,6 +237,29 @@ "harvestTool": "pickaxe", "harvestLevel": 3, "hardness": 8 + }, + { + "id": "futuristsandstone", + "creativeTab": "zcm_comalterlite", + "material": "rock", + "subtypes": [0, 1, 2], + "itemModel": { + "0": "zcm_comalterlite:futuristsandstone_normal", + "1": "zcm_comalterlite:futuristsandstone_smooth", + "2": "zcm_comalterlite:futuristsandstone_carved" + }, + "harvestTool": "pickaxe", + "harvestLevel": 2, + "hardness": 5 + }, + { + "id": "prisma_artery", + "creativeTab": "zcm_comalterlite", + "material": "iron", + "itemModel": "zcm_comalterlite:prisma_artery", + "harvestTool": "pickaxe", + "harvestLevel": 3, + "hardness": 8 } ] }, @@ -515,6 +585,13 @@ "itemModel": "zcm_comalterlite:trapdoor", "opensWithRedstone": true, "opensWithHands": false + }, + { + "id": "meshdoor", + "creativeTab": "zcm_comalterlite", + "itemModel": "zcm_comalterlite:meshdoor", + "opensWithRedstone": false, + "opensWithHands": true } ] }, diff --git a/mods/zcm-ca/items.json b/mods/zcm-ca/items.json index c0562c8..d2f860c 100644 --- a/mods/zcm-ca/items.json +++ b/mods/zcm-ca/items.json @@ -107,7 +107,7 @@ }, { "id": "compositefood", - "model": "minecraft:apple", + "model": "zcm_comalterlite:rations", "subtypes": [0, 1, 2, 3], "creativeTab": "zcm_comalterlite", "information": { @@ -123,10 +123,10 @@ "3": 16 }, "saturation": { - "0": 0.5, + "0": 0.4, "1": 0.5, "2": 0.6, - "3": 0.6 + "3": 0.7 }, "alwaysEdible": { "0": false,