diff --git a/assets/cubyz/blocks/birch_fence.json b/assets/cubyz/blocks/birch_fence.json index 03541d471..13eefd36a 100644 --- a/assets/cubyz/blocks/birch_fence.json +++ b/assets/cubyz/blocks/birch_fence.json @@ -10,4 +10,7 @@ "texture" : "cubyz:birch_fence", "texture_top" : "cubyz:birch_fence_top", "texture_bottom" : "cubyz:birch_fence_top" + "item": { + "texture" : "fence/birch.png", + } } diff --git a/assets/cubyz/blocks/fog/blue.json b/assets/cubyz/blocks/fog/blue.json index 5c145c660..cb1a60405 100644 --- a/assets/cubyz/blocks/fog/blue.json +++ b/assets/cubyz/blocks/fog/blue.json @@ -13,4 +13,7 @@ "model" : "cube", "texture" : "cubyz:fog/blue" + "item": { + "texture" : "fog/blue.png", + }, } diff --git a/assets/cubyz/blocks/fog/cyan.json b/assets/cubyz/blocks/fog/cyan.json index 219bf64d7..bb63a4591 100644 --- a/assets/cubyz/blocks/fog/cyan.json +++ b/assets/cubyz/blocks/fog/cyan.json @@ -13,4 +13,7 @@ "model" : "cube", "texture" : "cubyz:fog/cyan" + "item": { + "texture" : "fog/cyan.png", + }, } diff --git a/assets/cubyz/blocks/fog/green.json b/assets/cubyz/blocks/fog/green.json index 9826f8626..83b08faed 100644 --- a/assets/cubyz/blocks/fog/green.json +++ b/assets/cubyz/blocks/fog/green.json @@ -13,4 +13,7 @@ "model" : "cube", "texture" : "cubyz:fog/green" + "item": { + "texture" : "fog/green.png", + }, } diff --git a/assets/cubyz/blocks/fog/magenta.json b/assets/cubyz/blocks/fog/magenta.json index b24dcd23b..65382f3dc 100644 --- a/assets/cubyz/blocks/fog/magenta.json +++ b/assets/cubyz/blocks/fog/magenta.json @@ -13,4 +13,7 @@ "model" : "cube", "texture" : "cubyz:fog/magenta" + "item": { + "texture" : "fog/magenta.png", + }, } diff --git a/assets/cubyz/blocks/fog/red.json b/assets/cubyz/blocks/fog/red.json index a5f38ff5a..049f64f2c 100644 --- a/assets/cubyz/blocks/fog/red.json +++ b/assets/cubyz/blocks/fog/red.json @@ -13,4 +13,7 @@ "model" : "cube", "texture" : "cubyz:fog/red" + "item": { + "texture" : "fog/red.png", + }, } diff --git a/assets/cubyz/blocks/fog/yellow.json b/assets/cubyz/blocks/fog/yellow.json index 0605014f4..81ecf64a5 100644 --- a/assets/cubyz/blocks/fog/yellow.json +++ b/assets/cubyz/blocks/fog/yellow.json @@ -13,4 +13,7 @@ "model" : "cube", "texture" : "cubyz:fog/yellow" + "item": { + "texture" : "fog/yellow.png", + }, } diff --git a/assets/cubyz/blocks/grass.json b/assets/cubyz/blocks/grass.json index 8deed96d2..f69c493bc 100644 --- a/assets/cubyz/blocks/grass.json +++ b/assets/cubyz/blocks/grass.json @@ -5,7 +5,6 @@ "cubyz:soil" ], "model" : "cube", - "texture" : "cubyz:grass_side", - "texture_top" : "cubyz:grass_top", + "texture" : "cubyz:grass_top", "texture_bottom" : "cubyz:soil" } diff --git a/assets/cubyz/blocks/grass_vegetation.json b/assets/cubyz/blocks/grass_vegetation.json index 7e7a4f481..24af9d71f 100644 --- a/assets/cubyz/blocks/grass_vegetation.json +++ b/assets/cubyz/blocks/grass_vegetation.json @@ -10,5 +10,8 @@ "collide": false, "model" : "cross", "texture" : "cubyz:grass_vegetation", + "item": { + "texture" : "grass.png", + }, "lodReplacement" : "cubyz:air" } diff --git a/assets/cubyz/blocks/iron_block.json b/assets/cubyz/blocks/iron_block.json new file mode 100644 index 000000000..eb9e4b844 --- /dev/null +++ b/assets/cubyz/blocks/iron_block.json @@ -0,0 +1,11 @@ +{ + "class" : "stone", + "hardness" : 25, + "breakingPower" : 1, + "drops" : [ + "auto" + ], + "rotation" : "stairs", + "model" : "cube", + "texture" : "cubyz:iron_block" +} diff --git a/assets/cubyz/blocks/mahogany_fence.json b/assets/cubyz/blocks/mahogany_fence.json index c2b3e24c7..c68f221a1 100644 --- a/assets/cubyz/blocks/mahogany_fence.json +++ b/assets/cubyz/blocks/mahogany_fence.json @@ -10,4 +10,7 @@ "texture" : "cubyz:mahogany_fence", "texture_top" : "cubyz:mahogany_fence_top", "texture_bottom" : "cubyz:mahogany_fence_top" + "item": { + "texture" : "fence/mahogany.png", + } } diff --git a/assets/cubyz/blocks/oak_fence.json b/assets/cubyz/blocks/oak_fence.json index d3ecc985e..85a5a94dd 100644 --- a/assets/cubyz/blocks/oak_fence.json +++ b/assets/cubyz/blocks/oak_fence.json @@ -10,4 +10,7 @@ "texture" : "cubyz:oak_fence", "texture_top" : "cubyz:oak_fence_top", "texture_bottom" : "cubyz:oak_fence_top" + "item": { + "texture" : "fence/oak.png", + } } diff --git a/assets/cubyz/blocks/pine_fence.json b/assets/cubyz/blocks/pine_fence.json index b622b5d1e..5f5704405 100644 --- a/assets/cubyz/blocks/pine_fence.json +++ b/assets/cubyz/blocks/pine_fence.json @@ -10,4 +10,7 @@ "texture" : "cubyz:pine_fence", "texture_top" : "cubyz:pine_fence_top", "texture_bottom" : "cubyz:pine_fence_top" + "item": { + "texture" : "fence/pine.png", + } } diff --git a/assets/cubyz/blocks/textures/grass_top.png b/assets/cubyz/blocks/textures/grass_top.png index 51b32b2ac..9b70d3012 100644 Binary files a/assets/cubyz/blocks/textures/grass_top.png and b/assets/cubyz/blocks/textures/grass_top.png differ diff --git a/assets/cubyz/blocks/textures/grass_vegetation.png b/assets/cubyz/blocks/textures/grass_vegetation.png index ae6b5f6b3..8a5916f1d 100644 Binary files a/assets/cubyz/blocks/textures/grass_vegetation.png and b/assets/cubyz/blocks/textures/grass_vegetation.png differ diff --git a/assets/cubyz/blocks/textures/iron_block.png b/assets/cubyz/blocks/textures/iron_block.png new file mode 100644 index 000000000..a80b5e3b1 Binary files /dev/null and b/assets/cubyz/blocks/textures/iron_block.png differ diff --git a/assets/cubyz/blocks/textures/iron_block.png_reflectivity.png b/assets/cubyz/blocks/textures/iron_block.png_reflectivity.png new file mode 100644 index 000000000..9c113e332 Binary files /dev/null and b/assets/cubyz/blocks/textures/iron_block.png_reflectivity.png differ diff --git a/assets/cubyz/blocks/textures/mahogany_leaves.png b/assets/cubyz/blocks/textures/mahogany_leaves.png index 713a639b2..bb510287a 100644 Binary files a/assets/cubyz/blocks/textures/mahogany_leaves.png and b/assets/cubyz/blocks/textures/mahogany_leaves.png differ diff --git a/assets/cubyz/blocks/textures/mahogany_leaves_opaque.png b/assets/cubyz/blocks/textures/mahogany_leaves_opaque.png index 68e2c231a..de6930744 100644 Binary files a/assets/cubyz/blocks/textures/mahogany_leaves_opaque.png and b/assets/cubyz/blocks/textures/mahogany_leaves_opaque.png differ diff --git a/assets/cubyz/blocks/textures/oak_leaves.png b/assets/cubyz/blocks/textures/oak_leaves.png index c6cc346f5..9c3f78ae9 100644 Binary files a/assets/cubyz/blocks/textures/oak_leaves.png and b/assets/cubyz/blocks/textures/oak_leaves.png differ diff --git a/assets/cubyz/blocks/textures/vetch.png b/assets/cubyz/blocks/textures/vetch.png new file mode 100644 index 000000000..0f187f045 Binary files /dev/null and b/assets/cubyz/blocks/textures/vetch.png differ diff --git a/assets/cubyz/blocks/torch.json b/assets/cubyz/blocks/torch.json index b54ad8427..a72047c88 100644 --- a/assets/cubyz/blocks/torch.json +++ b/assets/cubyz/blocks/torch.json @@ -12,5 +12,8 @@ "rotation" : "torch", "model" : "torch", "texture" : "cubyz:torch", + "item": { + "texture" : "torch.png", + }, "lodReplacement" : "cubyz:air" } diff --git a/assets/cubyz/blocks/vetch.json b/assets/cubyz/blocks/vetch.json new file mode 100644 index 000000000..cc2203773 --- /dev/null +++ b/assets/cubyz/blocks/vetch.json @@ -0,0 +1,17 @@ +{ + "class" : "leaf", + "hardness" : 0.1, + "drops" : [ + "auto" + ], + "degradable" : true, + "viewThrough" : true, + "absorbedLight" : 0x121012, + "collide": false, + "model" : "cross", + "texture" : "cubyz:vetch", + "item": { + "texture" : "vetch.png", + }, + "lodReplacement" : "cubyz:air" +} diff --git a/assets/cubyz/items/iron_ingot.json b/assets/cubyz/items/iron_ingot.json new file mode 100644 index 000000000..f9edde79e --- /dev/null +++ b/assets/cubyz/items/iron_ingot.json @@ -0,0 +1,12 @@ +{ + "texture" : "materials/iron_ingot.png", + "material" : { + "density" : 1.0, + "resistance" : 1.0, + "power" : 5.0, + "roughness" : 0.1, + "colors" : [ + 0xff69696b, 0xff878484, 0xffa3a3a3, 0xffc2c2c2, 0xffe9e9e9 + ] + } +} \ No newline at end of file diff --git a/assets/cubyz/items/textures/fence/birch.png b/assets/cubyz/items/textures/fence/birch.png new file mode 100644 index 000000000..9c6f21330 Binary files /dev/null and b/assets/cubyz/items/textures/fence/birch.png differ diff --git a/assets/cubyz/items/textures/fence/mahogany.png b/assets/cubyz/items/textures/fence/mahogany.png new file mode 100644 index 000000000..71a0ae864 Binary files /dev/null and b/assets/cubyz/items/textures/fence/mahogany.png differ diff --git a/assets/cubyz/items/textures/fence/oak.png b/assets/cubyz/items/textures/fence/oak.png new file mode 100644 index 000000000..06227d34c Binary files /dev/null and b/assets/cubyz/items/textures/fence/oak.png differ diff --git a/assets/cubyz/items/textures/fence/pine.png b/assets/cubyz/items/textures/fence/pine.png new file mode 100644 index 000000000..a7f4c89fd Binary files /dev/null and b/assets/cubyz/items/textures/fence/pine.png differ diff --git a/assets/cubyz/items/textures/fog/blue.png b/assets/cubyz/items/textures/fog/blue.png new file mode 100644 index 000000000..fea133be3 Binary files /dev/null and b/assets/cubyz/items/textures/fog/blue.png differ diff --git a/assets/cubyz/items/textures/fog/cyan.png b/assets/cubyz/items/textures/fog/cyan.png new file mode 100644 index 000000000..a3e5230e9 Binary files /dev/null and b/assets/cubyz/items/textures/fog/cyan.png differ diff --git a/assets/cubyz/items/textures/fog/green.png b/assets/cubyz/items/textures/fog/green.png new file mode 100644 index 000000000..6f9de8cfa Binary files /dev/null and b/assets/cubyz/items/textures/fog/green.png differ diff --git a/assets/cubyz/items/textures/fog/magenta.png b/assets/cubyz/items/textures/fog/magenta.png new file mode 100644 index 000000000..3b87c2f8c Binary files /dev/null and b/assets/cubyz/items/textures/fog/magenta.png differ diff --git a/assets/cubyz/items/textures/fog/red.png b/assets/cubyz/items/textures/fog/red.png new file mode 100644 index 000000000..c37e2d6d7 Binary files /dev/null and b/assets/cubyz/items/textures/fog/red.png differ diff --git a/assets/cubyz/items/textures/fog/yellow.png b/assets/cubyz/items/textures/fog/yellow.png new file mode 100644 index 000000000..52ac19599 Binary files /dev/null and b/assets/cubyz/items/textures/fog/yellow.png differ diff --git a/assets/cubyz/items/textures/grass.png b/assets/cubyz/items/textures/grass.png new file mode 100644 index 000000000..0bee4aad1 Binary files /dev/null and b/assets/cubyz/items/textures/grass.png differ diff --git a/assets/cubyz/items/textures/materials/iron_ingot.png b/assets/cubyz/items/textures/materials/iron_ingot.png new file mode 100644 index 000000000..fc59d7654 Binary files /dev/null and b/assets/cubyz/items/textures/materials/iron_ingot.png differ diff --git a/assets/cubyz/items/textures/torch.png b/assets/cubyz/items/textures/torch.png new file mode 100644 index 000000000..90f2af6e9 Binary files /dev/null and b/assets/cubyz/items/textures/torch.png differ diff --git a/assets/cubyz/items/textures/vetch.png b/assets/cubyz/items/textures/vetch.png new file mode 100644 index 000000000..6d3038685 Binary files /dev/null and b/assets/cubyz/items/textures/vetch.png differ