diff --git a/res/content/base/block_materials/glass.json b/res/content/base/block_materials/glass.json index 86693a6e..fd2e2323 100644 --- a/res/content/base/block_materials/glass.json +++ b/res/content/base/block_materials/glass.json @@ -1,5 +1,5 @@ { - "steps-sound": "steps/wood", - "place-sound": "blocks/wood_place", + "steps-sound": "steps/glass", + "place-sound": "blocks/glass_place", "break-sound": "blocks/glass_break" } diff --git a/res/content/base/block_materials/metal.json b/res/content/base/block_materials/metal.json new file mode 100644 index 00000000..6f45903e --- /dev/null +++ b/res/content/base/block_materials/metal.json @@ -0,0 +1,5 @@ +{ + "steps-sound": "steps/metal", + "place-sound": "blocks/metal_place", + "break-sound": "blocks/metal_break" +} diff --git a/res/content/base/blocks/blue_lamp.json b/res/content/base/blocks/blue_lamp.json index ca6f81cc..18f48ae3 100644 --- a/res/content/base/blocks/blue_lamp.json +++ b/res/content/base/blocks/blue_lamp.json @@ -1,4 +1,5 @@ { "texture": "blue_lamp", - "emission": [0, 0, 15] -} \ No newline at end of file + "emission": [0, 0, 15], + "material": "base:glass" +} diff --git a/res/content/base/blocks/green_lamp.json b/res/content/base/blocks/green_lamp.json index debfb505..4f7e2cfa 100644 --- a/res/content/base/blocks/green_lamp.json +++ b/res/content/base/blocks/green_lamp.json @@ -1,4 +1,5 @@ { "texture": "green_lamp", - "emission": [0, 15, 0] -} \ No newline at end of file + "emission": [0, 15, 0], + "material": "base:glass" +} diff --git a/res/content/base/blocks/lightbulb.json b/res/content/base/blocks/lightbulb.json index f8aa71b3..a22cfaf3 100644 --- a/res/content/base/blocks/lightbulb.json +++ b/res/content/base/blocks/lightbulb.json @@ -6,5 +6,6 @@ "hitbox": [0.25, 0.0, 0.25, 0.5, 0.5, 0.5], "rotation": "pipe", "light-passing": true, - "sky-light-passing": true + "sky-light-passing": true, + "material": "base:glass" } diff --git a/res/content/base/blocks/metal.json b/res/content/base/blocks/metal.json index 8c02159d..c52d79a2 100644 --- a/res/content/base/blocks/metal.json +++ b/res/content/base/blocks/metal.json @@ -1,3 +1,4 @@ { - "texture": "metal" -} \ No newline at end of file + "texture": "metal", + "material": "base:metal" +} diff --git a/res/content/base/blocks/pipe.json b/res/content/base/blocks/pipe.json index eaaaff3c..ad297987 100644 --- a/res/content/base/blocks/pipe.json +++ b/res/content/base/blocks/pipe.json @@ -10,5 +10,6 @@ "model": "aabb", "hitbox": [0.25, 0.0, 0.25, 0.5, 1.0, 0.5], "light-passing": true, - "rotation": "pipe" + "rotation": "pipe", + "material": "base:metal" } diff --git a/res/content/base/blocks/red_lamp.json b/res/content/base/blocks/red_lamp.json index fc3a41ac..fe7e8cb1 100644 --- a/res/content/base/blocks/red_lamp.json +++ b/res/content/base/blocks/red_lamp.json @@ -1,4 +1,5 @@ { "texture": "red_lamp", - "emission": [15, 0, 0] -} \ No newline at end of file + "emission": [15, 0, 0], + "material": "base:glass" +} diff --git a/res/content/base/blocks/rust.json b/res/content/base/blocks/rust.json index 680c9da2..90e19363 100644 --- a/res/content/base/blocks/rust.json +++ b/res/content/base/blocks/rust.json @@ -1,3 +1,4 @@ { - "texture": "rust" -} \ No newline at end of file + "texture": "rust", + "material": "base:metal" +} diff --git a/res/content/base/sounds/blocks/glass_break.ogg b/res/content/base/sounds/blocks/glass_break.ogg index 1da0b6a4..80c30ca2 100644 Binary files a/res/content/base/sounds/blocks/glass_break.ogg and b/res/content/base/sounds/blocks/glass_break.ogg differ diff --git a/res/content/base/sounds/blocks/glass_place.ogg b/res/content/base/sounds/blocks/glass_place.ogg new file mode 100644 index 00000000..f1969e2f Binary files /dev/null and b/res/content/base/sounds/blocks/glass_place.ogg differ diff --git a/res/content/base/sounds/blocks/metal_break.ogg b/res/content/base/sounds/blocks/metal_break.ogg new file mode 100644 index 00000000..13a7ae4a Binary files /dev/null and b/res/content/base/sounds/blocks/metal_break.ogg differ diff --git a/res/content/base/sounds/blocks/metal_place_0.ogg b/res/content/base/sounds/blocks/metal_place_0.ogg new file mode 100644 index 00000000..0cac1de5 Binary files /dev/null and b/res/content/base/sounds/blocks/metal_place_0.ogg differ diff --git a/res/content/base/sounds/blocks/metal_place_1.ogg b/res/content/base/sounds/blocks/metal_place_1.ogg new file mode 100644 index 00000000..f57f9d0d Binary files /dev/null and b/res/content/base/sounds/blocks/metal_place_1.ogg differ diff --git a/res/content/base/sounds/steps/glass_0.ogg b/res/content/base/sounds/steps/glass_0.ogg new file mode 100644 index 00000000..cfa2ff24 Binary files /dev/null and b/res/content/base/sounds/steps/glass_0.ogg differ diff --git a/res/content/base/sounds/steps/glass_1.ogg b/res/content/base/sounds/steps/glass_1.ogg new file mode 100644 index 00000000..47937c42 Binary files /dev/null and b/res/content/base/sounds/steps/glass_1.ogg differ diff --git a/res/content/base/sounds/steps/glass_2.ogg b/res/content/base/sounds/steps/glass_2.ogg new file mode 100644 index 00000000..b983e072 Binary files /dev/null and b/res/content/base/sounds/steps/glass_2.ogg differ diff --git a/res/content/base/sounds/steps/glass_3.ogg b/res/content/base/sounds/steps/glass_3.ogg new file mode 100644 index 00000000..aef7174c Binary files /dev/null and b/res/content/base/sounds/steps/glass_3.ogg differ diff --git a/res/content/base/sounds/steps/metal_0.ogg b/res/content/base/sounds/steps/metal_0.ogg new file mode 100644 index 00000000..ecac2834 Binary files /dev/null and b/res/content/base/sounds/steps/metal_0.ogg differ diff --git a/res/content/base/sounds/steps/metal_1.ogg b/res/content/base/sounds/steps/metal_1.ogg new file mode 100644 index 00000000..e9985c6a Binary files /dev/null and b/res/content/base/sounds/steps/metal_1.ogg differ diff --git a/res/content/base/sounds/steps/metal_2.ogg b/res/content/base/sounds/steps/metal_2.ogg new file mode 100644 index 00000000..7a441b8b Binary files /dev/null and b/res/content/base/sounds/steps/metal_2.ogg differ diff --git a/res/content/base/sounds/steps/metal_3.ogg b/res/content/base/sounds/steps/metal_3.ogg new file mode 100644 index 00000000..c8ce9401 Binary files /dev/null and b/res/content/base/sounds/steps/metal_3.ogg differ